diff --git a/PixelComposer.yyp b/PixelComposer.yyp index 8125b8d95..672f8442f 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -393,6 +393,10 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"mfcore.dll","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"mfplat.dll","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"README.txt","ConfigValues":{"Itch":{"CopyToMask":"0",},},"CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"data.win","CopyToMask":-1,"filePath":"datafiles/report",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"execute_shell_simple_ext_x64.dll","CopyToMask":-1,"filePath":"datafiles/report",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"options.ini","CopyToMask":-1,"filePath":"datafiles/report",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"PXC crash reporter.exe","CopyToMask":-1,"filePath":"datafiles/report",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"arrowRight.png","CopyToMask":-1,"filePath":"datafiles/Sample Projects",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Bevel.png","CopyToMask":-1,"filePath":"datafiles/Sample Projects",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"Broken heart.png","CopyToMask":-1,"filePath":"datafiles/Sample Projects",}, @@ -432,7 +436,7 @@ "isEcma": false, "LibraryEmitters": [], "MetaData": { - "IDEVersion": "2023.8.2.108", + "IDEVersion": "2023.11.1.129", }, "resources": [ {"id":{"name":"s_node_corner","path":"sprites/s_node_corner/s_node_corner.yy",},}, diff --git a/datafiles/report/PXC crash reporter.exe b/datafiles/report/PXC crash reporter.exe new file mode 100644 index 000000000..07bc5087e Binary files /dev/null and b/datafiles/report/PXC crash reporter.exe differ diff --git a/datafiles/report/data.win b/datafiles/report/data.win new file mode 100644 index 000000000..d9d9097b2 Binary files /dev/null and b/datafiles/report/data.win differ diff --git a/datafiles/report/execute_shell_simple_ext_x64.dll b/datafiles/report/execute_shell_simple_ext_x64.dll new file mode 100644 index 000000000..e739c5366 Binary files /dev/null and b/datafiles/report/execute_shell_simple_ext_x64.dll differ diff --git a/datafiles/report/options.ini b/datafiles/report/options.ini new file mode 100644 index 000000000..08593e904 --- /dev/null +++ b/datafiles/report/options.ini @@ -0,0 +1,6 @@ +[Windows] +SleepMargin=10 +Usex64=True +[LLVM-WINDOWS] +VisualStudioDir=C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat +[execute_shell_simple_ext] diff --git a/fonts/_f_sdf/_f_sdf.old.png b/fonts/_f_sdf/_f_sdf.old.png index 737d8eb49..9d4cccb86 100644 Binary files a/fonts/_f_sdf/_f_sdf.old.png and b/fonts/_f_sdf/_f_sdf.old.png differ diff --git a/fonts/_f_sdf/_f_sdf.png b/fonts/_f_sdf/_f_sdf.png index 9d4cccb86..bbd5ce08b 100644 Binary files a/fonts/_f_sdf/_f_sdf.png and b/fonts/_f_sdf/_f_sdf.png differ diff --git a/fonts/_f_sdf_medium/_f_sdf_medium.old.png b/fonts/_f_sdf_medium/_f_sdf_medium.old.png index 7913f4b8c..74b4210d5 100644 Binary files a/fonts/_f_sdf_medium/_f_sdf_medium.old.png and b/fonts/_f_sdf_medium/_f_sdf_medium.old.png differ diff --git a/fonts/_f_sdf_medium/_f_sdf_medium.png b/fonts/_f_sdf_medium/_f_sdf_medium.png index 74b4210d5..1fdbde32e 100644 Binary files a/fonts/_f_sdf_medium/_f_sdf_medium.png and b/fonts/_f_sdf_medium/_f_sdf_medium.png differ diff --git a/scripts/debug/debug.gml b/scripts/debug/debug.gml index 26ad3b150..0d7f37f29 100644 --- a/scripts/debug/debug.gml +++ b/scripts/debug/debug.gml @@ -94,11 +94,11 @@ function setException() { #region clipboard_set_text(tt); show_debug_message(tt); - var rep = $"{program_directory}report\\PXC crash reporter.exe"; - if(OS == os_macosx) rep = $"{program_directory}PXC_crash_reporter.app"; + var rep = $"{APP_LOCATION}report\\PXC crash reporter.exe"; + //if(OS == os_macosx) rep = $"{program_directory}PXC_crash_reporter.app"; - var pid = shell_execute_async(rep, DIRECTORY); - show_message($"{rep} [{file_exists(rep)}]: {pid}"); + var pid = shell_execute(rep, DIRECTORY); + print($"{rep} [{file_exists(rep)}]: {pid}"); return 0; });