mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-12-24 14:06:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

mac

Browse source
This commit is contained in:
Tanasart 2024-09-18 08:05:47 +07:00
parent 2d64a76c50
commit f688d3338f
8 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PixelComposer.resource_order
View file

@ -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",},

1
PixelComposer.yyp
View file

@ -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",},

24
datafiles/GMEXT-Steamworks.html Normal file
View file

@ -0,0 +1,24 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>GMEXT-Steamworks Documentation</title>
<style>
body, html {
margin: 0;
padding: 0;
height: 100%;
width: 100%;
overflow: hidden;
}
iframe {
border: none;
width: 100%;
height: 100%;
}
</style>
</head>
<body>
<iframe src="../extensions/steamworks/docs/home.html"></iframe>
</body>
</html>

2
objects/o_main/Other_2.gml
View file

@ -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 =====");

2
objects/o_main/Step_1.gml
View file

@ -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}");

10
scripts/console_commands/console_commands.gml
View file

@ -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
}

2
scripts/globals/globals.gml
View file

@ -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();

2
scripts/preferences/preferences.gml
View file

@ -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;