From f688d3338f19921413a1e7b5b13e16704ad0b92f Mon Sep 17 00:00:00 2001
From: Tanasart <22589759+Ttanasart-pt@users.noreply.github.com>
Date: Wed, 18 Sep 2024 08:05:47 +0700
Subject: [PATCH] mac
---
PixelComposer.resource_order | 2 +-
PixelComposer.yyp | 1 +
datafiles/GMEXT-Steamworks.html | 24 +++++++++++++++++++
objects/o_main/Other_2.gml | 2 +-
objects/o_main/Step_1.gml | 2 +-
scripts/console_commands/console_commands.gml | 10 ++++----
scripts/globals/globals.gml | 2 +-
scripts/preferences/preferences.gml | 2 ++
8 files changed, 36 insertions(+), 9 deletions(-)
create mode 100644 datafiles/GMEXT-Steamworks.html
diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order
index 1c2a0cf13..74c6ff3bb 100644
--- a/PixelComposer.resource_order
+++ b/PixelComposer.resource_order
@@ -246,7 +246,7 @@
{"name":"patreon_key","order":1,"path":"extensions/patreon_key/patreon_key.yy",},
{"name":"Regex","order":8,"path":"extensions/Regex/Regex.yy",},
{"name":"Spout","order":13,"path":"extensions/Spout/Spout.yy",},
- {"name":"Steamworks","order":2,"path":"extensions/Steamworks/Steamworks.yy",},
+ {"name":"Steamworks","order":4,"path":"extensions/Steamworks/Steamworks.yy",},
{"name":"TabletStuff","order":15,"path":"extensions/TabletStuff/TabletStuff.yy",},
{"name":"winwin","order":5,"path":"extensions/winwin/winwin.yy",},
{"name":"YYFirebaseFirestore","order":1,"path":"extensions/YYFirebaseFirestore/YYFirebaseFirestore.yy",},
diff --git a/PixelComposer.yyp b/PixelComposer.yyp
index 5ec46a853..f708202f9 100644
--- a/PixelComposer.yyp
+++ b/PixelComposer.yyp
@@ -588,6 +588,7 @@
{"$GMIncludedFile":"","%Name":"gifski.h","CopyToMask":-1,"filePath":"datafiles/gifski/win/developer","name":"gifski.h","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"gifski.exe","CopyToMask":-1,"filePath":"datafiles/gifski/win","name":"gifski.exe","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"GMD3D11.dll","CopyToMask":-1,"filePath":"datafiles","name":"GMD3D11.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
+ {"$GMIncludedFile":"","%Name":"GMEXT-Steamworks.html","CopyToMask":0,"filePath":"datafiles","name":"GMEXT-Steamworks.html","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"convert.exe","CopyToMask":-1,"filePath":"datafiles/ImageMagick","name":"convert.exe","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"LICENSE.txt","CopyToMask":-1,"filePath":"datafiles/ImageMagick","name":"LICENSE.txt","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"magick.exe","CopyToMask":-1,"filePath":"datafiles/ImageMagick","name":"magick.exe","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
diff --git a/datafiles/GMEXT-Steamworks.html b/datafiles/GMEXT-Steamworks.html
new file mode 100644
index 000000000..1462583df
--- /dev/null
+++ b/datafiles/GMEXT-Steamworks.html
@@ -0,0 +1,24 @@
+
+
+
+
+ GMEXT-Steamworks Documentation
+
+
+
+
+
+
\ No newline at end of file
diff --git a/objects/o_main/Other_2.gml b/objects/o_main/Other_2.gml
index cdc59a4ad..1e280c100 100644
--- a/objects/o_main/Other_2.gml
+++ b/objects/o_main/Other_2.gml
@@ -118,7 +118,7 @@
#endregion
#region lua
- lua_error_handler = _lua_error;
+ // if OS == os_windows // lua_error_handler = _lua_error;
#endregion
//print("===== Game Start End =====");
\ No newline at end of file
diff --git a/objects/o_main/Step_1.gml b/objects/o_main/Step_1.gml
index 69e802d8c..b6cc1694e 100644
--- a/objects/o_main/Step_1.gml
+++ b/objects/o_main/Step_1.gml
@@ -288,5 +288,5 @@ _FILE_DROPPED = false;
#endregion
//if(global.cache_call) print($"CACHE called: {global.cache_call} | hit: {global.cache_hit} ({global.cache_hit / global.cache_call * 100}%)");
-print($"{is_struct(HOVER)? instanceof(HOVER) : HOVER}, {is_struct(FOCUS)? instanceof(FOCUS) : FOCUS}");
+//print($"{is_struct(HOVER)? instanceof(HOVER) : HOVER}, {is_struct(FOCUS)? instanceof(FOCUS) : FOCUS}");
//print($"{mouse_mx}, {mouse_my}");
\ No newline at end of file
diff --git a/scripts/console_commands/console_commands.gml b/scripts/console_commands/console_commands.gml
index 04c9bc753..18862468d 100644
--- a/scripts/console_commands/console_commands.gml
+++ b/scripts/console_commands/console_commands.gml
@@ -5,13 +5,13 @@ CMD_COLOR = {
OKBLUE : "\033[94m",
OKCYAN : "\033[96m",
OKGREEN : "\033[92m",
- WARNING : "\033[93m",
+ WARN : "\033[93m",
FAIL : "\033[91m",
ENDC : "\033[0m",
BOLD : "\033[1m",
}
-function cmd_submit(command) { #region
+function cmd_submit(command) {
if(command == "") return;
array_push(CMD, cmdLineIn(command));
array_push(CMDIN, command);
@@ -112,9 +112,9 @@ function cmd_submit(command) { #region
log_console(_txt, true);
break;
}
-} #endregion
+}
-function cmd_path(path) { #region
+function cmd_path(path) {
var params = string_splice(path, ";");
var vals = [];
@@ -142,4 +142,4 @@ function cmd_path(path) { #region
}
return vals;
-} #endregion
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml
index 1512a30ce..b6c29b6de 100644
--- a/scripts/globals/globals.gml
+++ b/scripts/globals/globals.gml
@@ -42,7 +42,7 @@
LATEST_VERSION = 1_17_00;
VERSION = 1_17_12_0;
SAVE_VERSION = 1_17_10_0;
- VERSION_STRING = MAC? "1.18.002m" : "1.18.rc3";
+ VERSION_STRING = MAC? "1.18.003m" : "1.18.rc3";
BUILD_NUMBER = 1_17_12_0;
HOTKEYS = ds_map_create();
diff --git a/scripts/preferences/preferences.gml b/scripts/preferences/preferences.gml
index bd7174828..0be5f23f8 100644
--- a/scripts/preferences/preferences.gml
+++ b/scripts/preferences/preferences.gml
@@ -388,6 +388,8 @@
var grav = struct_try_get(PREFERENCES, "physics_gravity", [ 0, 10 ]);
physics_world_gravity(array_safe_get_fast(grav, 0, 0), array_safe_get_fast(grav, 1, 10));
+ if(MAC) PREFERENCES.multi_window = false;
+
if(PREFERENCES.multi_window) {
var _cfg = winwin_config_ext("", winwin_kind_borderless, true, false, winwin_main);
_cfg.clickthrough = true;