diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-19 11:57:14 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-19 11:57:14 -0300 |
| commit | d7d65fa2f2b51d03f7bdfcbceedca99188ce979c (patch) | |
| tree | fecdf1bfa39ba5a4895b4dbf340a3b68098c109a /platform | |
| parent | 8c1731b67995add31361ae526b0e6af76346181e (diff) | |
-improved physics ccd
-html5 exporter works again
-disable repeat on image loader by default
-can change shape offset en tileset, texture offset was broken
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/.old/os_android.cpp | 2 | ||||
| -rw-r--r-- | platform/iphone/app_delegate.mm | 2 | ||||
| -rw-r--r-- | platform/javascript/export/export.cpp | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/platform/android/.old/os_android.cpp b/platform/android/.old/os_android.cpp index ecd87a3af9..9fbfaedd3d 100644 --- a/platform/android/.old/os_android.cpp +++ b/platform/android/.old/os_android.cpp @@ -223,6 +223,7 @@ void OS_Android::process_touch(int p_what,int p_pointer, const Vector<TouchPos>& ev.mouse_button.y=touch[0].pos.y; ev.mouse_button.global_x=touch[0].pos.x; ev.mouse_button.global_y=touch[0].pos.y; + input->set_mouse_pos(Point2(ev.mouse_button.x,ev.mouse_button.y)); main_loop->input_event(ev); @@ -259,6 +260,7 @@ void OS_Android::process_touch(int p_what,int p_pointer, const Vector<TouchPos>& ev.mouse_button.global_x=touch[0].pos.x; ev.mouse_button.global_y=touch[0].pos.y; last_mouse=touch[0].pos; + input->set_mouse_pos(Point2(ev.mouse_button.x,ev.mouse_button.y)); main_loop->input_event(ev); } diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm index 9677c18c17..3cdca68595 100644 --- a/platform/iphone/app_delegate.mm +++ b/platform/iphone/app_delegate.mm @@ -165,7 +165,7 @@ static int frame_count = 0; printf("**************** app delegate init\n"); CGRect rect = [[UIScreen mainScreen] bounds]; - [application setStatusBarHidden:YES animation:NO]; + [application setStatusBarHidden:YES withAnimation:UIStatusBarAnimationNone]; // disable idle timer application.idleTimerDisabled = YES; diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 50fa4f8815..cd2e24216a 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -178,10 +178,11 @@ static void _fix_files(Vector<uint8_t>& html,uint64_t p_data_size) { } CharString cs = strnew.utf8(); - html.resize(cs.size()); - for(int i=9;i<cs.size();i++) { + html.resize(cs.length()); + for(int i=9;i<cs.length();i++) { html[i]=cs[i]; } + } struct JSExportData { |