diff options
| author | Juan Linietsky | 2014-08-01 22:10:38 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-08-01 22:10:38 -0300 |
| commit | 678948068bbde7f12a9c5f28a467b6cf4d127851 (patch) | |
| tree | 75572f3a5cc6089a6ca3046e9307d0a7c0b72c51 /core/globals.cpp | |
| parent | 9ff6d55822647c87eef392147ea15641d0922d47 (diff) | |
| download | godot-678948068bbde7f12a9c5f28a467b6cf4d127851.tar.gz godot-678948068bbde7f12a9c5f28a467b6cf4d127851.tar.zst godot-678948068bbde7f12a9c5f28a467b6cf4d127851.zip | |
Diffstat (limited to 'core/globals.cpp')
| -rw-r--r-- | core/globals.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index 3a04becef..ccda457f4 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -1358,6 +1358,7 @@ void Globals::_bind_methods() { ObjectTypeDB::bind_method(_MD("save"),&Globals::save); ObjectTypeDB::bind_method(_MD("has_singleton"),&Globals::has_singleton); ObjectTypeDB::bind_method(_MD("get_singleton"),&Globals::get_singleton_object); + ObjectTypeDB::bind_method(_MD("load_resource_pack"),&Globals::_load_resource_pack); } Globals::Globals() { @@ -1379,6 +1380,7 @@ Globals::Globals() { set("application/name","" ); set("application/main_scene",""); custom_prop_info["application/main_scene"]=PropertyInfo(Variant::STRING,"application/main_scene",PROPERTY_HINT_FILE,"xml,res,scn,xscn"); + set("application/disable_stdout",false); key.key.scancode=KEY_RETURN; |