Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-24 21:22:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

-Added missing functions to the doc, fixes #3583

Browse Source
This commit is contained in:
Juan Linietsky 2016-02-09 16:58:03 -03:00
parent 595de75641
commit 61f03c98c8
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/gdscript/gd_editor.cpp
View File

@ -285,6 +285,30 @@ void GDScriptLanguage::get_public_functions(List<MethodInfo> *p_functions) const
p_functions->push_back(GDFunctions::get_info(GDFunctions::Function(i)));
}
//not really "functions", but..
{
MethodInfo mi;
mi.name="preload:Resource";
mi.arguments.push_back(PropertyInfo(Variant::STRING,"path"));
mi.return_val=PropertyInfo(Variant::OBJECT,"",PROPERTY_HINT_RESOURCE_TYPE,"Resource");
p_functions->push_back(mi);
}
{
MethodInfo mi;
mi.name="yield";
mi.arguments.push_back(PropertyInfo(Variant::OBJECT,"object"));
mi.arguments.push_back(PropertyInfo(Variant::STRING,"signal"));
mi.default_arguments.push_back(Variant::NIL);
mi.default_arguments.push_back(Variant::STRING);
p_functions->push_back(mi);
}
{
MethodInfo mi;
mi.name="assert";
mi.arguments.push_back(PropertyInfo(Variant::BOOL,"condition"));
p_functions->push_back(mi);
}
}
void GDScriptLanguage::get_public_constants(List<Pair<String,Variant> > *p_constants) const {

1
scene/resources/packed_scene.cpp
View File

@ -239,7 +239,6 @@ Node *SceneState::instance(bool p_gen_edit_state) const {
} else {
node->_set_name_nocheck( snames[ n.name ] );
}
}
if (n.owner>=0) {