From c158f5570a065d3befd287b596ead76bf5981e9c Mon Sep 17 00:00:00 2001 From: Nikita Krapivin Date: Tue, 15 Oct 2019 14:18:24 +0500 Subject: [PATCH] 1.3.1 hotfix - Fixed a rare menu settings bug - Dogs restored - iOS & Mac build settings updated. --- objects/oBall/Create_0.gml | 3 ++- objects/oBall/Step_0.gml | 4 +++- .../Collision_fc6f0026-8881-4ae0-8b42-d27fe61dc745.gml | 6 +++++- objects/oLevelSelectorNew/Draw_0.gml | 2 +- objects/oLevelSelectorNew/KeyPress_8.gml | 6 +++++- objects/objLevelSelectBack/Step_0.gml | 2 +- options/android/options_android.yy | 2 +- options/html5/options_html5.yy | 2 +- options/ios/options_ios.yy | 6 +++--- options/linux/options_linux.yy | 2 +- options/mac/options_mac.yy | 4 ++-- options/windows/options_windows.yy | 2 +- options/windowsuap/options_windowsuap.yy | 2 +- scripts/scrSettingsSave/scrSettingsSave.gml | 10 ++++++++++ 14 files changed, 37 insertions(+), 16 deletions(-) diff --git a/objects/oBall/Create_0.gml b/objects/oBall/Create_0.gml index 23b2816..8f3afcf 100644 --- a/objects/oBall/Create_0.gml +++ b/objects/oBall/Create_0.gml @@ -6,4 +6,5 @@ activated = true; mx = -1; my = -1; gp_timerx = 0; -gp_timery = 0; \ No newline at end of file +gp_timery = 0; +stoptimer = 0; \ No newline at end of file diff --git a/objects/oBall/Step_0.gml b/objects/oBall/Step_0.gml index 1306212..523ae16 100644 --- a/objects/oBall/Step_0.gml +++ b/objects/oBall/Step_0.gml @@ -15,7 +15,9 @@ key_right = keyboard_check_pressed(vk_right) || gamepad_button_check_pressed(glo key_up = keyboard_check_pressed(vk_up) || gamepad_button_check_pressed(global.gp_id,gp_padu) || gp_timery < 1 && gamepad_axis_value(global.gp_id,gp_axislv) < -0.5; key_down = keyboard_check_pressed(vk_down) || gamepad_button_check_pressed(global.gp_id,gp_padd) || gp_timery < 1 && gamepad_axis_value(global.gp_id,gp_axislv) > 0.5; -if (mouse_check_button(mb_left) && !moving && scrIsMobile()) +stoptimer = max(0,stoptimer-1); + +if (mouse_check_button(mb_left) && stoptimer == 0 && !moving && scrIsMobile()) { touch_pos[1] = mouse_y; touch_pos[0] = mouse_x; diff --git a/objects/oFloorStop/Collision_fc6f0026-8881-4ae0-8b42-d27fe61dc745.gml b/objects/oFloorStop/Collision_fc6f0026-8881-4ae0-8b42-d27fe61dc745.gml index 128426d..4b0ac9b 100644 --- a/objects/oFloorStop/Collision_fc6f0026-8881-4ae0-8b42-d27fe61dc745.gml +++ b/objects/oFloorStop/Collision_fc6f0026-8881-4ae0-8b42-d27fe61dc745.gml @@ -5,6 +5,10 @@ if (!Approached) oBall.moving = false; oBall.x = x; oBall.y = y; - if (scrIsMobile()) mouse_clear(mb_left); + if (scrIsMobile()) + { + mouse_clear(mb_left); + oBall.stoptimer = 5; + } audio_play_sound(sfxBallMove,5,false); } \ No newline at end of file diff --git a/objects/oLevelSelectorNew/Draw_0.gml b/objects/oLevelSelectorNew/Draw_0.gml index 601f3c7..956dcac 100644 --- a/objects/oLevelSelectorNew/Draw_0.gml +++ b/objects/oLevelSelectorNew/Draw_0.gml @@ -43,7 +43,7 @@ else else if (os_browser != browser_not_a_browser) //is HTML5 draw_text(960/2,544/2,"Custom Levels aren't supported on HTML5.\nSorry about that!\nJust click left trigger."); else if (scrIsMobile()) - draw_text(960/2,544/2,"No custom levels were found.\nPress 'Back' button to save your level.\nIf you saved your level but still don't see it\nTry re-opening this menu."); + draw_text(960/2,544/2,"Mobile platforms do not support custom levels."); } } diff --git a/objects/oLevelSelectorNew/KeyPress_8.gml b/objects/oLevelSelectorNew/KeyPress_8.gml index 416c98c..9b56002 100644 --- a/objects/oLevelSelectorNew/KeyPress_8.gml +++ b/objects/oLevelSelectorNew/KeyPress_8.gml @@ -1,5 +1,9 @@ /// @description write level as base64 + +//room_goto(rMenu); + +/* if (selectedWorld != 3) && (os_browser != browser_not_a_browser || !scrIsMobile()) exit;//mobile only!!! var fname = get_string("Enter level file name (no extension!):","custom"); var lvlstr= get_string("Enter level base64 string:",""); -scrWriteLevel(lvlstr,fname); \ No newline at end of file +scrWriteLevel(lvlstr,fname);*/ \ No newline at end of file diff --git a/objects/objLevelSelectBack/Step_0.gml b/objects/objLevelSelectBack/Step_0.gml index 76d2e2c..35835ee 100644 --- a/objects/objLevelSelectBack/Step_0.gml +++ b/objects/objLevelSelectBack/Step_0.gml @@ -1,5 +1,5 @@ /// @description go back to main menu -if (mouse_check_button_released(mb_left) && position_meeting(mouse_x,mouse_y,self)) || (keyboard_check_pressed(vk_escape)) || (gamepad_button_check_pressed(global.gp_id,gp_face2)) || (position_meeting(global.mousex,global.mousey,self) && gamepad_button_check_pressed(global.gp_id,gp_face1)) +if (mouse_check_button_released(mb_left) && position_meeting(mouse_x,mouse_y,self)) || (keyboard_check_pressed(vk_escape)) || keyboard_check_pressed(vk_backspace) || (gamepad_button_check_pressed(global.gp_id,gp_face2)) || (position_meeting(global.mousex,global.mousey,self) && gamepad_button_check_pressed(global.gp_id,gp_face1)) { room_goto(rMenu); } \ No newline at end of file diff --git a/options/android/options_android.yy b/options/android/options_android.yy index 016cc5a..5beab0a 100644 --- a/options/android/options_android.yy +++ b/options/android/options_android.yy @@ -70,7 +70,7 @@ "option_android_tv_isgame": true, "option_android_use_facebook": false, "option_android_version": { - "build": 0, + "build": 1, "major": 1, "minor": 3, "revision": 0 diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy index 472f7d2..8df589a 100644 --- a/options/html5/options_html5.yy +++ b/options/html5/options_html5.yy @@ -30,7 +30,7 @@ "option_html5_usebuiltinparticles": false, "option_html5_usesplash": true, "option_html5_version": { - "build": 0, + "build": 1, "major": 1, "minor": 3, "revision": 0 diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy index c5f6058..febf13b 100644 --- a/options/ios/options_ios.yy +++ b/options/ios/options_ios.yy @@ -29,7 +29,7 @@ "option_ios_icon_iphone_spotlight_120": "${options_dir}\\ios\\icons\\spotlight\\iphone_120.png", "option_ios_icon_iphone_spotlight_80": "${options_dir}\\ios\\icons\\spotlight\\iphone_80.png", "option_ios_icon_itunes_artwork_1024": "${options_dir}\\ios\\icons\\itunes\\itunes_1024.png", - "option_ios_interpolate_pixels": false, + "option_ios_interpolate_pixels": true, "option_ios_orientation_landscape": true, "option_ios_orientation_landscape_flipped": true, "option_ios_orientation_portrait": true, @@ -64,10 +64,10 @@ "option_ios_splashscreen_iphone_xs_max_landscape": "${options_dir}\\ios\\splash\\iphone_xs_max_landscape.png", "option_ios_splashscreen_iphone_xs_max_portrait": "${base_options_dir}\\ios\\splash\\iphone_xs_max_portrait.png", "option_ios_team_id": "", - "option_ios_texture_page": "4096x4096", + "option_ios_texture_page": "2048x2048", "option_ios_use_facebook": false, "option_ios_version": { - "build": 0, + "build": 1, "major": 1, "minor": 3, "revision": 0 diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy index d38eee3..2ce1620 100644 --- a/options/linux/options_linux.yy +++ b/options/linux/options_linux.yy @@ -22,7 +22,7 @@ "option_linux_sync": false, "option_linux_texture_page": "2048x2048", "option_linux_version": { - "build": 0, + "build": 1, "major": 1, "minor": 3, "revision": 0 diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index c2ae5e8..b90cb19 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -22,13 +22,13 @@ "option_mac_output_dir": "~\/GameMakerStudio2\/Mac", "option_mac_resize_window": false, "option_mac_scale": 0, - "option_mac_signing_identity": "Developer ID Application:4Z9GV9MF5L", + "option_mac_signing_identity": "Mac Developer: linuxstorage@yandex.ru (JJAW3Y7D9V)", "option_mac_splash_png": "${options_dir}\\mac\\splash\\splash.png", "option_mac_start_fullscreen": false, "option_mac_team_id": "", "option_mac_texture_page": "2048x2048", "option_mac_version": { - "build": 0, + "build": 1, "major": 1, "minor": 3, "revision": 0 diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index ecb3796..7bf38ea 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -31,7 +31,7 @@ "option_windows_texture_page": "2048x2048", "option_windows_use_splash": true, "option_windows_version": { - "build": 0, + "build": 1, "major": 1, "minor": 3, "revision": 0 diff --git a/options/windowsuap/options_windowsuap.yy b/options/windowsuap/options_windowsuap.yy index 6130738..1c8a40e 100644 --- a/options/windowsuap/options_windowsuap.yy +++ b/options/windowsuap/options_windowsuap.yy @@ -41,7 +41,7 @@ "option_windowsuap_texture_page": "2048x2048", "option_windowsuap_use_synchronization": true, "option_windowsuap_version": { - "build": 0, + "build": 1, "major": 1, "minor": 3, "revision": 0 diff --git a/scripts/scrSettingsSave/scrSettingsSave.gml b/scripts/scrSettingsSave/scrSettingsSave.gml index 925c95d..9bf4f4a 100644 --- a/scripts/scrSettingsSave/scrSettingsSave.gml +++ b/scripts/scrSettingsSave/scrSettingsSave.gml @@ -2,6 +2,16 @@ global.savebuff = buffer_create(1,buffer_grow,1); ini_open_from_string(""); + +//bugfix +for (var i = 1; i < 31; i++) +{ + ini_write_real("World1Unlocked",string(i),global.UnlockedLevels[1,i]); + ini_write_real("World2Unlocked",string(i),global.UnlockedLevels[2,i]); + ini_write_real("World1Stars",string(i),global.StarCount[1,i]); + ini_write_real("World2Stars",string(i),global.StarCount[2,i]); +} + ini_write_real("Settings","BgmGain",global.BgmGain); ini_write_real("Settings","SndGain",global.SndGain); var inistring = ini_close();