diff --git a/fonts/fntDefault/fntDefault.yy b/fonts/fntDefault/fntDefault.yy index 72cd68d8..5247a746 100644 --- a/fonts/fntDefault/fntDefault.yy +++ b/fonts/fntDefault/fntDefault.yy @@ -3,6 +3,7 @@ "glyphOperations": 0, "interpreter": 0, "pointRounding": 0, + "applyKerning": 0, "fontName": "Arial", "styleName": "Regular", "size": 30.0, @@ -20,6 +21,7 @@ "path": "texturegroups/Default", }, "ascenderOffset": 0, + "ascender": 0, "glyphs": { "32": {"x":2,"y":2,"w":11,"h":46,"character":32,"shift":11,"offset":0,}, "33": {"x":367,"y":98,"w":5,"h":46,"character":33,"shift":11,"offset":3,}, diff --git a/objects/oBasics/Create_0.gml b/objects/oBasics/Create_0.gml index 5156bbe8..9ffe76dd 100644 --- a/objects/oBasics/Create_0.gml +++ b/objects/oBasics/Create_0.gml @@ -7,4 +7,6 @@ ChatterboxAddFunction("TestFunctionDoNotExecute", function(_array) { show_messag box = ChatterboxCreate("Test.yarn"); //Tell the chatterbox to jump to a node -ChatterboxJump(box, "Start"); \ No newline at end of file +ChatterboxJump(box, "Start"); + +a diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy index a29fed7e..7813ae08 100644 --- a/options/ios/options_ios.yy +++ b/options/ios/options_ios.yy @@ -36,11 +36,6 @@ "option_ios_half_ipad1_textures": false, "option_ios_scale": 0, "option_ios_texture_page": "2048x2048", - "option_ios_use_facebook": false, - "option_ios_facebook_id": "", - "option_ios_facebook_app_display_name": "", - "option_ios_push_notifications": false, - "option_ios_apple_sign_in": false, "option_ios_podfile_path": "${options_dir}/ios/Podfile", "option_ios_podfile_lock_path": "${options_dir}/ios/Podfile.lock", "resourceVersion": "1.3", diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy index c6562748..2cf254e1 100644 --- a/options/operagx/options_operagx.yy +++ b/options/operagx/options_operagx.yy @@ -1,11 +1,16 @@ { "option_operagx_version": "1.0.0.0", + "option_operagx_next_version": "1.0.0.0", "option_operagx_game_name": "${project_name}", - "option_operagx_splash_screen": "${base_options_dir}/operagx/splash.png", "option_operagx_interpolate_pixels": true, "option_operagx_scale": 0, "option_operagx_texture_page": "2048x2048", - "option_operagx_icon": "${base_options_dir}/operagx/icon.png", + "option_operagx_display_cursor": true, + "option_operagx_guid": "", + "option_operagx_team_name": "", + "option_operagx_editUrl": "", + "option_operagx_internalShareUrl": "", + "option_operagx_publicShareUrl": "", "resourceVersion": "1.0", "name": "operagx", "tags": [], diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy index 275eb092..24f2f939 100644 --- a/options/tvos/options_tvos.yy +++ b/options/tvos/options_tvos.yy @@ -18,8 +18,6 @@ "option_tvos_scale": 0, "option_tvos_texture_page": "2048x2048", "option_tvos_display_cursor": false, - "option_tvos_push_notifications": false, - "option_tvos_apple_sign_in": false, "option_tvos_podfile_path": "${options_dir}\\tvos\\Podfile", "option_tvos_podfile_lock_path": "${options_dir}\\tvos\\Podfile.lock", "resourceVersion": "1.3", diff --git a/options/windowsuap/options_windowsuap.yy b/options/windowsuap/options_windowsuap.yy index 0fc19a1c..03d7a5be 100644 --- a/options/windowsuap/options_windowsuap.yy +++ b/options/windowsuap/options_windowsuap.yy @@ -52,7 +52,7 @@ "option_windowsuap_team_family_platform_min_version": "10.0.14393.0", "option_windowsuap_xbox_live": false, "option_windowsuap_xbox_live_creators_program": false, - "option_windowsuap_xbox_live_title_id": 0, + "option_windowsuap_xbox_live_title_id": "0", "option_windowsuap_xbox_live_scid": null, "resourceVersion": "1.0", "name": "Windows UWP", diff --git a/rooms/rmTest/rmTest.yy b/rooms/rmTest/rmTest.yy index 4ff0fce1..02882e93 100644 --- a/rooms/rmTest/rmTest.yy +++ b/rooms/rmTest/rmTest.yy @@ -14,7 +14,7 @@ ], "layers": [ {"instances":[ - {"properties":[],"isDnd":false,"objectId":{"name":"oTestCaseJumpIncludeVariable","path":"objects/oTestCaseJumpIncludeVariable/oTestCaseJumpIncludeVariable.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":32.0,"y":32.0,"resourceVersion":"1.0","name":"inst_7F2087EA","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTestCaseParsers","path":"objects/oTestCaseParsers/oTestCaseParsers.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":32.0,"y":32.0,"resourceVersion":"1.0","name":"inst_1BDCAE75","tags":[],"resourceType":"GMRInstance",}, ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],"resourceVersion":"1.0","name":"Example","tags":[],"resourceType":"GMRInstanceLayer",}, {"spriteId":null,"colour":4281542935,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",}, ], @@ -22,7 +22,7 @@ "creationCodeFile": "", "inheritCode": false, "instanceCreationOrder": [ - {"name":"inst_7F2087EA","path":"rooms/rmTest/rmTest.yy",}, + {"name":"inst_1BDCAE75","path":"rooms/rmTest/rmTest.yy",}, ], "inheritCreationOrder": false, "sequenceId": null,