From 80f4a40e921ca3803b95b68a2a0143b2c4da6511 Mon Sep 17 00:00:00 2001 From: Tanasart <22589759+Ttanasart-pt@users.noreply.github.com> Date: Fri, 23 Dec 2022 13:02:49 +0700 Subject: [PATCH] 0.10.4 --- objects/o_dialog_color_selector/Draw_64.gml | 2 +- objects/o_dialog_gradient/Draw_64.gml | 2 +- objects/o_dialog_palette/Draw_64.gml | 2 +- options/windows/options_windows.yy | 6 +++--- scripts/globals/globals.gml | 4 ++-- scripts/node_export/node_export.gml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/objects/o_dialog_color_selector/Draw_64.gml b/objects/o_dialog_color_selector/Draw_64.gml index 4b9381a7e..109c26ca8 100644 --- a/objects/o_dialog_color_selector/Draw_64.gml +++ b/objects/o_dialog_color_selector/Draw_64.gml @@ -59,7 +59,7 @@ if !ready exit; if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Open palette folder", s_folder_24) == 2) { var _realpath = environment_get_variable("LOCALAPPDATA") + "\\Pixels_Composer\\Palettes"; var _windir = environment_get_variable("WINDIR") + "\\explorer.exe"; - execute_shell(_windir, _realpath); + execute_shell_simple(_windir, _realpath); } bx -= ui(32); #endregion diff --git a/objects/o_dialog_gradient/Draw_64.gml b/objects/o_dialog_gradient/Draw_64.gml index ade955e55..6b5ea428c 100644 --- a/objects/o_dialog_gradient/Draw_64.gml +++ b/objects/o_dialog_gradient/Draw_64.gml @@ -82,7 +82,7 @@ if !ready exit; if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Open gradient folder", s_folder_24) == 2) { var _realpath = environment_get_variable("LOCALAPPDATA") + "\\Pixels_Composer\\Gradients"; var _windir = environment_get_variable("WINDIR") + "\\explorer.exe"; - execute_shell(_windir, _realpath); + execute_shell_simple(_windir, _realpath); } bx -= ui(32); #endregion diff --git a/objects/o_dialog_palette/Draw_64.gml b/objects/o_dialog_palette/Draw_64.gml index 09aaf5e72..6d4f79a6e 100644 --- a/objects/o_dialog_palette/Draw_64.gml +++ b/objects/o_dialog_palette/Draw_64.gml @@ -80,7 +80,7 @@ if palette == 0 exit; if(buttonInstant(s_button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, "Open palette folder", s_folder_24) == 2) { var _realpath = environment_get_variable("LOCALAPPDATA") + "\\Pixels_Composer\\Palettes"; var _windir = environment_get_variable("WINDIR") + "\\explorer.exe"; - execute_shell(_windir, _realpath); + execute_shell_simple(_windir, _realpath); } draw_sprite_ui_uniform(s_folder_24, 0, bx + ui(14), by + ui(14), 1, c_ui_blue_grey); bx -= ui(32); diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 7ffb4400b..4416195ec 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -2,9 +2,9 @@ "resourceType": "GMWindowsOptions", "resourceVersion": "1.1", "name": "Windows", - "option_windows_display_name": "Pixel Composer 0.10.3", - "option_windows_executable_name": "${project_name} 0.10.3.exe", - "option_windows_version": "0.10.3.0", + "option_windows_display_name": "Pixel Composer 0.10.4d", + "option_windows_executable_name": "${project_name} 0.10.4d.exe", + "option_windows_version": "0.10.4.0", "option_windows_company_info": "MakhamDev", "option_windows_product_info": "Pixel Composer", "option_windows_copyright_info": "", diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index e351780d0..f4669edaa 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -17,9 +17,9 @@ DEBUG = false; globalvar VERSION, SAVEFILE_VERSION, VERSION_STRING; - VERSION = 103; + VERSION = 104; SAVEFILE_VERSION = 90; - VERSION_STRING = "0.10.3 DEMO"; + VERSION_STRING = "0.10.4 DEMO"; globalvar NODES, ANIMATOR, NODE_MAP, APPEND_MAP, HOTKEYS, HOTKEY_CONTEXT; diff --git a/scripts/node_export/node_export.gml b/scripts/node_export/node_export.gml index 50facf581..7bc5e556e 100644 --- a/scripts/node_export/node_export.gml +++ b/scripts/node_export/node_export.gml @@ -100,7 +100,7 @@ function Node_Export(_x, _y) : Node(_x, _y) constructor { " " + target_path; //show_debug_message(converter); //show_debug_message(shell_cmd); - execute_shell(converter, shell_cmd); + execute_shell_simple(converter, shell_cmd); } static step = function() {