From 688627c669725ecf4d653c129f078f93a05d007f Mon Sep 17 00:00:00 2001 From: Francisco Dias Date: Tue, 9 May 2023 12:10:35 +0100 Subject: [PATCH] Fixed script files on macOS --- .../GooglePlayPassLicensing.yyp | 2 +- .../GooglePlayPassLicensing.yy | 2 +- .../GooglePlayPassLicensing/post_package_step.sh | 2 +- .../GooglePlayPassLicensing/post_run_step.sh | 2 +- .../GooglePlayPassLicensing/pre_build_step.sh | 2 +- .../options/operagx/options_operagx.yy | 11 ++++++++++- .../InstanceCreationCode_inst_267311CD.gml | 4 ++++ .../Room_GooglePlayPassLicensing.yy | 2 ++ 8 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 source/GooglePlayPassLicensing_gml/rooms/Room_GooglePlayPassLicensing/InstanceCreationCode_inst_267311CD.gml diff --git a/source/GooglePlayPassLicensing_gml/GooglePlayPassLicensing.yyp b/source/GooglePlayPassLicensing_gml/GooglePlayPassLicensing.yyp index 5f3ec85..f5e4ec8 100644 --- a/source/GooglePlayPassLicensing_gml/GooglePlayPassLicensing.yyp +++ b/source/GooglePlayPassLicensing_gml/GooglePlayPassLicensing.yyp @@ -22,7 +22,7 @@ "isEcma": false, "LibraryEmitters": [], "MetaData": { - "IDEVersion": "2023.2.1.75", + "IDEVersion": "2023.4.0.84", }, "resources": [ {"id":{"name":"Spr_YoYo_button","path":"sprites/Spr_YoYo_button/Spr_YoYo_button.yy",},}, diff --git a/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/GooglePlayPassLicensing.yy b/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/GooglePlayPassLicensing.yy index 6a844dd..7778ef9 100644 --- a/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/GooglePlayPassLicensing.yy +++ b/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/GooglePlayPassLicensing.yy @@ -18,7 +18,7 @@ "date": "2021-05-08T03:13:08.4469513+01:00", "description": "", "exportToGame": true, - "extensionVersion": "1.0.0", + "extensionVersion": "1.1.0", "files": [ {"resourceType":"GMExtensionFile","resourceVersion":"1.0","name":"","constants":[ {"resourceType":"GMExtensionConstant","resourceVersion":"1.0","name":"GooglePlayPassLicensing_Licensed","hidden":false,"value":"\"LICENSED\"",}, diff --git a/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/post_package_step.sh b/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/post_package_step.sh index 5d1f284..370dbaa 100644 --- a/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/post_package_step.sh +++ b/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/post_package_step.sh @@ -1,6 +1,6 @@ #!/bin/bash -sed -i -e 's/\\r$//' "$(dirname "$0")/scriptUtils.sh" +sed -i -e 's/\r$//' "$(dirname "$0")/scriptUtils.sh" chmod +x "$(dirname "$0")/scriptUtils.sh" source "$(dirname "$0")/scriptUtils.sh" diff --git a/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/post_run_step.sh b/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/post_run_step.sh index 5d1f284..370dbaa 100644 --- a/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/post_run_step.sh +++ b/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/post_run_step.sh @@ -1,6 +1,6 @@ #!/bin/bash -sed -i -e 's/\\r$//' "$(dirname "$0")/scriptUtils.sh" +sed -i -e 's/\r$//' "$(dirname "$0")/scriptUtils.sh" chmod +x "$(dirname "$0")/scriptUtils.sh" source "$(dirname "$0")/scriptUtils.sh" diff --git a/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/pre_build_step.sh b/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/pre_build_step.sh index ed3abb8..459e027 100644 --- a/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/pre_build_step.sh +++ b/source/GooglePlayPassLicensing_gml/extensions/GooglePlayPassLicensing/pre_build_step.sh @@ -1,6 +1,6 @@ #!/bin/bash -sed -i -e 's/\\r$//' "$(dirname "$0")/scriptUtils.sh" +sed -i -e 's/\r$//' "$(dirname "$0")/scriptUtils.sh" chmod +x "$(dirname "$0")/scriptUtils.sh" source "$(dirname "$0")/scriptUtils.sh" diff --git a/source/GooglePlayPassLicensing_gml/options/operagx/options_operagx.yy b/source/GooglePlayPassLicensing_gml/options/operagx/options_operagx.yy index c72d30d..9041dc0 100644 --- a/source/GooglePlayPassLicensing_gml/options/operagx/options_operagx.yy +++ b/source/GooglePlayPassLicensing_gml/options/operagx/options_operagx.yy @@ -1,6 +1,6 @@ { "resourceType": "GMOperaGXOptions", - "resourceVersion": "1.0", + "resourceVersion": "1.1", "name": "operagx", "option_operagx_display_cursor": true, "option_operagx_editUrl": "", @@ -8,6 +8,15 @@ "option_operagx_guid": "", "option_operagx_internalShareUrl": "", "option_operagx_interpolate_pixels": true, + "option_operagx_mod_editUrl": "", + "option_operagx_mod_game_name": "${project_name}", + "option_operagx_mod_guid": "", + "option_operagx_mod_internalShareUrl": "", + "option_operagx_mod_next_version": "1.0.0.0", + "option_operagx_mod_publicShareUrl": "", + "option_operagx_mod_team_id": "", + "option_operagx_mod_team_name": "", + "option_operagx_mod_version": "1.0.0.0", "option_operagx_next_version": "1.0.0.0", "option_operagx_publicShareUrl": "", "option_operagx_scale": 0, diff --git a/source/GooglePlayPassLicensing_gml/rooms/Room_GooglePlayPassLicensing/InstanceCreationCode_inst_267311CD.gml b/source/GooglePlayPassLicensing_gml/rooms/Room_GooglePlayPassLicensing/InstanceCreationCode_inst_267311CD.gml new file mode 100644 index 0000000..6e923b8 --- /dev/null +++ b/source/GooglePlayPassLicensing_gml/rooms/Room_GooglePlayPassLicensing/InstanceCreationCode_inst_267311CD.gml @@ -0,0 +1,4 @@ + +font = Font_YoYo_30; +valign = fa_middle; +text = "GooglePlay Pass License" \ No newline at end of file diff --git a/source/GooglePlayPassLicensing_gml/rooms/Room_GooglePlayPassLicensing/Room_GooglePlayPassLicensing.yy b/source/GooglePlayPassLicensing_gml/rooms/Room_GooglePlayPassLicensing/Room_GooglePlayPassLicensing.yy index 6cd4087..cd8637d 100644 --- a/source/GooglePlayPassLicensing_gml/rooms/Room_GooglePlayPassLicensing/Room_GooglePlayPassLicensing.yy +++ b/source/GooglePlayPassLicensing_gml/rooms/Room_GooglePlayPassLicensing/Room_GooglePlayPassLicensing.yy @@ -8,11 +8,13 @@ "inheritLayers": false, "instanceCreationOrder": [ {"name":"inst_29F48283","path":"rooms/Room_GooglePlayPassLicensing/Room_GooglePlayPassLicensing.yy",}, + {"name":"inst_267311CD","path":"rooms/Room_GooglePlayPassLicensing/Room_GooglePlayPassLicensing.yy",}, ], "isDnd": false, "layers": [ {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_29F48283","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"Obj_GooglePlayPassLicensing","path":"objects/Obj_GooglePlayPassLicensing/Obj_GooglePlayPassLicensing.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":96.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_267311CD","colour":4294967295,"frozen":false,"hasCreationCode":true,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"Obj_YoYo_text","path":"objects/Obj_YoYo_text/Obj_YoYo_text.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":352.0,"y":42.0,}, ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":30.0,"animationSpeedType":0,"colour":4294967295,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":{"name":"Spr_YoYo_Background","path":"sprites/Spr_YoYo_Background/Spr_YoYo_Background.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, ],