diff --git a/disarm.yyp b/disarm.yyp index bf4cb96..14f6199 100644 --- a/disarm.yyp +++ b/disarm.yyp @@ -1,7 +1,7 @@ { "resources": [ - {"id":{"name":"obj_disarm_example","path":"objects/obj_disarm_example/obj_disarm_example.yy",},"order":1,}, - {"id":{"name":"scr_disarm","path":"scripts/scr_disarm/scr_disarm.yy",},"order":2,}, + {"id":{"name":"obj_disarm_example","path":"objects/obj_disarm_example/obj_disarm_example.yy",},"order":0,}, + {"id":{"name":"scr_disarm","path":"scripts/scr_disarm/scr_disarm.yy",},"order":1,}, {"id":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},"order":11,}, ], "Options": [ @@ -12,9 +12,8 @@ {"name":"HTML5","path":"options/html5/options_html5.yy",}, {"name":"operagx","path":"options/operagx/options_operagx.yy",}, ], - "isDnDProject": false, + "defaultScriptType": 1, "isEcma": false, - "tutorialPath": "", "configs": { "name": "Default", "children": [], @@ -29,7 +28,7 @@ {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",}, ], "TextureGroups": [ - {"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, + {"isScaled":true,"compressFormat":"bz2","autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, ], "IncludedFiles": [ {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"armature.scon","resourceType":"GMIncludedFile",}, @@ -40,9 +39,9 @@ {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"wanda.scon","resourceType":"GMIncludedFile",}, ], "MetaData": { - "IDEVersion": "23.1.1.408", + "IDEVersion": "2022.6.1.26", }, - "resourceVersion": "1.4", + "resourceVersion": "1.5", "name": "disarm", "tags": [], "resourceType": "GMProject", diff --git a/objects/obj_disarm_example/obj_disarm_example.yy b/objects/obj_disarm_example/obj_disarm_example.yy index c60be1e..36e12d2 100644 --- a/objects/obj_disarm_example/obj_disarm_example.yy +++ b/objects/obj_disarm_example/obj_disarm_example.yy @@ -2,6 +2,7 @@ "spriteId": null, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": null, diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 23e7423..a0af855 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -8,9 +8,13 @@ "option_steam_app_id": "0", "option_sci_usesci": false, "option_author": "", - "option_lastchanged": "", + "option_collision_compatibility": true, + "option_copy_on_write_enabled": true, "option_spine_licence": false, - "resourceVersion": "1.2", + "option_template_image": "${base_options_dir}/main/template_image.png", + "option_template_icon": "${base_options_dir}/main/template_icon.png", + "option_template_description": null, + "resourceVersion": "1.4", "name": "Main", "tags": [], "resourceType": "GMMainOptions", diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 44cc31c..4c83a2b 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -26,7 +26,7 @@ "option_windows_license": "${base_options_dir}/windows/installer/license.txt", "option_windows_nsis_file": "${base_options_dir}/windows/installer/nsis_script.nsi", "option_windows_enable_steam": false, - "option_windows_disable_sandbox": false, + "option_windows_disable_sandbox": true, "option_windows_steam_use_alternative_launcher": false, "option_windows_use_x64": false, "resourceVersion": "1.1",