diff options
| -rw-r--r-- | .gitignore | 39 | ||||
| -rw-r--r-- | main/input_default.cpp | 2 | ||||
| -rw-r--r-- | modules/gdnative/godot.cpp | 7 | ||||
| -rw-r--r-- | modules/gdnative/godot.h | 4 | ||||
| -rw-r--r-- | platform/android/export/export.cpp | 7 | ||||
| -rw-r--r-- | servers/audio_server.cpp | 4 |
6 files changed, 44 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index 2ede830bcf..0e516e4a68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,31 @@ # Godot auto generated files -platform/server/logo.h -platform/android/logo.h -platform/bb10/logo.h -platform/iphone/logo.h -platform/javascript/logo.h -platform/osx/logo.h -platform/windows/logo.h -platform/x11/logo.h -drivers/gles2/shaders/*.h -drivers/gles3/shaders/*.h -modules/register_module_types.cpp -core/version.h -core/method_bind.inc +core/global_defaults.cpp core/method_bind_ext.inc +core/method_bind.inc core/script_encryption_key.cpp -core/global_defaults.cpp +core/version.h +drivers/gles2/shaders/*.h +drivers/gles3/shaders/*.h drivers/unix/os_unix_global_settings_path.cpp -editor/register_exporters.cpp -editor/doc_data_compressed.h +editor/builtin_fonts.h editor/certs_compressed.h +editor/doc_data_compressed.h editor/editor_icons.cpp +editor/register_exporters.cpp editor/translations.h -editor/builtin_fonts.h -.fscache -make.bat log.txt +main/app_icon.h +main/splash.h +make.bat +modules/register_module_types.cpp +platform/android/logo.h +platform/bb10/logo.h +platform/iphone/logo.h +platform/javascript/logo.h +platform/osx/logo.h +platform/server/logo.h +platform/windows/logo.h +platform/x11/logo.h # Documentation generated by doxygen or from classes.xml doc/_build/ diff --git a/main/input_default.cpp b/main/input_default.cpp index 81e04a84a9..94684c50d2 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -687,6 +687,7 @@ static const char *s_ControllerMappings[] = { "030000004c0500006802000011010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", "030000004c050000a00b000011010000,Sony DualShock 4 Wireless Adaptor,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,", "030000004c050000c405000011010000,Sony DualShock 4,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,", + "030000004c050000c405000011810000,Sony Computer Entertainment Wireless Controller,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:h0.1,rightshoulder:b5,rightx:a3,start:b9,righty:a4,dpleft:h0.8,lefttrigger:a2,x:b3,dpup:h0.1,back:b8,leftstick:b11,leftshoulder:b4,y:b2,a:b0,dpright:h0.2,righttrigger:a5,b:b1,", "030000004c050000cc09000011010000,Sony DualShock 4 V2,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,", "030000004f04000000b3000010010000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,y:b3,x:b1,start:b10,guide:b8,back:b9,leftstick:b11,rightstick:b12,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,", "030000004f04000008d0000000010000,Thrustmaster Run N Drive Wireless,a:b1,b:b2,x:b0,y:b3,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:b6,righttrigger:b7,", @@ -756,6 +757,7 @@ static const char *s_ControllerMappings[] = { "05000000102800000900000000010000,8Bitdo SFC30 GamePad,x:b4,a:b1,b:b0,y:b3,back:b10,start:b11,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,", "05000000362800000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,", "05000000362800000100000003010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,", + "05000000362800000100000004010000,OUYA Game Controller,leftx:a0,lefty:a1,dpdown:b9,rightstick:b7,rightshoulder:b5,rightx:a3,start:b16,righty:a4,dpleft:b10,lefttrigger:b12,x:b1,dpup:b8,back:b14,leftstick:b6,leftshoulder:b4,y:b2,a:b0,dpright:b11,righttrigger:b13,b:b3,", "05000000380700006652000025010000,Mad Catz C.T.R.L.R ,x:b0,a:b1,b:b2,y:b3,back:b8,guide:b12,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,", "0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,", "050000004c0500006802000000010000,PS3 Controller (Bluetooth),a:b14,b:b13,y:b12,x:b15,start:b3,guide:b16,back:b0,leftstick:b1,rightstick:b2,leftshoulder:b10,rightshoulder:b11,dpup:b4,dpleft:b7,dpdown:b6,dpright:b5,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b8,righttrigger:b9,", diff --git a/modules/gdnative/godot.cpp b/modules/gdnative/godot.cpp index 5ad716d0cd..7477a28db6 100644 --- a/modules/gdnative/godot.cpp +++ b/modules/gdnative/godot.cpp @@ -182,6 +182,13 @@ void GDAPI *godot_native_get_userdata(godot_object *p_instance) { return NULL; } +godot_class_constructor GDAPI godot_get_class_constructor(const char *p_classname) { + ClassDB::ClassInfo *class_info = ClassDB::classes.getptr(StringName(p_classname)); + if (class_info) + return (godot_class_constructor)class_info->creation_func; + return NULL; +} + godot_dictionary GDAPI godot_get_global_constants() { godot_dictionary constants; godot_dictionary_new(&constants); diff --git a/modules/gdnative/godot.h b/modules/gdnative/godot.h index 45ac64feee..bba0a3f98d 100644 --- a/modules/gdnative/godot.h +++ b/modules/gdnative/godot.h @@ -376,6 +376,10 @@ void GDAPI godot_script_register_signal(const char *p_name, const godot_signal * void GDAPI *godot_native_get_userdata(godot_object *p_instance); +typedef godot_object *(*godot_class_constructor)(); + +godot_class_constructor GDAPI godot_get_class_constructor(const char *p_classname); + godot_dictionary GDAPI godot_get_global_constants(); ////// System Functions diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 78c28ede50..72d665329e 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -3532,6 +3532,13 @@ public: devices_changed = true; quit_request = false; } + + ~EditorExportAndroid() { + quit_request = true; + Thread::wait_to_finish(device_thread); + memdelete(device_lock); + memdelete(device_thread); + } }; void register_android_exporter() { diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index 1b1ed45862..f3bba4ae90 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -761,6 +761,10 @@ void AudioServer::finish() { } buses.clear(); + + if (AudioDriver::get_singleton()) { + AudioDriver::get_singleton()->finish(); + } } void AudioServer::update() { } |