From 0171f7de7f97f009ba9963acca6767165216e48c Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Wed, 27 Mar 2024 01:50:29 +0100 Subject: [PATCH 01/14] changed pixel grid room to have smooth draw option --- .../stanncam_ac_bouncy/stanncam_ac_bouncy.yy | 22 +- .../stanncam_ac_ease/stanncam_ac_ease.yy | 22 +- .../stanncam_ac_linear/stanncam_ac_linear.yy | 22 +- fonts/f_hires/f_hires.yy | 268 +++++++++--------- fonts/f_pixel/f_pixel.yy | 268 +++++++++--------- .../__obj_stanncam_manager.yy | 66 ++--- objects/obj_ball/obj_ball.yy | 64 +++-- objects/obj_camera/obj_camera.yy | 72 ++--- objects/obj_camera_pixel_grid/Create_0.gml | 8 + objects/obj_camera_pixel_grid/Draw_64.gml | 5 +- objects/obj_camera_pixel_grid/Step_0.gml | 30 +- .../obj_camera_pixel_grid.yy | 70 ++--- .../obj_camera_sidescroller.yy | 72 ++--- objects/obj_collision/obj_collision.yy | 62 ++-- objects/obj_game_controller/Create_0.gml | 2 + .../obj_game_controller.yy | 68 ++--- objects/obj_player/obj_player.yy | 68 ++--- objects/obj_player2/obj_player2.yy | 70 ++--- .../obj_player_sidescroller.yy | 68 ++--- .../obj_player_sidescroller2.yy | 68 ++--- .../obj_stanncam_zone/obj_stanncam_zone.yy | 66 ++--- .../obj_stanncam_zone_1side.yy | 68 ++--- .../obj_stanncam_zone_2side.yy | 68 ++--- .../obj_stanncam_zone_corner.yy | 68 ++--- .../obj_stanncam_zone_u.yy | 68 ++--- objects/obj_tv/obj_tv.yy | 66 ++--- options/android/options_android.yy | 156 +++++----- options/html5/options_html5.yy | 64 +++-- options/ios/options_ios.yy | 94 +++--- options/linux/options_linux.yy | 46 +-- options/mac/options_mac.yy | 70 ++--- options/main/options_main.yy | 38 +-- options/operagx/options_operagx.yy | 52 ++-- options/tvos/options_tvos.yy | 58 ++-- options/windows/options_windows.yy | 66 ++--- rooms/rm_init/rm_init.yy | 76 ++--- rooms/rm_pixel_grid/rm_pixel_grid.yy | 76 ++--- rooms/rm_sidescroller/rm_sidescroller.yy | 152 +++++----- rooms/rm_test/rm_test.yy | 89 +++--- .../draw_sprite_ext_tiled.yy | 18 +- .../draw_text_outline/draw_text_outline.yy | 18 +- scripts/macros/macros.yy | 18 +- scripts/stanncam/stanncam.yy | 18 +- .../stanncam_animcurve/stanncam_animcurve.yy | 18 +- scripts/stanncam_macros/stanncam_macros.yy | 18 +- scripts/stanncam_manager/stanncam_manager.yy | 18 +- .../stanncam_resolution_presets.yy | 18 +- scripts/stanncam_shake/stanncam_shake.yy | 18 +- sprites/spr_arrow/spr_arrow.yy | 156 +++++----- sprites/spr_arrow_small/spr_arrow_small.yy | 154 +++++----- sprites/spr_ball/spr_ball.yy | 148 +++++----- sprites/spr_bg/spr_bg.yy | 150 +++++----- sprites/spr_bg2/spr_bg2.yy | 150 +++++----- sprites/spr_collision/spr_collision.yy | 148 +++++----- sprites/spr_pengu/spr_pengu.yy | 154 +++++----- sprites/spr_pengu2/spr_pengu2.yy | 154 +++++----- .../spr_pixel_grid_test.yy | 148 +++++----- .../spr_pixel_side_Underwater.yy | 148 +++++----- sprites/spr_player2_idle/spr_player2_idle.yy | 148 +++++----- .../spr_player2_moving/spr_player2_moving.yy | 154 +++++----- sprites/spr_player_idle/spr_player_idle.yy | 148 +++++----- .../spr_player_moving/spr_player_moving.yy | 154 +++++----- .../spr_stanncam_zone/spr_stanncam_zone.yy | 176 ++++++------ .../spr_stanncam_zone_1side.yy | 178 ++++++------ .../spr_stanncam_zone_2side.yy | 178 ++++++------ .../spr_stanncam_zone_corner.yy | 178 ++++++------ .../spr_stanncam_zone_u.yy | 178 ++++++------ sprites/spr_tile_bg/spr_tile_bg.yy | 148 +++++----- sprites/spr_tv/spr_tv.yy | 148 +++++----- sprites/spr_underwater/spr_underwater.yy | 148 +++++----- .../spr_underwater_layer00.yy | 176 ++++++------ .../spr_underwater_layer01.yy | 176 ++++++------ .../spr_underwater_layer02.yy | 176 ++++++------ .../spr_underwater_layer03.yy | 176 ++++++------ .../spr_underwater_layer04.yy | 176 ++++++------ .../spr_underwater_layer05.yy | 176 ++++++------ stanncam.resource_order | 4 +- stanncam.yyp | 80 +++--- tilesets/TileSet1/TileSet1.yy | 71 +++-- .../ts_pixel_side_Underwater.yy | 169 +++-------- 80 files changed, 4138 insertions(+), 3686 deletions(-) diff --git a/animcurves/stanncam_ac_bouncy/stanncam_ac_bouncy.yy b/animcurves/stanncam_ac_bouncy/stanncam_ac_bouncy.yy index 0887c56..d944696 100644 --- a/animcurves/stanncam_ac_bouncy/stanncam_ac_bouncy.yy +++ b/animcurves/stanncam_ac_bouncy/stanncam_ac_bouncy.yy @@ -1,17 +1,19 @@ { - "resourceType": "GMAnimCurve", - "resourceVersion": "1.2", - "name": "stanncam_ac_bouncy", - "channels": [ - {"resourceType":"GMAnimCurveChannel","resourceVersion":"1.0","name":"curve1","colour":4290799884,"points":[ + "$GMAnimCurve":"", + "%Name":"stanncam_ac_bouncy", + "channels":[ + {"$GMAnimCurveChannel":"","%Name":"curve1","colour":4290799884,"name":"curve1","points":[ {"th0":-0.1,"th1":0.28146017,"tv0":0.0,"tv1":0.0,"x":0.0,"y":0.0,}, {"th0":-0.11560963,"th1":0.24364233,"tv0":-0.3227591,"tv1":0.68020093,"x":0.50024146,"y":0.5,}, {"th0":-0.36604935,"th1":0.1,"tv0":-0.0071766376,"tv1":0.0,"x":1.0,"y":1.0,}, - ],"visible":true,}, + ],"resourceType":"GMAnimCurveChannel","resourceVersion":"2.0","visible":true,}, ], - "function": 2, - "parent": { - "name": "Animation Curves - Add more as needed", - "path": "folders/STANNcam/Miscellaneous/Animation Curves - Add more as needed.yy", + "function":2, + "name":"stanncam_ac_bouncy", + "parent":{ + "name":"Animation Curves - Add more as needed", + "path":"folders/STANNcam/Miscellaneous/Animation Curves - Add more as needed.yy", }, + "resourceType":"GMAnimCurve", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/animcurves/stanncam_ac_ease/stanncam_ac_ease.yy b/animcurves/stanncam_ac_ease/stanncam_ac_ease.yy index e515fb5..7798bc2 100644 --- a/animcurves/stanncam_ac_ease/stanncam_ac_ease.yy +++ b/animcurves/stanncam_ac_ease/stanncam_ac_ease.yy @@ -1,16 +1,18 @@ { - "resourceType": "GMAnimCurve", - "resourceVersion": "1.2", - "name": "stanncam_ac_ease", - "channels": [ - {"resourceType":"GMAnimCurveChannel","resourceVersion":"1.0","name":"curve1","colour":4290799884,"points":[ + "$GMAnimCurve":"", + "%Name":"stanncam_ac_ease", + "channels":[ + {"$GMAnimCurveChannel":"","%Name":"curve1","colour":4290799884,"name":"curve1","points":[ {"th0":-0.1,"th1":0.53711194,"tv0":0.0,"tv1":0.030876111,"x":0.0,"y":0.0,}, {"th0":-0.5787191,"th1":0.1,"tv0":-0.026311576,"tv1":0.0,"x":1.0,"y":1.0,}, - ],"visible":true,}, + ],"resourceType":"GMAnimCurveChannel","resourceVersion":"2.0","visible":true,}, ], - "function": 2, - "parent": { - "name": "Animation Curves - Add more as needed", - "path": "folders/STANNcam/Miscellaneous/Animation Curves - Add more as needed.yy", + "function":2, + "name":"stanncam_ac_ease", + "parent":{ + "name":"Animation Curves - Add more as needed", + "path":"folders/STANNcam/Miscellaneous/Animation Curves - Add more as needed.yy", }, + "resourceType":"GMAnimCurve", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/animcurves/stanncam_ac_linear/stanncam_ac_linear.yy b/animcurves/stanncam_ac_linear/stanncam_ac_linear.yy index db5154e..3217d85 100644 --- a/animcurves/stanncam_ac_linear/stanncam_ac_linear.yy +++ b/animcurves/stanncam_ac_linear/stanncam_ac_linear.yy @@ -1,16 +1,18 @@ { - "resourceType": "GMAnimCurve", - "resourceVersion": "1.2", - "name": "stanncam_ac_linear", - "channels": [ - {"resourceType":"GMAnimCurveChannel","resourceVersion":"1.0","name":"curve1","colour":4290799884,"points":[ + "$GMAnimCurve":"", + "%Name":"stanncam_ac_linear", + "channels":[ + {"$GMAnimCurveChannel":"","%Name":"curve1","colour":4290799884,"name":"curve1","points":[ {"th0":-0.1,"th1":0.1,"tv0":0.0,"tv1":0.0,"x":0.0,"y":0.0,}, {"th0":-0.1,"th1":0.1,"tv0":0.0,"tv1":0.0,"x":1.0,"y":1.0,}, - ],"visible":true,}, + ],"resourceType":"GMAnimCurveChannel","resourceVersion":"2.0","visible":true,}, ], - "function": 0, - "parent": { - "name": "Animation Curves - Add more as needed", - "path": "folders/STANNcam/Miscellaneous/Animation Curves - Add more as needed.yy", + "function":0, + "name":"stanncam_ac_linear", + "parent":{ + "name":"Animation Curves - Add more as needed", + "path":"folders/STANNcam/Miscellaneous/Animation Curves - Add more as needed.yy", }, + "resourceType":"GMAnimCurve", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/fonts/f_hires/f_hires.yy b/fonts/f_hires/f_hires.yy index 8a63eeb..388a401 100644 --- a/fonts/f_hires/f_hires.yy +++ b/fonts/f_hires/f_hires.yy @@ -1,141 +1,143 @@ { - "resourceType": "GMFont", - "resourceVersion": "1.0", - "name": "f_hires", - "AntiAlias": 1, - "applyKerning": 0, - "ascender": 39, - "ascenderOffset": 0, - "bold": false, - "canGenerateBitmap": true, - "charset": 0, - "first": 0, - "fontName": "Atkinson Hyperlegible", - "glyphOperations": 0, - "glyphs": { - "32": {"character":32,"h":54,"offset":0,"shift":15,"w":15,"x":2,"y":2,}, - "33": {"character":33,"h":54,"offset":1,"shift":13,"w":10,"x":189,"y":170,}, - "34": {"character":34,"h":54,"offset":1,"shift":19,"w":16,"x":171,"y":170,}, - "35": {"character":35,"h":54,"offset":1,"shift":35,"w":34,"x":135,"y":170,}, - "36": {"character":36,"h":54,"offset":1,"shift":28,"w":27,"x":106,"y":170,}, - "37": {"character":37,"h":54,"offset":1,"shift":44,"w":43,"x":61,"y":170,}, - "38": {"character":38,"h":54,"offset":1,"shift":32,"w":31,"x":28,"y":170,}, - "39": {"character":39,"h":54,"offset":1,"shift":10,"w":8,"x":18,"y":170,}, - "40": {"character":40,"h":54,"offset":1,"shift":17,"w":14,"x":2,"y":170,}, - "41": {"character":41,"h":54,"offset":1,"shift":17,"w":14,"x":485,"y":114,}, - "42": {"character":42,"h":54,"offset":2,"shift":20,"w":16,"x":201,"y":170,}, - "43": {"character":43,"h":54,"offset":2,"shift":28,"w":24,"x":459,"y":114,}, - "44": {"character":44,"h":54,"offset":1,"shift":13,"w":10,"x":420,"y":114,}, - "45": {"character":45,"h":54,"offset":1,"shift":19,"w":16,"x":402,"y":114,}, - "46": {"character":46,"h":54,"offset":1,"shift":13,"w":10,"x":390,"y":114,}, - "47": {"character":47,"h":54,"offset":0,"shift":20,"w":20,"x":368,"y":114,}, - "48": {"character":48,"h":54,"offset":2,"shift":30,"w":27,"x":339,"y":114,}, - "49": {"character":49,"h":54,"offset":2,"shift":20,"w":14,"x":323,"y":114,}, - "50": {"character":50,"h":54,"offset":1,"shift":27,"w":24,"x":297,"y":114,}, - "51": {"character":51,"h":54,"offset":1,"shift":27,"w":25,"x":270,"y":114,}, - "52": {"character":52,"h":54,"offset":1,"shift":28,"w":26,"x":242,"y":114,}, - "53": {"character":53,"h":54,"offset":1,"shift":28,"w":25,"x":432,"y":114,}, - "54": {"character":54,"h":54,"offset":2,"shift":29,"w":25,"x":219,"y":170,}, - "55": {"character":55,"h":54,"offset":0,"shift":25,"w":24,"x":246,"y":170,}, - "56": {"character":56,"h":54,"offset":1,"shift":28,"w":26,"x":272,"y":170,}, - "57": {"character":57,"h":54,"offset":1,"shift":25,"w":23,"x":342,"y":226,}, - "58": {"character":58,"h":54,"offset":1,"shift":13,"w":10,"x":330,"y":226,}, - "59": {"character":59,"h":54,"offset":1,"shift":13,"w":10,"x":318,"y":226,}, - "60": {"character":60,"h":54,"offset":1,"shift":26,"w":24,"x":292,"y":226,}, - "61": {"character":61,"h":54,"offset":2,"shift":28,"w":24,"x":266,"y":226,}, - "62": {"character":62,"h":54,"offset":1,"shift":26,"w":24,"x":240,"y":226,}, - "63": {"character":63,"h":54,"offset":1,"shift":28,"w":25,"x":213,"y":226,}, - "64": {"character":64,"h":54,"offset":1,"shift":34,"w":32,"x":179,"y":226,}, - "65": {"character":65,"h":54,"offset":0,"shift":31,"w":32,"x":145,"y":226,}, - "66": {"character":66,"h":54,"offset":1,"shift":29,"w":27,"x":116,"y":226,}, - "67": {"character":67,"h":54,"offset":1,"shift":31,"w":29,"x":85,"y":226,}, - "68": {"character":68,"h":54,"offset":1,"shift":31,"w":29,"x":54,"y":226,}, - "69": {"character":69,"h":54,"offset":1,"shift":26,"w":25,"x":27,"y":226,}, - "70": {"character":70,"h":54,"offset":1,"shift":25,"w":23,"x":2,"y":226,}, - "71": {"character":71,"h":54,"offset":1,"shift":33,"w":30,"x":469,"y":170,}, - "72": {"character":72,"h":54,"offset":1,"shift":31,"w":28,"x":439,"y":170,}, - "73": {"character":73,"h":54,"offset":2,"shift":21,"w":17,"x":420,"y":170,}, - "74": {"character":74,"h":54,"offset":0,"shift":25,"w":24,"x":394,"y":170,}, - "75": {"character":75,"h":54,"offset":1,"shift":30,"w":29,"x":363,"y":170,}, - "76": {"character":76,"h":54,"offset":1,"shift":24,"w":23,"x":338,"y":170,}, - "77": {"character":77,"h":54,"offset":1,"shift":38,"w":36,"x":300,"y":170,}, - "78": {"character":78,"h":54,"offset":1,"shift":32,"w":29,"x":211,"y":114,}, - "79": {"character":79,"h":54,"offset":1,"shift":35,"w":33,"x":176,"y":114,}, - "80": {"character":80,"h":54,"offset":1,"shift":29,"w":27,"x":147,"y":114,}, - "81": {"character":81,"h":54,"offset":1,"shift":35,"w":35,"x":76,"y":58,}, - "82": {"character":82,"h":54,"offset":1,"shift":30,"w":28,"x":31,"y":58,}, - "83": {"character":83,"h":54,"offset":1,"shift":28,"w":27,"x":2,"y":58,}, - "84": {"character":84,"h":54,"offset":0,"shift":28,"w":28,"x":461,"y":2,}, - "85": {"character":85,"h":54,"offset":1,"shift":30,"w":27,"x":432,"y":2,}, - "86": {"character":86,"h":54,"offset":0,"shift":30,"w":30,"x":400,"y":2,}, - "87": {"character":87,"h":54,"offset":0,"shift":40,"w":40,"x":358,"y":2,}, - "88": {"character":88,"h":54,"offset":0,"shift":32,"w":32,"x":324,"y":2,}, - "89": {"character":89,"h":54,"offset":0,"shift":31,"w":31,"x":291,"y":2,}, - "90": {"character":90,"h":54,"offset":1,"shift":28,"w":26,"x":263,"y":2,}, - "91": {"character":91,"h":54,"offset":1,"shift":15,"w":13,"x":61,"y":58,}, - "92": {"character":92,"h":54,"offset":0,"shift":20,"w":20,"x":241,"y":2,}, - "93": {"character":93,"h":54,"offset":1,"shift":15,"w":13,"x":208,"y":2,}, - "94": {"character":94,"h":54,"offset":2,"shift":27,"w":23,"x":183,"y":2,}, - "95": {"character":95,"h":54,"offset":0,"shift":19,"w":20,"x":161,"y":2,}, - "96": {"character":96,"h":54,"offset":2,"shift":14,"w":10,"x":149,"y":2,}, - "97": {"character":97,"h":54,"offset":0,"shift":25,"w":24,"x":123,"y":2,}, - "98": {"character":98,"h":54,"offset":2,"shift":27,"w":24,"x":97,"y":2,}, - "99": {"character":99,"h":54,"offset":1,"shift":24,"w":22,"x":73,"y":2,}, - "100": {"character":100,"h":54,"offset":1,"shift":27,"w":25,"x":46,"y":2,}, - "101": {"character":101,"h":54,"offset":1,"shift":26,"w":25,"x":19,"y":2,}, - "102": {"character":102,"h":54,"offset":0,"shift":17,"w":16,"x":223,"y":2,}, - "103": {"character":103,"h":54,"offset":1,"shift":27,"w":24,"x":113,"y":58,}, - "104": {"character":104,"h":54,"offset":2,"shift":26,"w":22,"x":359,"y":58,}, - "105": {"character":105,"h":54,"offset":1,"shift":14,"w":12,"x":139,"y":58,}, - "106": {"character":106,"h":54,"offset":-4,"shift":12,"w":15,"x":105,"y":114,}, - "107": {"character":107,"h":54,"offset":2,"shift":26,"w":24,"x":79,"y":114,}, - "108": {"character":108,"h":54,"offset":2,"shift":14,"w":13,"x":64,"y":114,}, - "109": {"character":109,"h":54,"offset":2,"shift":40,"w":36,"x":26,"y":114,}, - "110": {"character":110,"h":54,"offset":2,"shift":26,"w":22,"x":2,"y":114,}, - "111": {"character":111,"h":54,"offset":1,"shift":26,"w":24,"x":477,"y":58,}, - "112": {"character":112,"h":54,"offset":2,"shift":27,"w":24,"x":451,"y":58,}, - "113": {"character":113,"h":54,"offset":1,"shift":27,"w":30,"x":419,"y":58,}, - "114": {"character":114,"h":54,"offset":2,"shift":17,"w":15,"x":402,"y":58,}, - "115": {"character":115,"h":54,"offset":0,"shift":24,"w":23,"x":122,"y":114,}, - "116": {"character":116,"h":54,"offset":0,"shift":17,"w":17,"x":383,"y":58,}, - "117": {"character":117,"h":54,"offset":2,"shift":26,"w":22,"x":335,"y":58,}, - "118": {"character":118,"h":54,"offset":0,"shift":24,"w":24,"x":309,"y":58,}, - "119": {"character":119,"h":54,"offset":0,"shift":33,"w":33,"x":274,"y":58,}, - "120": {"character":120,"h":54,"offset":0,"shift":24,"w":25,"x":247,"y":58,}, - "121": {"character":121,"h":54,"offset":0,"shift":23,"w":24,"x":221,"y":58,}, - "122": {"character":122,"h":54,"offset":1,"shift":23,"w":22,"x":197,"y":58,}, - "123": {"character":123,"h":54,"offset":1,"shift":17,"w":15,"x":180,"y":58,}, - "124": {"character":124,"h":54,"offset":1,"shift":11,"w":8,"x":170,"y":58,}, - "125": {"character":125,"h":54,"offset":1,"shift":17,"w":15,"x":153,"y":58,}, - "126": {"character":126,"h":54,"offset":1,"shift":24,"w":22,"x":367,"y":226,}, - "9647": {"character":9647,"h":54,"offset":9,"shift":44,"w":26,"x":391,"y":226,}, + "$GMFont":"", + "%Name":"f_hires", + "AntiAlias":1, + "applyKerning":0, + "ascender":39, + "ascenderOffset":0, + "bold":false, + "canGenerateBitmap":true, + "charset":0, + "first":0, + "fontName":"Atkinson Hyperlegible", + "glyphOperations":0, + "glyphs":{ + "32":{"character":32,"h":54,"offset":0,"shift":15,"w":15,"x":2,"y":2,}, + "33":{"character":33,"h":54,"offset":1,"shift":13,"w":10,"x":189,"y":170,}, + "34":{"character":34,"h":54,"offset":1,"shift":19,"w":16,"x":171,"y":170,}, + "35":{"character":35,"h":54,"offset":1,"shift":35,"w":34,"x":135,"y":170,}, + "36":{"character":36,"h":54,"offset":1,"shift":28,"w":27,"x":106,"y":170,}, + "37":{"character":37,"h":54,"offset":1,"shift":44,"w":43,"x":61,"y":170,}, + "38":{"character":38,"h":54,"offset":1,"shift":32,"w":31,"x":28,"y":170,}, + "39":{"character":39,"h":54,"offset":1,"shift":10,"w":8,"x":18,"y":170,}, + "40":{"character":40,"h":54,"offset":1,"shift":17,"w":14,"x":2,"y":170,}, + "41":{"character":41,"h":54,"offset":1,"shift":17,"w":14,"x":485,"y":114,}, + "42":{"character":42,"h":54,"offset":2,"shift":20,"w":16,"x":201,"y":170,}, + "43":{"character":43,"h":54,"offset":2,"shift":28,"w":24,"x":459,"y":114,}, + "44":{"character":44,"h":54,"offset":1,"shift":13,"w":10,"x":420,"y":114,}, + "45":{"character":45,"h":54,"offset":1,"shift":19,"w":16,"x":402,"y":114,}, + "46":{"character":46,"h":54,"offset":1,"shift":13,"w":10,"x":390,"y":114,}, + "47":{"character":47,"h":54,"offset":0,"shift":20,"w":20,"x":368,"y":114,}, + "48":{"character":48,"h":54,"offset":2,"shift":30,"w":27,"x":339,"y":114,}, + "49":{"character":49,"h":54,"offset":2,"shift":20,"w":14,"x":323,"y":114,}, + "50":{"character":50,"h":54,"offset":1,"shift":27,"w":24,"x":297,"y":114,}, + "51":{"character":51,"h":54,"offset":1,"shift":27,"w":25,"x":270,"y":114,}, + "52":{"character":52,"h":54,"offset":1,"shift":28,"w":26,"x":242,"y":114,}, + "53":{"character":53,"h":54,"offset":1,"shift":28,"w":25,"x":432,"y":114,}, + "54":{"character":54,"h":54,"offset":2,"shift":29,"w":25,"x":219,"y":170,}, + "55":{"character":55,"h":54,"offset":0,"shift":25,"w":24,"x":246,"y":170,}, + "56":{"character":56,"h":54,"offset":1,"shift":28,"w":26,"x":272,"y":170,}, + "57":{"character":57,"h":54,"offset":1,"shift":25,"w":23,"x":342,"y":226,}, + "58":{"character":58,"h":54,"offset":1,"shift":13,"w":10,"x":330,"y":226,}, + "59":{"character":59,"h":54,"offset":1,"shift":13,"w":10,"x":318,"y":226,}, + "60":{"character":60,"h":54,"offset":1,"shift":26,"w":24,"x":292,"y":226,}, + "61":{"character":61,"h":54,"offset":2,"shift":28,"w":24,"x":266,"y":226,}, + "62":{"character":62,"h":54,"offset":1,"shift":26,"w":24,"x":240,"y":226,}, + "63":{"character":63,"h":54,"offset":1,"shift":28,"w":25,"x":213,"y":226,}, + "64":{"character":64,"h":54,"offset":1,"shift":34,"w":32,"x":179,"y":226,}, + "65":{"character":65,"h":54,"offset":0,"shift":31,"w":32,"x":145,"y":226,}, + "66":{"character":66,"h":54,"offset":1,"shift":29,"w":27,"x":116,"y":226,}, + "67":{"character":67,"h":54,"offset":1,"shift":31,"w":29,"x":85,"y":226,}, + "68":{"character":68,"h":54,"offset":1,"shift":31,"w":29,"x":54,"y":226,}, + "69":{"character":69,"h":54,"offset":1,"shift":26,"w":25,"x":27,"y":226,}, + "70":{"character":70,"h":54,"offset":1,"shift":25,"w":23,"x":2,"y":226,}, + "71":{"character":71,"h":54,"offset":1,"shift":33,"w":30,"x":469,"y":170,}, + "72":{"character":72,"h":54,"offset":1,"shift":31,"w":28,"x":439,"y":170,}, + "73":{"character":73,"h":54,"offset":2,"shift":21,"w":17,"x":420,"y":170,}, + "74":{"character":74,"h":54,"offset":0,"shift":25,"w":24,"x":394,"y":170,}, + "75":{"character":75,"h":54,"offset":1,"shift":30,"w":29,"x":363,"y":170,}, + "76":{"character":76,"h":54,"offset":1,"shift":24,"w":23,"x":338,"y":170,}, + "77":{"character":77,"h":54,"offset":1,"shift":38,"w":36,"x":300,"y":170,}, + "78":{"character":78,"h":54,"offset":1,"shift":32,"w":29,"x":211,"y":114,}, + "79":{"character":79,"h":54,"offset":1,"shift":35,"w":33,"x":176,"y":114,}, + "80":{"character":80,"h":54,"offset":1,"shift":29,"w":27,"x":147,"y":114,}, + "81":{"character":81,"h":54,"offset":1,"shift":35,"w":35,"x":76,"y":58,}, + "82":{"character":82,"h":54,"offset":1,"shift":30,"w":28,"x":31,"y":58,}, + "83":{"character":83,"h":54,"offset":1,"shift":28,"w":27,"x":2,"y":58,}, + "84":{"character":84,"h":54,"offset":0,"shift":28,"w":28,"x":461,"y":2,}, + "85":{"character":85,"h":54,"offset":1,"shift":30,"w":27,"x":432,"y":2,}, + "86":{"character":86,"h":54,"offset":0,"shift":30,"w":30,"x":400,"y":2,}, + "87":{"character":87,"h":54,"offset":0,"shift":40,"w":40,"x":358,"y":2,}, + "88":{"character":88,"h":54,"offset":0,"shift":32,"w":32,"x":324,"y":2,}, + "89":{"character":89,"h":54,"offset":0,"shift":31,"w":31,"x":291,"y":2,}, + "90":{"character":90,"h":54,"offset":1,"shift":28,"w":26,"x":263,"y":2,}, + "91":{"character":91,"h":54,"offset":1,"shift":15,"w":13,"x":61,"y":58,}, + "92":{"character":92,"h":54,"offset":0,"shift":20,"w":20,"x":241,"y":2,}, + "93":{"character":93,"h":54,"offset":1,"shift":15,"w":13,"x":208,"y":2,}, + "94":{"character":94,"h":54,"offset":2,"shift":27,"w":23,"x":183,"y":2,}, + "95":{"character":95,"h":54,"offset":0,"shift":19,"w":20,"x":161,"y":2,}, + "96":{"character":96,"h":54,"offset":2,"shift":14,"w":10,"x":149,"y":2,}, + "97":{"character":97,"h":54,"offset":0,"shift":25,"w":24,"x":123,"y":2,}, + "98":{"character":98,"h":54,"offset":2,"shift":27,"w":24,"x":97,"y":2,}, + "99":{"character":99,"h":54,"offset":1,"shift":24,"w":22,"x":73,"y":2,}, + "100":{"character":100,"h":54,"offset":1,"shift":27,"w":25,"x":46,"y":2,}, + "101":{"character":101,"h":54,"offset":1,"shift":26,"w":25,"x":19,"y":2,}, + "102":{"character":102,"h":54,"offset":0,"shift":17,"w":16,"x":223,"y":2,}, + "103":{"character":103,"h":54,"offset":1,"shift":27,"w":24,"x":113,"y":58,}, + "104":{"character":104,"h":54,"offset":2,"shift":26,"w":22,"x":359,"y":58,}, + "105":{"character":105,"h":54,"offset":1,"shift":14,"w":12,"x":139,"y":58,}, + "106":{"character":106,"h":54,"offset":-4,"shift":12,"w":15,"x":105,"y":114,}, + "107":{"character":107,"h":54,"offset":2,"shift":26,"w":24,"x":79,"y":114,}, + "108":{"character":108,"h":54,"offset":2,"shift":14,"w":13,"x":64,"y":114,}, + "109":{"character":109,"h":54,"offset":2,"shift":40,"w":36,"x":26,"y":114,}, + "110":{"character":110,"h":54,"offset":2,"shift":26,"w":22,"x":2,"y":114,}, + "111":{"character":111,"h":54,"offset":1,"shift":26,"w":24,"x":477,"y":58,}, + "112":{"character":112,"h":54,"offset":2,"shift":27,"w":24,"x":451,"y":58,}, + "113":{"character":113,"h":54,"offset":1,"shift":27,"w":30,"x":419,"y":58,}, + "114":{"character":114,"h":54,"offset":2,"shift":17,"w":15,"x":402,"y":58,}, + "115":{"character":115,"h":54,"offset":0,"shift":24,"w":23,"x":122,"y":114,}, + "116":{"character":116,"h":54,"offset":0,"shift":17,"w":17,"x":383,"y":58,}, + "117":{"character":117,"h":54,"offset":2,"shift":26,"w":22,"x":335,"y":58,}, + "118":{"character":118,"h":54,"offset":0,"shift":24,"w":24,"x":309,"y":58,}, + "119":{"character":119,"h":54,"offset":0,"shift":33,"w":33,"x":274,"y":58,}, + "120":{"character":120,"h":54,"offset":0,"shift":24,"w":25,"x":247,"y":58,}, + "121":{"character":121,"h":54,"offset":0,"shift":23,"w":24,"x":221,"y":58,}, + "122":{"character":122,"h":54,"offset":1,"shift":23,"w":22,"x":197,"y":58,}, + "123":{"character":123,"h":54,"offset":1,"shift":17,"w":15,"x":180,"y":58,}, + "124":{"character":124,"h":54,"offset":1,"shift":11,"w":8,"x":170,"y":58,}, + "125":{"character":125,"h":54,"offset":1,"shift":17,"w":15,"x":153,"y":58,}, + "126":{"character":126,"h":54,"offset":1,"shift":24,"w":22,"x":367,"y":226,}, + "9647":{"character":9647,"h":54,"offset":9,"shift":44,"w":26,"x":391,"y":226,}, }, - "hinting": 0, - "includeTTF": false, - "interpreter": 0, - "italic": false, - "kerningPairs": [], - "last": 0, - "lineHeight": 0, - "maintainGms1Font": false, - "parent": { - "name": "Fonts", - "path": "folders/Fonts.yy", + "hinting":0, + "includeTTF":false, + "interpreter":0, + "italic":false, + "kerningPairs":[], + "last":0, + "lineHeight":0, + "maintainGms1Font":false, + "name":"f_hires", + "parent":{ + "name":"Fonts", + "path":"folders/Fonts.yy", }, - "pointRounding": 0, - "ranges": [ + "pointRounding":0, + "ranges":[ {"lower":32,"upper":127,}, {"lower":9647,"upper":9647,}, ], - "regenerateBitmap": false, - "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", - "sdfSpread": 8, - "size": 34.0, - "styleName": "Bold", - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "regenerateBitmap":false, + "resourceType":"GMFont", + "resourceVersion":"2.0", + "sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread":8, + "size":34.0, + "styleName":"Bold", + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "TTFName": "", - "usesSDF": false, + "TTFName":"", + "usesSDF":false, } \ No newline at end of file diff --git a/fonts/f_pixel/f_pixel.yy b/fonts/f_pixel/f_pixel.yy index 44c3c0f..b0bbe14 100644 --- a/fonts/f_pixel/f_pixel.yy +++ b/fonts/f_pixel/f_pixel.yy @@ -1,141 +1,143 @@ { - "resourceType": "GMFont", - "resourceVersion": "1.0", - "name": "f_pixel", - "AntiAlias": 0, - "applyKerning": 0, - "ascender": 6, - "ascenderOffset": 0, - "bold": true, - "canGenerateBitmap": true, - "charset": 0, - "first": 0, - "fontName": "04b03", - "glyphOperations": 0, - "glyphs": { - "32": {"character":32,"h":8,"offset":0,"shift":4,"w":4,"x":2,"y":2,}, - "33": {"character":33,"h":8,"offset":0,"shift":2,"w":1,"x":2,"y":32,}, - "34": {"character":34,"h":8,"offset":0,"shift":4,"w":3,"x":122,"y":22,}, - "35": {"character":35,"h":8,"offset":0,"shift":6,"w":5,"x":115,"y":22,}, - "36": {"character":36,"h":8,"offset":0,"shift":5,"w":4,"x":109,"y":22,}, - "37": {"character":37,"h":8,"offset":0,"shift":6,"w":5,"x":102,"y":22,}, - "38": {"character":38,"h":8,"offset":0,"shift":6,"w":5,"x":95,"y":22,}, - "39": {"character":39,"h":8,"offset":0,"shift":2,"w":1,"x":92,"y":22,}, - "40": {"character":40,"h":8,"offset":0,"shift":3,"w":2,"x":88,"y":22,}, - "41": {"character":41,"h":8,"offset":0,"shift":3,"w":2,"x":84,"y":22,}, - "42": {"character":42,"h":8,"offset":0,"shift":4,"w":3,"x":5,"y":32,}, - "43": {"character":43,"h":8,"offset":0,"shift":4,"w":3,"x":79,"y":22,}, - "44": {"character":44,"h":8,"offset":0,"shift":3,"w":2,"x":69,"y":22,}, - "45": {"character":45,"h":8,"offset":0,"shift":4,"w":3,"x":64,"y":22,}, - "46": {"character":46,"h":8,"offset":0,"shift":2,"w":1,"x":61,"y":22,}, - "47": {"character":47,"h":8,"offset":0,"shift":6,"w":5,"x":54,"y":22,}, - "48": {"character":48,"h":8,"offset":0,"shift":5,"w":4,"x":48,"y":22,}, - "49": {"character":49,"h":8,"offset":0,"shift":3,"w":2,"x":44,"y":22,}, - "50": {"character":50,"h":8,"offset":0,"shift":5,"w":4,"x":38,"y":22,}, - "51": {"character":51,"h":8,"offset":0,"shift":5,"w":4,"x":32,"y":22,}, - "52": {"character":52,"h":8,"offset":0,"shift":5,"w":4,"x":26,"y":22,}, - "53": {"character":53,"h":8,"offset":0,"shift":5,"w":4,"x":73,"y":22,}, - "54": {"character":54,"h":8,"offset":0,"shift":5,"w":4,"x":10,"y":32,}, - "55": {"character":55,"h":8,"offset":0,"shift":5,"w":4,"x":16,"y":32,}, - "56": {"character":56,"h":8,"offset":0,"shift":5,"w":4,"x":22,"y":32,}, - "57": {"character":57,"h":8,"offset":0,"shift":5,"w":4,"x":13,"y":42,}, - "58": {"character":58,"h":8,"offset":0,"shift":2,"w":1,"x":10,"y":42,}, - "59": {"character":59,"h":8,"offset":0,"shift":2,"w":1,"x":7,"y":42,}, - "60": {"character":60,"h":8,"offset":0,"shift":4,"w":3,"x":2,"y":42,}, - "61": {"character":61,"h":8,"offset":0,"shift":4,"w":3,"x":120,"y":32,}, - "62": {"character":62,"h":8,"offset":0,"shift":4,"w":3,"x":115,"y":32,}, - "63": {"character":63,"h":8,"offset":0,"shift":5,"w":4,"x":109,"y":32,}, - "64": {"character":64,"h":8,"offset":0,"shift":6,"w":5,"x":102,"y":32,}, - "65": {"character":65,"h":8,"offset":0,"shift":5,"w":4,"x":96,"y":32,}, - "66": {"character":66,"h":8,"offset":0,"shift":5,"w":4,"x":90,"y":32,}, - "67": {"character":67,"h":8,"offset":0,"shift":4,"w":3,"x":85,"y":32,}, - "68": {"character":68,"h":8,"offset":0,"shift":5,"w":4,"x":79,"y":32,}, - "69": {"character":69,"h":8,"offset":0,"shift":4,"w":3,"x":74,"y":32,}, - "70": {"character":70,"h":8,"offset":0,"shift":4,"w":3,"x":69,"y":32,}, - "71": {"character":71,"h":8,"offset":0,"shift":5,"w":4,"x":63,"y":32,}, - "72": {"character":72,"h":8,"offset":0,"shift":5,"w":4,"x":57,"y":32,}, - "73": {"character":73,"h":8,"offset":0,"shift":4,"w":3,"x":52,"y":32,}, - "74": {"character":74,"h":8,"offset":0,"shift":5,"w":4,"x":46,"y":32,}, - "75": {"character":75,"h":8,"offset":0,"shift":5,"w":4,"x":40,"y":32,}, - "76": {"character":76,"h":8,"offset":0,"shift":4,"w":3,"x":35,"y":32,}, - "77": {"character":77,"h":8,"offset":0,"shift":6,"w":5,"x":28,"y":32,}, - "78": {"character":78,"h":8,"offset":0,"shift":5,"w":4,"x":20,"y":22,}, - "79": {"character":79,"h":8,"offset":0,"shift":5,"w":4,"x":14,"y":22,}, - "80": {"character":80,"h":8,"offset":0,"shift":5,"w":4,"x":8,"y":22,}, - "81": {"character":81,"h":8,"offset":0,"shift":5,"w":4,"x":2,"y":12,}, - "82": {"character":82,"h":8,"offset":0,"shift":5,"w":4,"x":115,"y":2,}, - "83": {"character":83,"h":8,"offset":0,"shift":5,"w":4,"x":109,"y":2,}, - "84": {"character":84,"h":8,"offset":0,"shift":4,"w":3,"x":104,"y":2,}, - "85": {"character":85,"h":8,"offset":0,"shift":5,"w":4,"x":98,"y":2,}, - "86": {"character":86,"h":8,"offset":0,"shift":5,"w":4,"x":92,"y":2,}, - "87": {"character":87,"h":8,"offset":0,"shift":6,"w":5,"x":85,"y":2,}, - "88": {"character":88,"h":8,"offset":0,"shift":5,"w":4,"x":79,"y":2,}, - "89": {"character":89,"h":8,"offset":0,"shift":5,"w":4,"x":73,"y":2,}, - "90": {"character":90,"h":8,"offset":0,"shift":4,"w":3,"x":68,"y":2,}, - "91": {"character":91,"h":8,"offset":0,"shift":3,"w":2,"x":121,"y":2,}, - "92": {"character":92,"h":8,"offset":0,"shift":6,"w":5,"x":61,"y":2,}, - "93": {"character":93,"h":8,"offset":0,"shift":3,"w":2,"x":52,"y":2,}, - "94": {"character":94,"h":8,"offset":0,"shift":4,"w":3,"x":47,"y":2,}, - "95": {"character":95,"h":8,"offset":0,"shift":5,"w":4,"x":41,"y":2,}, - "96": {"character":96,"h":8,"offset":0,"shift":3,"w":2,"x":37,"y":2,}, - "97": {"character":97,"h":8,"offset":0,"shift":5,"w":4,"x":31,"y":2,}, - "98": {"character":98,"h":8,"offset":0,"shift":5,"w":4,"x":25,"y":2,}, - "99": {"character":99,"h":8,"offset":0,"shift":4,"w":3,"x":20,"y":2,}, - "100": {"character":100,"h":8,"offset":0,"shift":5,"w":4,"x":14,"y":2,}, - "101": {"character":101,"h":8,"offset":0,"shift":5,"w":4,"x":8,"y":2,}, - "102": {"character":102,"h":8,"offset":0,"shift":4,"w":3,"x":56,"y":2,}, - "103": {"character":103,"h":8,"offset":0,"shift":5,"w":4,"x":8,"y":12,}, - "104": {"character":104,"h":8,"offset":0,"shift":5,"w":4,"x":66,"y":12,}, - "105": {"character":105,"h":8,"offset":0,"shift":2,"w":1,"x":14,"y":12,}, - "106": {"character":106,"h":8,"offset":0,"shift":3,"w":2,"x":122,"y":12,}, - "107": {"character":107,"h":8,"offset":0,"shift":5,"w":4,"x":116,"y":12,}, - "108": {"character":108,"h":8,"offset":0,"shift":2,"w":1,"x":113,"y":12,}, - "109": {"character":109,"h":8,"offset":0,"shift":6,"w":5,"x":106,"y":12,}, - "110": {"character":110,"h":8,"offset":0,"shift":5,"w":4,"x":100,"y":12,}, - "111": {"character":111,"h":8,"offset":0,"shift":5,"w":4,"x":94,"y":12,}, - "112": {"character":112,"h":8,"offset":0,"shift":5,"w":4,"x":88,"y":12,}, - "113": {"character":113,"h":8,"offset":0,"shift":5,"w":4,"x":82,"y":12,}, - "114": {"character":114,"h":8,"offset":0,"shift":4,"w":3,"x":77,"y":12,}, - "115": {"character":115,"h":8,"offset":0,"shift":5,"w":4,"x":2,"y":22,}, - "116": {"character":116,"h":8,"offset":0,"shift":4,"w":3,"x":72,"y":12,}, - "117": {"character":117,"h":8,"offset":0,"shift":5,"w":4,"x":60,"y":12,}, - "118": {"character":118,"h":8,"offset":0,"shift":5,"w":4,"x":54,"y":12,}, - "119": {"character":119,"h":8,"offset":0,"shift":6,"w":5,"x":47,"y":12,}, - "120": {"character":120,"h":8,"offset":0,"shift":4,"w":3,"x":42,"y":12,}, - "121": {"character":121,"h":8,"offset":0,"shift":5,"w":4,"x":36,"y":12,}, - "122": {"character":122,"h":8,"offset":0,"shift":5,"w":4,"x":30,"y":12,}, - "123": {"character":123,"h":8,"offset":0,"shift":4,"w":3,"x":25,"y":12,}, - "124": {"character":124,"h":8,"offset":0,"shift":2,"w":1,"x":22,"y":12,}, - "125": {"character":125,"h":8,"offset":0,"shift":4,"w":3,"x":17,"y":12,}, - "126": {"character":126,"h":8,"offset":0,"shift":5,"w":4,"x":19,"y":42,}, - "9647": {"character":9647,"h":8,"offset":2,"shift":8,"w":4,"x":25,"y":42,}, + "$GMFont":"", + "%Name":"f_pixel", + "AntiAlias":0, + "applyKerning":0, + "ascender":6, + "ascenderOffset":0, + "bold":true, + "canGenerateBitmap":true, + "charset":0, + "first":0, + "fontName":"04b03", + "glyphOperations":0, + "glyphs":{ + "32":{"character":32,"h":8,"offset":0,"shift":4,"w":4,"x":2,"y":2,}, + "33":{"character":33,"h":8,"offset":0,"shift":2,"w":1,"x":2,"y":32,}, + "34":{"character":34,"h":8,"offset":0,"shift":4,"w":3,"x":122,"y":22,}, + "35":{"character":35,"h":8,"offset":0,"shift":6,"w":5,"x":115,"y":22,}, + "36":{"character":36,"h":8,"offset":0,"shift":5,"w":4,"x":109,"y":22,}, + "37":{"character":37,"h":8,"offset":0,"shift":6,"w":5,"x":102,"y":22,}, + "38":{"character":38,"h":8,"offset":0,"shift":6,"w":5,"x":95,"y":22,}, + "39":{"character":39,"h":8,"offset":0,"shift":2,"w":1,"x":92,"y":22,}, + "40":{"character":40,"h":8,"offset":0,"shift":3,"w":2,"x":88,"y":22,}, + "41":{"character":41,"h":8,"offset":0,"shift":3,"w":2,"x":84,"y":22,}, + "42":{"character":42,"h":8,"offset":0,"shift":4,"w":3,"x":5,"y":32,}, + "43":{"character":43,"h":8,"offset":0,"shift":4,"w":3,"x":79,"y":22,}, + "44":{"character":44,"h":8,"offset":0,"shift":3,"w":2,"x":69,"y":22,}, + "45":{"character":45,"h":8,"offset":0,"shift":4,"w":3,"x":64,"y":22,}, + "46":{"character":46,"h":8,"offset":0,"shift":2,"w":1,"x":61,"y":22,}, + "47":{"character":47,"h":8,"offset":0,"shift":6,"w":5,"x":54,"y":22,}, + "48":{"character":48,"h":8,"offset":0,"shift":5,"w":4,"x":48,"y":22,}, + "49":{"character":49,"h":8,"offset":0,"shift":3,"w":2,"x":44,"y":22,}, + "50":{"character":50,"h":8,"offset":0,"shift":5,"w":4,"x":38,"y":22,}, + "51":{"character":51,"h":8,"offset":0,"shift":5,"w":4,"x":32,"y":22,}, + "52":{"character":52,"h":8,"offset":0,"shift":5,"w":4,"x":26,"y":22,}, + "53":{"character":53,"h":8,"offset":0,"shift":5,"w":4,"x":73,"y":22,}, + "54":{"character":54,"h":8,"offset":0,"shift":5,"w":4,"x":10,"y":32,}, + "55":{"character":55,"h":8,"offset":0,"shift":5,"w":4,"x":16,"y":32,}, + "56":{"character":56,"h":8,"offset":0,"shift":5,"w":4,"x":22,"y":32,}, + "57":{"character":57,"h":8,"offset":0,"shift":5,"w":4,"x":13,"y":42,}, + "58":{"character":58,"h":8,"offset":0,"shift":2,"w":1,"x":10,"y":42,}, + "59":{"character":59,"h":8,"offset":0,"shift":2,"w":1,"x":7,"y":42,}, + "60":{"character":60,"h":8,"offset":0,"shift":4,"w":3,"x":2,"y":42,}, + "61":{"character":61,"h":8,"offset":0,"shift":4,"w":3,"x":120,"y":32,}, + "62":{"character":62,"h":8,"offset":0,"shift":4,"w":3,"x":115,"y":32,}, + "63":{"character":63,"h":8,"offset":0,"shift":5,"w":4,"x":109,"y":32,}, + "64":{"character":64,"h":8,"offset":0,"shift":6,"w":5,"x":102,"y":32,}, + "65":{"character":65,"h":8,"offset":0,"shift":5,"w":4,"x":96,"y":32,}, + "66":{"character":66,"h":8,"offset":0,"shift":5,"w":4,"x":90,"y":32,}, + "67":{"character":67,"h":8,"offset":0,"shift":4,"w":3,"x":85,"y":32,}, + "68":{"character":68,"h":8,"offset":0,"shift":5,"w":4,"x":79,"y":32,}, + "69":{"character":69,"h":8,"offset":0,"shift":4,"w":3,"x":74,"y":32,}, + "70":{"character":70,"h":8,"offset":0,"shift":4,"w":3,"x":69,"y":32,}, + "71":{"character":71,"h":8,"offset":0,"shift":5,"w":4,"x":63,"y":32,}, + "72":{"character":72,"h":8,"offset":0,"shift":5,"w":4,"x":57,"y":32,}, + "73":{"character":73,"h":8,"offset":0,"shift":4,"w":3,"x":52,"y":32,}, + "74":{"character":74,"h":8,"offset":0,"shift":5,"w":4,"x":46,"y":32,}, + "75":{"character":75,"h":8,"offset":0,"shift":5,"w":4,"x":40,"y":32,}, + "76":{"character":76,"h":8,"offset":0,"shift":4,"w":3,"x":35,"y":32,}, + "77":{"character":77,"h":8,"offset":0,"shift":6,"w":5,"x":28,"y":32,}, + "78":{"character":78,"h":8,"offset":0,"shift":5,"w":4,"x":20,"y":22,}, + "79":{"character":79,"h":8,"offset":0,"shift":5,"w":4,"x":14,"y":22,}, + "80":{"character":80,"h":8,"offset":0,"shift":5,"w":4,"x":8,"y":22,}, + "81":{"character":81,"h":8,"offset":0,"shift":5,"w":4,"x":2,"y":12,}, + "82":{"character":82,"h":8,"offset":0,"shift":5,"w":4,"x":115,"y":2,}, + "83":{"character":83,"h":8,"offset":0,"shift":5,"w":4,"x":109,"y":2,}, + "84":{"character":84,"h":8,"offset":0,"shift":4,"w":3,"x":104,"y":2,}, + "85":{"character":85,"h":8,"offset":0,"shift":5,"w":4,"x":98,"y":2,}, + "86":{"character":86,"h":8,"offset":0,"shift":5,"w":4,"x":92,"y":2,}, + "87":{"character":87,"h":8,"offset":0,"shift":6,"w":5,"x":85,"y":2,}, + "88":{"character":88,"h":8,"offset":0,"shift":5,"w":4,"x":79,"y":2,}, + "89":{"character":89,"h":8,"offset":0,"shift":5,"w":4,"x":73,"y":2,}, + "90":{"character":90,"h":8,"offset":0,"shift":4,"w":3,"x":68,"y":2,}, + "91":{"character":91,"h":8,"offset":0,"shift":3,"w":2,"x":121,"y":2,}, + "92":{"character":92,"h":8,"offset":0,"shift":6,"w":5,"x":61,"y":2,}, + "93":{"character":93,"h":8,"offset":0,"shift":3,"w":2,"x":52,"y":2,}, + "94":{"character":94,"h":8,"offset":0,"shift":4,"w":3,"x":47,"y":2,}, + "95":{"character":95,"h":8,"offset":0,"shift":5,"w":4,"x":41,"y":2,}, + "96":{"character":96,"h":8,"offset":0,"shift":3,"w":2,"x":37,"y":2,}, + "97":{"character":97,"h":8,"offset":0,"shift":5,"w":4,"x":31,"y":2,}, + "98":{"character":98,"h":8,"offset":0,"shift":5,"w":4,"x":25,"y":2,}, + "99":{"character":99,"h":8,"offset":0,"shift":4,"w":3,"x":20,"y":2,}, + "100":{"character":100,"h":8,"offset":0,"shift":5,"w":4,"x":14,"y":2,}, + "101":{"character":101,"h":8,"offset":0,"shift":5,"w":4,"x":8,"y":2,}, + "102":{"character":102,"h":8,"offset":0,"shift":4,"w":3,"x":56,"y":2,}, + "103":{"character":103,"h":8,"offset":0,"shift":5,"w":4,"x":8,"y":12,}, + "104":{"character":104,"h":8,"offset":0,"shift":5,"w":4,"x":66,"y":12,}, + "105":{"character":105,"h":8,"offset":0,"shift":2,"w":1,"x":14,"y":12,}, + "106":{"character":106,"h":8,"offset":0,"shift":3,"w":2,"x":122,"y":12,}, + "107":{"character":107,"h":8,"offset":0,"shift":5,"w":4,"x":116,"y":12,}, + "108":{"character":108,"h":8,"offset":0,"shift":2,"w":1,"x":113,"y":12,}, + "109":{"character":109,"h":8,"offset":0,"shift":6,"w":5,"x":106,"y":12,}, + "110":{"character":110,"h":8,"offset":0,"shift":5,"w":4,"x":100,"y":12,}, + "111":{"character":111,"h":8,"offset":0,"shift":5,"w":4,"x":94,"y":12,}, + "112":{"character":112,"h":8,"offset":0,"shift":5,"w":4,"x":88,"y":12,}, + "113":{"character":113,"h":8,"offset":0,"shift":5,"w":4,"x":82,"y":12,}, + "114":{"character":114,"h":8,"offset":0,"shift":4,"w":3,"x":77,"y":12,}, + "115":{"character":115,"h":8,"offset":0,"shift":5,"w":4,"x":2,"y":22,}, + "116":{"character":116,"h":8,"offset":0,"shift":4,"w":3,"x":72,"y":12,}, + "117":{"character":117,"h":8,"offset":0,"shift":5,"w":4,"x":60,"y":12,}, + "118":{"character":118,"h":8,"offset":0,"shift":5,"w":4,"x":54,"y":12,}, + "119":{"character":119,"h":8,"offset":0,"shift":6,"w":5,"x":47,"y":12,}, + "120":{"character":120,"h":8,"offset":0,"shift":4,"w":3,"x":42,"y":12,}, + "121":{"character":121,"h":8,"offset":0,"shift":5,"w":4,"x":36,"y":12,}, + "122":{"character":122,"h":8,"offset":0,"shift":5,"w":4,"x":30,"y":12,}, + "123":{"character":123,"h":8,"offset":0,"shift":4,"w":3,"x":25,"y":12,}, + "124":{"character":124,"h":8,"offset":0,"shift":2,"w":1,"x":22,"y":12,}, + "125":{"character":125,"h":8,"offset":0,"shift":4,"w":3,"x":17,"y":12,}, + "126":{"character":126,"h":8,"offset":0,"shift":5,"w":4,"x":19,"y":42,}, + "9647":{"character":9647,"h":8,"offset":2,"shift":8,"w":4,"x":25,"y":42,}, }, - "hinting": 0, - "includeTTF": false, - "interpreter": 0, - "italic": false, - "kerningPairs": [], - "last": 0, - "lineHeight": 0, - "maintainGms1Font": false, - "parent": { - "name": "Fonts", - "path": "folders/Fonts.yy", + "hinting":0, + "includeTTF":false, + "interpreter":0, + "italic":false, + "kerningPairs":[], + "last":0, + "lineHeight":0, + "maintainGms1Font":false, + "name":"f_pixel", + "parent":{ + "name":"Fonts", + "path":"folders/Fonts.yy", }, - "pointRounding": 0, - "ranges": [ + "pointRounding":0, + "ranges":[ {"lower":32,"upper":127,}, {"lower":9647,"upper":9647,}, ], - "regenerateBitmap": false, - "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", - "sdfSpread": 8, - "size": 6.0, - "styleName": "Regular", - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "regenerateBitmap":false, + "resourceType":"GMFont", + "resourceVersion":"2.0", + "sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread":8, + "size":6.0, + "styleName":"Regular", + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "TTFName": "", - "usesSDF": false, + "TTFName":"", + "usesSDF":false, } \ No newline at end of file diff --git a/objects/__obj_stanncam_manager/__obj_stanncam_manager.yy b/objects/__obj_stanncam_manager/__obj_stanncam_manager.yy index d92debe..819c7b5 100644 --- a/objects/__obj_stanncam_manager/__obj_stanncam_manager.yy +++ b/objects/__obj_stanncam_manager/__obj_stanncam_manager.yy @@ -1,36 +1,38 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "__obj_stanncam_manager", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":4,"eventType":7,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":76,"eventType":8,"isDnD":false,}, + "$GMObject":"", + "%Name":"__obj_stanncam_manager", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":76,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "STANNcam", - "path": "folders/STANNcam.yy", + "managed":true, + "name":"__obj_stanncam_manager", + "overriddenProperties":[], + "parent":{ + "name":"STANNcam", + "path":"folders/STANNcam.yy", }, - "parentObjectId": null, - "persistent": true, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": null, - "spriteMaskId": null, - "visible": true, + "parentObjectId":null, + "persistent":true, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":null, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_ball/obj_ball.yy b/objects/obj_ball/obj_ball.yy index 74ce0e2..ab6b448 100644 --- a/objects/obj_ball/obj_ball.yy +++ b/objects/obj_ball/obj_ball.yy @@ -1,36 +1,38 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_ball", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_ball", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "topdown", - "path": "folders/Objects/topdown.yy", + "managed":true, + "name":"obj_ball", + "overriddenProperties":[], + "parent":{ + "name":"topdown", + "path":"folders/Objects/topdown.yy", }, - "parentObjectId": null, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_ball", - "path": "sprites/spr_ball/spr_ball.yy", + "parentObjectId":null, + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_ball", + "path":"sprites/spr_ball/spr_ball.yy", }, - "spriteMaskId": null, - "visible": true, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_camera/obj_camera.yy b/objects/obj_camera/obj_camera.yy index 0355c7e..f4c58fa 100644 --- a/objects/obj_camera/obj_camera.yy +++ b/objects/obj_camera/obj_camera.yy @@ -1,39 +1,41 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_camera", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":77,"eventType":8,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":60,"eventType":6,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":61,"eventType":6,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_camera", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":77,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":60,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":61,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "topdown", - "path": "folders/Objects/topdown.yy", + "managed":true, + "name":"obj_camera", + "overriddenProperties":[], + "parent":{ + "name":"topdown", + "path":"folders/Objects/topdown.yy", }, - "parentObjectId": null, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": null, - "spriteMaskId": null, - "visible": true, + "parentObjectId":null, + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":null, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_camera_pixel_grid/Create_0.gml b/objects/obj_camera_pixel_grid/Create_0.gml index dc9c2a5..64e8ed1 100644 --- a/objects/obj_camera_pixel_grid/Create_0.gml +++ b/objects/obj_camera_pixel_grid/Create_0.gml @@ -14,3 +14,11 @@ resolutions = [ {w:1280, h:720}, {w:1920, h:1080} ]; + + +hspd = 0; +vspd = 0; + +acceleration_spd = 0.02; +deacceleration_spd = 0.1; +max_spd = 3; \ No newline at end of file diff --git a/objects/obj_camera_pixel_grid/Draw_64.gml b/objects/obj_camera_pixel_grid/Draw_64.gml index 4113c48..8581a2d 100644 --- a/objects/obj_camera_pixel_grid/Draw_64.gml +++ b/objects/obj_camera_pixel_grid/Draw_64.gml @@ -8,8 +8,9 @@ draw_set_valign(fa_top); draw_text_outline(1, 0, "[RMB] Zoom amount: " + string(zoom_text), _outline_width, _precision); draw_text_outline(1, _offset * 1, "[F] camera shake", _outline_width, _precision); draw_text_outline(1, _offset * 2, "[P] camera paused: " + (cam1.get_paused() ? "ON" : "OFF"), _outline_width, _precision); -draw_text_outline(1, _offset * 3, "[1 & 2 & 3] to switch", _outline_width, _precision); -draw_text_outline(1, _offset * 4, "between example rooms", _outline_width, _precision); +draw_text_outline(1, _offset * 3, "[B] smooth camera: " + (cam1.smooth_draw ? "ON" : "OFF"), _outline_width, _precision); +draw_text_outline(1, _offset * 4, "[1 & 2 & 3] to switch", _outline_width, _precision); +draw_text_outline(1, _offset * 5, "between example rooms", _outline_width, _precision); //draw current resolution text draw_set_halign(fa_right); diff --git a/objects/obj_camera_pixel_grid/Step_0.gml b/objects/obj_camera_pixel_grid/Step_0.gml index 3f34ded..ad9c7d4 100644 --- a/objects/obj_camera_pixel_grid/Step_0.gml +++ b/objects/obj_camera_pixel_grid/Step_0.gml @@ -33,6 +33,13 @@ if(keyboard_check_pressed(ord("P"))){ } } +//toggle camera pause +if(keyboard_check_pressed(ord("B"))){ + if(is_instanceof(cam1, stanncam)){ + cam1.smooth_draw = !cam1.smooth_draw; + } +} + //switch resolutions if(keyboard_check_pressed(vk_f1)){ game_res++; @@ -56,11 +63,22 @@ if(keyboard_check_pressed(vk_f4)){ stanncam_set_window_mode(_window_mode); } -//move camera one pixel -var _hinput = keyboard_check_pressed(vk_right) - keyboard_check_pressed(vk_left); -var _vinput = keyboard_check_pressed(vk_down) - keyboard_check_pressed(vk_up); -if(_hinput != 0 || _vinput != 0){ - var _x = cam1.x + _hinput; - var _y = cam1.y + _vinput; +//move camera +var _hinput = keyboard_check(vk_right) - keyboard_check(vk_left); +var _vinput = keyboard_check(vk_down) - keyboard_check(vk_up); + +if(_hinput != 0) hspd += _hinput*acceleration_spd; +else hspd -= min(abs(hspd), deacceleration_spd) * sign(hspd); + +if(_vinput != 0) vspd += _vinput*acceleration_spd; +else vspd -= min(abs(vspd), deacceleration_spd) * sign(vspd); + +hspd = clamp(hspd,-max_spd,max_spd); +vspd = clamp(vspd,-max_spd,max_spd); + +if(hspd != 0 || vspd != 0){ + var _x = cam1.x + hspd; + var _y = cam1.y + vspd; cam1.move(_x, _y, 0); } + diff --git a/objects/obj_camera_pixel_grid/obj_camera_pixel_grid.yy b/objects/obj_camera_pixel_grid/obj_camera_pixel_grid.yy index b30f48d..294a9cc 100644 --- a/objects/obj_camera_pixel_grid/obj_camera_pixel_grid.yy +++ b/objects/obj_camera_pixel_grid/obj_camera_pixel_grid.yy @@ -1,38 +1,40 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_camera_pixel_grid", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":60,"eventType":6,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":61,"eventType":6,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":77,"eventType":8,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_camera_pixel_grid", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":60,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":61,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":77,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "managed":true, + "name":"obj_camera_pixel_grid", + "overriddenProperties":[], + "parent":{ + "name":"Objects", + "path":"folders/Objects.yy", }, - "parentObjectId": null, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": null, - "spriteMaskId": null, - "visible": true, + "parentObjectId":null, + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":null, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_camera_sidescroller/obj_camera_sidescroller.yy b/objects/obj_camera_sidescroller/obj_camera_sidescroller.yy index a4f7597..9147df4 100644 --- a/objects/obj_camera_sidescroller/obj_camera_sidescroller.yy +++ b/objects/obj_camera_sidescroller/obj_camera_sidescroller.yy @@ -1,39 +1,41 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_camera_sidescroller", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":77,"eventType":8,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":60,"eventType":6,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":61,"eventType":6,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_camera_sidescroller", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":77,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":60,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":61,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "sidescroller", - "path": "folders/Objects/sidescroller.yy", + "managed":true, + "name":"obj_camera_sidescroller", + "overriddenProperties":[], + "parent":{ + "name":"sidescroller", + "path":"folders/Objects/sidescroller.yy", }, - "parentObjectId": null, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": null, - "spriteMaskId": null, - "visible": true, + "parentObjectId":null, + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":null, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_collision/obj_collision.yy b/objects/obj_collision/obj_collision.yy index 6e65f8e..fdc7e35 100644 --- a/objects/obj_collision/obj_collision.yy +++ b/objects/obj_collision/obj_collision.yy @@ -1,34 +1,36 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_collision", - "eventList": [], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "sidescroller", - "path": "folders/Objects/sidescroller.yy", + "$GMObject":"", + "%Name":"obj_collision", + "eventList":[], + "managed":true, + "name":"obj_collision", + "overriddenProperties":[], + "parent":{ + "name":"sidescroller", + "path":"folders/Objects/sidescroller.yy", }, - "parentObjectId": null, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_collision", - "path": "sprites/spr_collision/spr_collision.yy", + "parentObjectId":null, + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_collision", + "path":"sprites/spr_collision/spr_collision.yy", }, - "spriteMaskId": null, - "visible": false, + "spriteMaskId":null, + "visible":false, } \ No newline at end of file diff --git a/objects/obj_game_controller/Create_0.gml b/objects/obj_game_controller/Create_0.gml index 18cfcb7..607f7dc 100644 --- a/objects/obj_game_controller/Create_0.gml +++ b/objects/obj_game_controller/Create_0.gml @@ -1 +1,3 @@ room_goto_next(); + +draw_set_font(f_pixel); \ No newline at end of file diff --git a/objects/obj_game_controller/obj_game_controller.yy b/objects/obj_game_controller/obj_game_controller.yy index f3aaed5..b624a50 100644 --- a/objects/obj_game_controller/obj_game_controller.yy +++ b/objects/obj_game_controller/obj_game_controller.yy @@ -1,37 +1,39 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_game_controller", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":49,"eventType":9,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":50,"eventType":9,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":82,"eventType":9,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":51,"eventType":9,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_game_controller", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":49,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":50,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":82,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":51,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "managed":true, + "name":"obj_game_controller", + "overriddenProperties":[], + "parent":{ + "name":"Objects", + "path":"folders/Objects.yy", }, - "parentObjectId": null, - "persistent": true, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": null, - "spriteMaskId": null, - "visible": true, + "parentObjectId":null, + "persistent":true, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":null, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_player/obj_player.yy b/objects/obj_player/obj_player.yy index 8c49693..d884f62 100644 --- a/objects/obj_player/obj_player.yy +++ b/objects/obj_player/obj_player.yy @@ -1,38 +1,40 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_player", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_player", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "topdown", - "path": "folders/Objects/topdown.yy", + "managed":true, + "name":"obj_player", + "overriddenProperties":[], + "parent":{ + "name":"topdown", + "path":"folders/Objects/topdown.yy", }, - "parentObjectId": null, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_player_idle", - "path": "sprites/spr_player_idle/spr_player_idle.yy", + "parentObjectId":null, + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_player_idle", + "path":"sprites/spr_player_idle/spr_player_idle.yy", }, - "spriteMaskId": null, - "visible": true, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_player2/obj_player2.yy b/objects/obj_player2/obj_player2.yy index 1ed0de5..afa637f 100644 --- a/objects/obj_player2/obj_player2.yy +++ b/objects/obj_player2/obj_player2.yy @@ -1,39 +1,41 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_player2", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_player2", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "topdown", - "path": "folders/Objects/topdown.yy", + "managed":true, + "name":"obj_player2", + "overriddenProperties":[], + "parent":{ + "name":"topdown", + "path":"folders/Objects/topdown.yy", }, - "parentObjectId": null, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_player2_idle", - "path": "sprites/spr_player2_idle/spr_player2_idle.yy", + "parentObjectId":null, + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_player2_idle", + "path":"sprites/spr_player2_idle/spr_player2_idle.yy", }, - "spriteMaskId": null, - "visible": true, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_player_sidescroller/obj_player_sidescroller.yy b/objects/obj_player_sidescroller/obj_player_sidescroller.yy index ea885b7..e763b91 100644 --- a/objects/obj_player_sidescroller/obj_player_sidescroller.yy +++ b/objects/obj_player_sidescroller/obj_player_sidescroller.yy @@ -1,38 +1,40 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_player_sidescroller", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_player_sidescroller", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "sidescroller", - "path": "folders/Objects/sidescroller.yy", + "managed":true, + "name":"obj_player_sidescroller", + "overriddenProperties":[], + "parent":{ + "name":"sidescroller", + "path":"folders/Objects/sidescroller.yy", }, - "parentObjectId": null, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_pengu", - "path": "sprites/spr_pengu/spr_pengu.yy", + "parentObjectId":null, + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_pengu", + "path":"sprites/spr_pengu/spr_pengu.yy", }, - "spriteMaskId": null, - "visible": true, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_player_sidescroller2/obj_player_sidescroller2.yy b/objects/obj_player_sidescroller2/obj_player_sidescroller2.yy index 81a10c4..c1bc90c 100644 --- a/objects/obj_player_sidescroller2/obj_player_sidescroller2.yy +++ b/objects/obj_player_sidescroller2/obj_player_sidescroller2.yy @@ -1,39 +1,41 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_player_sidescroller2", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_player_sidescroller2", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "sidescroller", - "path": "folders/Objects/sidescroller.yy", + "managed":true, + "name":"obj_player_sidescroller2", + "overriddenProperties":[], + "parent":{ + "name":"sidescroller", + "path":"folders/Objects/sidescroller.yy", }, - "parentObjectId": { - "name": "obj_player_sidescroller", - "path": "objects/obj_player_sidescroller/obj_player_sidescroller.yy", + "parentObjectId":{ + "name":"obj_player_sidescroller", + "path":"objects/obj_player_sidescroller/obj_player_sidescroller.yy", }, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_pengu2", - "path": "sprites/spr_pengu2/spr_pengu2.yy", + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_pengu2", + "path":"sprites/spr_pengu2/spr_pengu2.yy", }, - "spriteMaskId": null, - "visible": true, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_stanncam_zone/obj_stanncam_zone.yy b/objects/obj_stanncam_zone/obj_stanncam_zone.yy index 6d6edc8..3032ed3 100644 --- a/objects/obj_stanncam_zone/obj_stanncam_zone.yy +++ b/objects/obj_stanncam_zone/obj_stanncam_zone.yy @@ -1,37 +1,39 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_stanncam_zone", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_stanncam_zone", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "Zones", - "path": "folders/STANNcam/Zones.yy", + "managed":true, + "name":"obj_stanncam_zone", + "overriddenProperties":[], + "parent":{ + "name":"Zones", + "path":"folders/STANNcam/Zones.yy", }, - "parentObjectId": null, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_stanncam_zone", - "path": "sprites/spr_stanncam_zone/spr_stanncam_zone.yy", + "parentObjectId":null, + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_stanncam_zone", + "path":"sprites/spr_stanncam_zone/spr_stanncam_zone.yy", }, - "spriteMaskId": null, - "visible": true, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_stanncam_zone_1side/obj_stanncam_zone_1side.yy b/objects/obj_stanncam_zone_1side/obj_stanncam_zone_1side.yy index 756f3f7..f21f1bd 100644 --- a/objects/obj_stanncam_zone_1side/obj_stanncam_zone_1side.yy +++ b/objects/obj_stanncam_zone_1side/obj_stanncam_zone_1side.yy @@ -1,39 +1,41 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_stanncam_zone_1side", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_stanncam_zone_1side", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "Zones", - "path": "folders/STANNcam/Zones.yy", + "managed":true, + "name":"obj_stanncam_zone_1side", + "overriddenProperties":[], + "parent":{ + "name":"Zones", + "path":"folders/STANNcam/Zones.yy", }, - "parentObjectId": { - "name": "obj_stanncam_zone", - "path": "objects/obj_stanncam_zone/obj_stanncam_zone.yy", + "parentObjectId":{ + "name":"obj_stanncam_zone", + "path":"objects/obj_stanncam_zone/obj_stanncam_zone.yy", }, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_stanncam_zone_1side", - "path": "sprites/spr_stanncam_zone_1side/spr_stanncam_zone_1side.yy", + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_stanncam_zone_1side", + "path":"sprites/spr_stanncam_zone_1side/spr_stanncam_zone_1side.yy", }, - "spriteMaskId": null, - "visible": true, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_stanncam_zone_2side/obj_stanncam_zone_2side.yy b/objects/obj_stanncam_zone_2side/obj_stanncam_zone_2side.yy index c9baee0..4246815 100644 --- a/objects/obj_stanncam_zone_2side/obj_stanncam_zone_2side.yy +++ b/objects/obj_stanncam_zone_2side/obj_stanncam_zone_2side.yy @@ -1,39 +1,41 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_stanncam_zone_2side", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_stanncam_zone_2side", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "Zones", - "path": "folders/STANNcam/Zones.yy", + "managed":true, + "name":"obj_stanncam_zone_2side", + "overriddenProperties":[], + "parent":{ + "name":"Zones", + "path":"folders/STANNcam/Zones.yy", }, - "parentObjectId": { - "name": "obj_stanncam_zone", - "path": "objects/obj_stanncam_zone/obj_stanncam_zone.yy", + "parentObjectId":{ + "name":"obj_stanncam_zone", + "path":"objects/obj_stanncam_zone/obj_stanncam_zone.yy", }, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_stanncam_zone_2side", - "path": "sprites/spr_stanncam_zone_2side/spr_stanncam_zone_2side.yy", + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_stanncam_zone_2side", + "path":"sprites/spr_stanncam_zone_2side/spr_stanncam_zone_2side.yy", }, - "spriteMaskId": null, - "visible": true, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_stanncam_zone_corner/obj_stanncam_zone_corner.yy b/objects/obj_stanncam_zone_corner/obj_stanncam_zone_corner.yy index bfdb473..5bffe44 100644 --- a/objects/obj_stanncam_zone_corner/obj_stanncam_zone_corner.yy +++ b/objects/obj_stanncam_zone_corner/obj_stanncam_zone_corner.yy @@ -1,39 +1,41 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_stanncam_zone_corner", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_stanncam_zone_corner", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "Zones", - "path": "folders/STANNcam/Zones.yy", + "managed":true, + "name":"obj_stanncam_zone_corner", + "overriddenProperties":[], + "parent":{ + "name":"Zones", + "path":"folders/STANNcam/Zones.yy", }, - "parentObjectId": { - "name": "obj_stanncam_zone", - "path": "objects/obj_stanncam_zone/obj_stanncam_zone.yy", + "parentObjectId":{ + "name":"obj_stanncam_zone", + "path":"objects/obj_stanncam_zone/obj_stanncam_zone.yy", }, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_stanncam_zone_corner", - "path": "sprites/spr_stanncam_zone_corner/spr_stanncam_zone_corner.yy", + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_stanncam_zone_corner", + "path":"sprites/spr_stanncam_zone_corner/spr_stanncam_zone_corner.yy", }, - "spriteMaskId": null, - "visible": true, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_stanncam_zone_u/obj_stanncam_zone_u.yy b/objects/obj_stanncam_zone_u/obj_stanncam_zone_u.yy index 21a4f37..f1443a5 100644 --- a/objects/obj_stanncam_zone_u/obj_stanncam_zone_u.yy +++ b/objects/obj_stanncam_zone_u/obj_stanncam_zone_u.yy @@ -1,39 +1,41 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_stanncam_zone_u", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_stanncam_zone_u", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "Zones", - "path": "folders/STANNcam/Zones.yy", + "managed":true, + "name":"obj_stanncam_zone_u", + "overriddenProperties":[], + "parent":{ + "name":"Zones", + "path":"folders/STANNcam/Zones.yy", }, - "parentObjectId": { - "name": "obj_stanncam_zone", - "path": "objects/obj_stanncam_zone/obj_stanncam_zone.yy", + "parentObjectId":{ + "name":"obj_stanncam_zone", + "path":"objects/obj_stanncam_zone/obj_stanncam_zone.yy", }, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_stanncam_zone_u", - "path": "sprites/spr_stanncam_zone_u/spr_stanncam_zone_u.yy", + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_stanncam_zone_u", + "path":"sprites/spr_stanncam_zone_u/spr_stanncam_zone_u.yy", }, - "spriteMaskId": null, - "visible": true, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/objects/obj_tv/obj_tv.yy b/objects/obj_tv/obj_tv.yy index 3dd8b15..7dd7eef 100644 --- a/objects/obj_tv/obj_tv.yy +++ b/objects/obj_tv/obj_tv.yy @@ -1,37 +1,39 @@ { - "resourceType": "GMObject", - "resourceVersion": "1.0", - "name": "obj_tv", - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + "$GMObject":"", + "%Name":"obj_tv", + "eventList":[ + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], - "managed": true, - "overriddenProperties": [], - "parent": { - "name": "topdown", - "path": "folders/Objects/topdown.yy", + "managed":true, + "name":"obj_tv", + "overriddenProperties":[], + "parent":{ + "name":"topdown", + "path":"folders/Objects/topdown.yy", }, - "parentObjectId": null, - "persistent": false, - "physicsAngularDamping": 0.1, - "physicsDensity": 0.5, - "physicsFriction": 0.2, - "physicsGroup": 1, - "physicsKinematic": false, - "physicsLinearDamping": 0.1, - "physicsObject": false, - "physicsRestitution": 0.1, - "physicsSensor": false, - "physicsShape": 1, - "physicsShapePoints": [], - "physicsStartAwake": true, - "properties": [], - "solid": false, - "spriteId": { - "name": "spr_tv", - "path": "sprites/spr_tv/spr_tv.yy", + "parentObjectId":null, + "persistent":false, + "physicsAngularDamping":0.1, + "physicsDensity":0.5, + "physicsFriction":0.2, + "physicsGroup":1, + "physicsKinematic":false, + "physicsLinearDamping":0.1, + "physicsObject":false, + "physicsRestitution":0.1, + "physicsSensor":false, + "physicsShape":1, + "physicsShapePoints":[], + "physicsStartAwake":true, + "properties":[], + "resourceType":"GMObject", + "resourceVersion":"2.0", + "solid":false, + "spriteId":{ + "name":"spr_tv", + "path":"sprites/spr_tv/spr_tv.yy", }, - "spriteMaskId": null, - "visible": true, + "spriteMaskId":null, + "visible":true, } \ No newline at end of file diff --git a/options/android/options_android.yy b/options/android/options_android.yy index 8ceeb2e..7109120 100644 --- a/options/android/options_android.yy +++ b/options/android/options_android.yy @@ -1,79 +1,81 @@ { - "resourceType": "GMAndroidOptions", - "resourceVersion": "1.0", - "name": "Android", - "option_android_application_tag_inject": "", - "option_android_arch_arm64": true, - "option_android_arch_armv7": false, - "option_android_arch_x86_64": false, - "option_android_attribute_allow_backup": false, - "option_android_build_tools": "", - "option_android_compile_sdk": "", - "option_android_device_support": 0, - "option_android_display_name": "Created with GameMaker", - "option_android_facebook_app_display_name": "", - "option_android_facebook_id": "", - "option_android_gamepad_support": true, - "option_android_google_apk_expansion": false, - "option_android_google_cloud_saving": false, - "option_android_google_dynamic_asset_delivery": false, - "option_android_google_licensing_public_key": "", - "option_android_google_services_app_id": "", - "option_android_icon_adaptive_generate": false, - "option_android_icon_adaptive_hdpi": "${base_options_dir}/android/icons_adaptive/hdpi.png", - "option_android_icon_adaptive_ldpi": "${base_options_dir}/android/icons_adaptive/ldpi.png", - "option_android_icon_adaptive_mdpi": "${base_options_dir}/android/icons_adaptive/mdpi.png", - "option_android_icon_adaptive_xhdpi": "${base_options_dir}/android/icons_adaptive/xhdpi.png", - "option_android_icon_adaptive_xxhdpi": "${base_options_dir}/android/icons_adaptive/xxhdpi.png", - "option_android_icon_adaptive_xxxhdpi": "${base_options_dir}/android/icons_adaptive/xxxhdpi.png", - "option_android_icon_adaptivebg_hdpi": "${base_options_dir}/android/icons_adaptivebg/hdpi.png", - "option_android_icon_adaptivebg_ldpi": "${base_options_dir}/android/icons_adaptivebg/ldpi.png", - "option_android_icon_adaptivebg_mdpi": "${base_options_dir}/android/icons_adaptivebg/mdpi.png", - "option_android_icon_adaptivebg_xhdpi": "${base_options_dir}/android/icons_adaptivebg/xhdpi.png", - "option_android_icon_adaptivebg_xxhdpi": "${base_options_dir}/android/icons_adaptivebg/xxhdpi.png", - "option_android_icon_adaptivebg_xxxhdpi": "${base_options_dir}/android/icons_adaptivebg/xxxhdpi.png", - "option_android_icon_hdpi": "${base_options_dir}/android/icons/hdpi.png", - "option_android_icon_ldpi": "${base_options_dir}/android/icons/ldpi.png", - "option_android_icon_mdpi": "${base_options_dir}/android/icons/mdpi.png", - "option_android_icon_xhdpi": "${base_options_dir}/android/icons/xhdpi.png", - "option_android_icon_xxhdpi": "${base_options_dir}/android/icons/xxhdpi.png", - "option_android_icon_xxxhdpi": "${base_options_dir}/android/icons/xxxhdpi.png", - "option_android_install_location": 0, - "option_android_interpolate_pixels": false, - "option_android_launchscreen_fill": 0, - "option_android_lint": false, - "option_android_logcat": "yoyo:V DEBUG:V AndroidRuntime:V", - "option_android_minimum_sdk": "", - "option_android_orient_landscape": true, - "option_android_orient_landscape_flipped": true, - "option_android_orient_portrait": true, - "option_android_orient_portrait_flipped": true, - "option_android_package_company": "company", - "option_android_package_domain": "com", - "option_android_package_product": "game", - "option_android_permission_bluetooth": true, - "option_android_permission_internet": true, - "option_android_permission_network_state": false, - "option_android_permission_read_phone_state": false, - "option_android_permission_record_audio": false, - "option_android_permission_write_external_storage": false, - "option_android_proguard_minifying": false, - "option_android_proguard_shrinking": false, - "option_android_scale": 0, - "option_android_screen_depth": 0, - "option_android_sleep_margin": 4, - "option_android_splash_screens_landscape": "${base_options_dir}/android/splash/landscape.png", - "option_android_splash_screens_portrait": "${base_options_dir}/android/splash/portrait.png", - "option_android_splash_time": 0, - "option_android_splashscreen_background_colour": 255, - "option_android_support_lib": "", - "option_android_sync_amazon": false, - "option_android_target_sdk": "", - "option_android_texture_page": "2048x2048", - "option_android_tools_from_version": false, - "option_android_tv_banner": "${base_options_dir}/android/tv_banner.png", - "option_android_tv_isgame": true, - "option_android_tv_supports_leanback": true, - "option_android_use_facebook": false, - "option_android_version": "1.0.0.0", + "$GMAndroidOptions":"", + "%Name":"Android", + "name":"Android", + "option_android_application_tag_inject":"", + "option_android_arch_arm64":true, + "option_android_arch_armv7":false, + "option_android_arch_x86_64":false, + "option_android_attribute_allow_backup":false, + "option_android_build_tools":"", + "option_android_compile_sdk":"", + "option_android_device_support":0, + "option_android_display_name":"Created with GameMaker", + "option_android_facebook_app_display_name":"", + "option_android_facebook_id":"", + "option_android_gamepad_support":true, + "option_android_google_apk_expansion":false, + "option_android_google_cloud_saving":false, + "option_android_google_dynamic_asset_delivery":false, + "option_android_google_licensing_public_key":"", + "option_android_google_services_app_id":"", + "option_android_icon_adaptivebg_hdpi":"${base_options_dir}/android/icons_adaptivebg/hdpi.png", + "option_android_icon_adaptivebg_ldpi":"${base_options_dir}/android/icons_adaptivebg/ldpi.png", + "option_android_icon_adaptivebg_mdpi":"${base_options_dir}/android/icons_adaptivebg/mdpi.png", + "option_android_icon_adaptivebg_xhdpi":"${base_options_dir}/android/icons_adaptivebg/xhdpi.png", + "option_android_icon_adaptivebg_xxhdpi":"${base_options_dir}/android/icons_adaptivebg/xxhdpi.png", + "option_android_icon_adaptivebg_xxxhdpi":"${base_options_dir}/android/icons_adaptivebg/xxxhdpi.png", + "option_android_icon_adaptive_generate":false, + "option_android_icon_adaptive_hdpi":"${base_options_dir}/android/icons_adaptive/hdpi.png", + "option_android_icon_adaptive_ldpi":"${base_options_dir}/android/icons_adaptive/ldpi.png", + "option_android_icon_adaptive_mdpi":"${base_options_dir}/android/icons_adaptive/mdpi.png", + "option_android_icon_adaptive_xhdpi":"${base_options_dir}/android/icons_adaptive/xhdpi.png", + "option_android_icon_adaptive_xxhdpi":"${base_options_dir}/android/icons_adaptive/xxhdpi.png", + "option_android_icon_adaptive_xxxhdpi":"${base_options_dir}/android/icons_adaptive/xxxhdpi.png", + "option_android_icon_hdpi":"${base_options_dir}/android/icons/hdpi.png", + "option_android_icon_ldpi":"${base_options_dir}/android/icons/ldpi.png", + "option_android_icon_mdpi":"${base_options_dir}/android/icons/mdpi.png", + "option_android_icon_xhdpi":"${base_options_dir}/android/icons/xhdpi.png", + "option_android_icon_xxhdpi":"${base_options_dir}/android/icons/xxhdpi.png", + "option_android_icon_xxxhdpi":"${base_options_dir}/android/icons/xxxhdpi.png", + "option_android_install_location":0, + "option_android_interpolate_pixels":false, + "option_android_launchscreen_fill":0, + "option_android_lint":false, + "option_android_logcat":"yoyo:V DEBUG:V AndroidRuntime:V", + "option_android_minimum_sdk":"", + "option_android_orient_landscape":true, + "option_android_orient_landscape_flipped":true, + "option_android_orient_portrait":true, + "option_android_orient_portrait_flipped":true, + "option_android_package_company":"company", + "option_android_package_domain":"com", + "option_android_package_product":"game", + "option_android_permission_bluetooth":true, + "option_android_permission_internet":true, + "option_android_permission_network_state":false, + "option_android_permission_read_phone_state":false, + "option_android_permission_record_audio":false, + "option_android_permission_write_external_storage":false, + "option_android_proguard_minifying":false, + "option_android_proguard_shrinking":false, + "option_android_scale":0, + "option_android_screen_depth":0, + "option_android_sleep_margin":4, + "option_android_splashscreen_background_colour":255, + "option_android_splash_screens_landscape":"${base_options_dir}/android/splash/landscape.png", + "option_android_splash_screens_portrait":"${base_options_dir}/android/splash/portrait.png", + "option_android_splash_time":0, + "option_android_support_lib":"", + "option_android_sync_amazon":false, + "option_android_target_sdk":"", + "option_android_texture_page":"2048x2048", + "option_android_tools_from_version":false, + "option_android_tv_banner":"${base_options_dir}/android/tv_banner.png", + "option_android_tv_isgame":true, + "option_android_tv_supports_leanback":true, + "option_android_use_facebook":false, + "option_android_version":"1.0.0.0", + "resourceType":"GMAndroidOptions", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy index eda4049..513ff1d 100644 --- a/options/html5/options_html5.yy +++ b/options/html5/options_html5.yy @@ -1,33 +1,35 @@ { - "resourceType": "GMHtml5Options", - "resourceVersion": "1.0", - "name": "HTML5", - "option_html5_allow_fullscreen": true, - "option_html5_browser_title": "Created with GameMaker", - "option_html5_centregame": false, - "option_html5_display_cursor": true, - "option_html5_facebook_app_display_name": "", - "option_html5_facebook_id": "", - "option_html5_flurry_enable": false, - "option_html5_flurry_id": "", - "option_html5_foldername": "html5game", - "option_html5_google_analytics_enable": false, - "option_html5_google_tracking_id": "", - "option_html5_icon": "${base_options_dir}/html5/fav.ico", - "option_html5_index": "", - "option_html5_interpolate_pixels": true, - "option_html5_jsprepend": "", - "option_html5_loadingbar": "", - "option_html5_localrunalert": true, - "option_html5_outputdebugtoconsole": true, - "option_html5_outputname": "index.html", - "option_html5_scale": 0, - "option_html5_splash_png": "${base_options_dir}/html5/splash.png", - "option_html5_texture_page": "2048x2048", - "option_html5_use_facebook": false, - "option_html5_usebuiltinfont": true, - "option_html5_usebuiltinparticles": true, - "option_html5_usesplash": false, - "option_html5_version": "1.0.0.0", - "option_html5_webgl": 2, + "$GMHtml5Options":"", + "%Name":"HTML5", + "name":"HTML5", + "option_html5_allow_fullscreen":true, + "option_html5_browser_title":"Created with GameMaker", + "option_html5_centregame":false, + "option_html5_display_cursor":true, + "option_html5_facebook_app_display_name":"", + "option_html5_facebook_id":"", + "option_html5_flurry_enable":false, + "option_html5_flurry_id":"", + "option_html5_foldername":"html5game", + "option_html5_google_analytics_enable":false, + "option_html5_google_tracking_id":"", + "option_html5_icon":"${base_options_dir}/html5/fav.ico", + "option_html5_index":"", + "option_html5_interpolate_pixels":true, + "option_html5_jsprepend":"", + "option_html5_loadingbar":"", + "option_html5_localrunalert":true, + "option_html5_outputdebugtoconsole":true, + "option_html5_outputname":"index.html", + "option_html5_scale":0, + "option_html5_splash_png":"${base_options_dir}/html5/splash.png", + "option_html5_texture_page":"2048x2048", + "option_html5_usebuiltinfont":true, + "option_html5_usebuiltinparticles":true, + "option_html5_usesplash":false, + "option_html5_use_facebook":false, + "option_html5_version":"1.0.0.0", + "option_html5_webgl":2, + "resourceType":"GMHtml5Options", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy index adf78cc..c23bf94 100644 --- a/options/ios/options_ios.yy +++ b/options/ios/options_ios.yy @@ -1,48 +1,50 @@ { - "resourceType": "GMiOSOptions", - "resourceVersion": "1.3", - "name": "iOS", - "option_ios_build_number": 0, - "option_ios_bundle_name": "com.company.game", - "option_ios_cocoapods_checkbox": true, - "option_ios_defer_home_indicator": false, - "option_ios_devices": 2, - "option_ios_display_name": "Created with GameMaker", - "option_ios_enable_broadcast": false, - "option_ios_half_ipad1_textures": false, - "option_ios_icon_ipad_app_152": "${base_options_dir}/ios/icons/app/ipad_152.png", - "option_ios_icon_ipad_app_76": "${base_options_dir}/ios/icons/app/ipad_76.png", - "option_ios_icon_ipad_notification_20": "${base_options_dir}/ios/icons/notification/ipad_20.png", - "option_ios_icon_ipad_notification_40": "${base_options_dir}/ios/icons/notification/ipad_40.png", - "option_ios_icon_ipad_pro_app_167": "${base_options_dir}/ios/icons/app/ipad_pro_167.png", - "option_ios_icon_ipad_settings_29": "${base_options_dir}/ios/icons/settings/ipad_29.png", - "option_ios_icon_ipad_settings_58": "${base_options_dir}/ios/icons/settings/ipad_58.png", - "option_ios_icon_ipad_spotlight_40": "${base_options_dir}/ios/icons/spotlight/ipad_40.png", - "option_ios_icon_ipad_spotlight_80": "${base_options_dir}/ios/icons/spotlight/ipad_80.png", - "option_ios_icon_iphone_app_120": "${base_options_dir}/ios/icons/app/iphone_120.png", - "option_ios_icon_iphone_app_180": "${base_options_dir}/ios/icons/app/iphone_180.png", - "option_ios_icon_iphone_notification_40": "${base_options_dir}/ios/icons/notification/iphone_40.png", - "option_ios_icon_iphone_notification_60": "${base_options_dir}/ios/icons/notification/iphone_60.png", - "option_ios_icon_iphone_settings_58": "${base_options_dir}/ios/icons/settings/iphone_58.png", - "option_ios_icon_iphone_settings_87": "${base_options_dir}/ios/icons/settings/iphone_87.png", - "option_ios_icon_iphone_spotlight_120": "${base_options_dir}/ios/icons/spotlight/iphone_120.png", - "option_ios_icon_iphone_spotlight_80": "${base_options_dir}/ios/icons/spotlight/iphone_80.png", - "option_ios_icon_itunes_artwork_1024": "${base_options_dir}/ios/icons/itunes/itunes_1024.png", - "option_ios_interpolate_pixels": false, - "option_ios_launchscreen_fill": 0, - "option_ios_launchscreen_image": "${base_options_dir}/ios/splash/launchscreen.png", - "option_ios_launchscreen_image_landscape": "${base_options_dir}/ios/splash/launchscreen-landscape.png", - "option_ios_min_version": "10.0", - "option_ios_orientation_landscape": true, - "option_ios_orientation_landscape_flipped": true, - "option_ios_orientation_portrait": true, - "option_ios_orientation_portrait_flipped": true, - "option_ios_output_dir": "~/gamemakerstudio2", - "option_ios_podfile_lock_path": "${options_dir}/ios/Podfile.lock", - "option_ios_podfile_path": "${options_dir}/ios/Podfile", - "option_ios_scale": 0, - "option_ios_splashscreen_background_colour": 255, - "option_ios_team_id": "", - "option_ios_texture_page": "2048x2048", - "option_ios_version": "1.0.0.0", + "$GMiOSOptions":"", + "%Name":"iOS", + "name":"iOS", + "option_ios_build_number":0, + "option_ios_bundle_name":"com.company.game", + "option_ios_cocoapods_checkbox":true, + "option_ios_defer_home_indicator":false, + "option_ios_devices":2, + "option_ios_display_name":"Created with GameMaker", + "option_ios_enable_broadcast":false, + "option_ios_half_ipad1_textures":false, + "option_ios_icon_ipad_app_152":"${base_options_dir}/ios/icons/app/ipad_152.png", + "option_ios_icon_ipad_app_76":"${base_options_dir}/ios/icons/app/ipad_76.png", + "option_ios_icon_ipad_notification_20":"${base_options_dir}/ios/icons/notification/ipad_20.png", + "option_ios_icon_ipad_notification_40":"${base_options_dir}/ios/icons/notification/ipad_40.png", + "option_ios_icon_ipad_pro_app_167":"${base_options_dir}/ios/icons/app/ipad_pro_167.png", + "option_ios_icon_ipad_settings_29":"${base_options_dir}/ios/icons/settings/ipad_29.png", + "option_ios_icon_ipad_settings_58":"${base_options_dir}/ios/icons/settings/ipad_58.png", + "option_ios_icon_ipad_spotlight_40":"${base_options_dir}/ios/icons/spotlight/ipad_40.png", + "option_ios_icon_ipad_spotlight_80":"${base_options_dir}/ios/icons/spotlight/ipad_80.png", + "option_ios_icon_iphone_app_120":"${base_options_dir}/ios/icons/app/iphone_120.png", + "option_ios_icon_iphone_app_180":"${base_options_dir}/ios/icons/app/iphone_180.png", + "option_ios_icon_iphone_notification_40":"${base_options_dir}/ios/icons/notification/iphone_40.png", + "option_ios_icon_iphone_notification_60":"${base_options_dir}/ios/icons/notification/iphone_60.png", + "option_ios_icon_iphone_settings_58":"${base_options_dir}/ios/icons/settings/iphone_58.png", + "option_ios_icon_iphone_settings_87":"${base_options_dir}/ios/icons/settings/iphone_87.png", + "option_ios_icon_iphone_spotlight_120":"${base_options_dir}/ios/icons/spotlight/iphone_120.png", + "option_ios_icon_iphone_spotlight_80":"${base_options_dir}/ios/icons/spotlight/iphone_80.png", + "option_ios_icon_itunes_artwork_1024":"${base_options_dir}/ios/icons/itunes/itunes_1024.png", + "option_ios_interpolate_pixels":false, + "option_ios_launchscreen_fill":0, + "option_ios_launchscreen_image":"${base_options_dir}/ios/splash/launchscreen.png", + "option_ios_launchscreen_image_landscape":"${base_options_dir}/ios/splash/launchscreen-landscape.png", + "option_ios_min_version":"10.0", + "option_ios_orientation_landscape":true, + "option_ios_orientation_landscape_flipped":true, + "option_ios_orientation_portrait":true, + "option_ios_orientation_portrait_flipped":true, + "option_ios_output_dir":"~/gamemakerstudio2", + "option_ios_podfile_lock_path":"${options_dir}/ios/Podfile.lock", + "option_ios_podfile_path":"${options_dir}/ios/Podfile", + "option_ios_scale":0, + "option_ios_splashscreen_background_colour":255, + "option_ios_team_id":"", + "option_ios_texture_page":"2048x2048", + "option_ios_version":"1.0.0.0", + "resourceType":"GMiOSOptions", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy index b6c5a50..94218d3 100644 --- a/options/linux/options_linux.yy +++ b/options/linux/options_linux.yy @@ -1,24 +1,26 @@ { - "resourceType": "GMLinuxOptions", - "resourceVersion": "1.0", - "name": "Linux", - "option_linux_allow_fullscreen": false, - "option_linux_disable_sandbox": false, - "option_linux_display_cursor": true, - "option_linux_display_name": "Created with GameMaker", - "option_linux_display_splash": false, - "option_linux_enable_steam": false, - "option_linux_homepage": "http://www.yoyogames.com", - "option_linux_icon": "${base_options_dir}/linux/icons/64.png", - "option_linux_interpolate_pixels": true, - "option_linux_long_desc": "", - "option_linux_maintainer_email": "", - "option_linux_resize_window": false, - "option_linux_scale": 0, - "option_linux_short_desc": "", - "option_linux_splash_screen": "${base_options_dir}/linux/splash/splash.png", - "option_linux_start_fullscreen": false, - "option_linux_sync": false, - "option_linux_texture_page": "2048x2048", - "option_linux_version": "1.0.0.0", + "$GMLinuxOptions":"", + "%Name":"Linux", + "name":"Linux", + "option_linux_allow_fullscreen":false, + "option_linux_disable_sandbox":false, + "option_linux_display_cursor":true, + "option_linux_display_name":"Created with GameMaker", + "option_linux_display_splash":false, + "option_linux_enable_steam":false, + "option_linux_homepage":"http://www.yoyogames.com", + "option_linux_icon":"${base_options_dir}/linux/icons/64.png", + "option_linux_interpolate_pixels":true, + "option_linux_long_desc":"", + "option_linux_maintainer_email":"", + "option_linux_resize_window":false, + "option_linux_scale":0, + "option_linux_short_desc":"", + "option_linux_splash_screen":"${base_options_dir}/linux/splash/splash.png", + "option_linux_start_fullscreen":false, + "option_linux_sync":false, + "option_linux_texture_page":"2048x2048", + "option_linux_version":"1.0.0.0", + "resourceType":"GMLinuxOptions", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index 577d876..8f66f68 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -1,36 +1,38 @@ { - "resourceType": "GMMacOptions", - "resourceVersion": "1.0", - "name": "macOS", - "option_mac_allow_fullscreen": false, - "option_mac_allow_incoming_network": false, - "option_mac_allow_outgoing_network": false, - "option_mac_app_category": "Games", - "option_mac_app_id": "com.company.game", - "option_mac_apple_sign_in": false, - "option_mac_arm64": true, - "option_mac_build_app_store": false, - "option_mac_build_number": 0, - "option_mac_copyright": "", - "option_mac_disable_sandbox": false, - "option_mac_display_cursor": true, - "option_mac_display_name": "Created with GameMaker", - "option_mac_enable_retina": false, - "option_mac_enable_steam": false, - "option_mac_icon_png": "${base_options_dir}/mac/icons/1024.png", - "option_mac_installer_background_png": "${base_options_dir}/mac/splash/installer_background.png", - "option_mac_interpolate_pixels": true, - "option_mac_menu_dock": false, - "option_mac_min_version": "10.10", - "option_mac_output_dir": "~/gamemakerstudio2", - "option_mac_resize_window": false, - "option_mac_scale": 0, - "option_mac_signing_identity": "Developer ID Application:", - "option_mac_splash_png": "${base_options_dir}/mac/splash/splash.png", - "option_mac_start_fullscreen": false, - "option_mac_team_id": "", - "option_mac_texture_page": "2048x2048", - "option_mac_version": "1.0.0.0", - "option_mac_vsync": false, - "option_mac_x86_64": true, + "$GMMacOptions":"", + "%Name":"macOS", + "name":"macOS", + "option_mac_allow_fullscreen":false, + "option_mac_allow_incoming_network":false, + "option_mac_allow_outgoing_network":false, + "option_mac_apple_sign_in":false, + "option_mac_app_category":"Games", + "option_mac_app_id":"com.company.game", + "option_mac_arm64":true, + "option_mac_build_app_store":false, + "option_mac_build_number":0, + "option_mac_copyright":"", + "option_mac_disable_sandbox":false, + "option_mac_display_cursor":true, + "option_mac_display_name":"Created with GameMaker", + "option_mac_enable_retina":false, + "option_mac_enable_steam":false, + "option_mac_icon_png":"${base_options_dir}/mac/icons/1024.png", + "option_mac_installer_background_png":"${base_options_dir}/mac/splash/installer_background.png", + "option_mac_interpolate_pixels":true, + "option_mac_menu_dock":false, + "option_mac_min_version":"10.10", + "option_mac_output_dir":"~/gamemakerstudio2", + "option_mac_resize_window":false, + "option_mac_scale":0, + "option_mac_signing_identity":"Developer ID Application:", + "option_mac_splash_png":"${base_options_dir}/mac/splash/splash.png", + "option_mac_start_fullscreen":false, + "option_mac_team_id":"", + "option_mac_texture_page":"2048x2048", + "option_mac_version":"1.0.0.0", + "option_mac_vsync":false, + "option_mac_x86_64":true, + "resourceType":"GMMacOptions", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/main/options_main.yy b/options/main/options_main.yy index ee43cbb..e7d072c 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -1,20 +1,22 @@ { - "resourceType": "GMMainOptions", - "resourceVersion": "1.4", - "name": "Main", - "option_author": "", - "option_collision_compatibility": false, - "option_copy_on_write_enabled": false, - "option_draw_colour": 4294967295, - "option_game_speed": 60, - "option_gameguid": "ffd28944-6f27-4c27-b351-26818f50d325", - "option_gameid": "0", - "option_mips_for_3d_textures": false, - "option_sci_usesci": false, - "option_spine_licence": false, - "option_steam_app_id": "0", - "option_template_description": null, - "option_template_icon": "${base_options_dir}/main/template_icon.png", - "option_template_image": "${base_options_dir}/main/template_image.png", - "option_window_colour": 255, + "$GMMainOptions":"", + "%Name":"Main", + "name":"Main", + "option_author":"", + "option_collision_compatibility":false, + "option_copy_on_write_enabled":false, + "option_draw_colour":4294967295, + "option_gameguid":"ffd28944-6f27-4c27-b351-26818f50d325", + "option_gameid":"0", + "option_game_speed":60, + "option_mips_for_3d_textures":false, + "option_sci_usesci":false, + "option_spine_licence":false, + "option_steam_app_id":"0", + "option_template_description":null, + "option_template_icon":"${base_options_dir}/main/template_icon.png", + "option_template_image":"${base_options_dir}/main/template_image.png", + "option_window_colour":255, + "resourceType":"GMMainOptions", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy index 411ce67..beee0ba 100644 --- a/options/operagx/options_operagx.yy +++ b/options/operagx/options_operagx.yy @@ -1,27 +1,29 @@ { - "resourceType": "GMOperaGXOptions", - "resourceVersion": "1.1", - "name": "operagx", - "option_operagx_display_cursor": true, - "option_operagx_editUrl": "", - "option_operagx_game_name": "stanncam", - "option_operagx_guid": "", - "option_operagx_internalShareUrl": "", - "option_operagx_interpolate_pixels": true, - "option_operagx_mod_editUrl": "", - "option_operagx_mod_game_name": "stanncam", - "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, - "option_operagx_team_id": "", - "option_operagx_team_name": "", - "option_operagx_texture_page": "2048x2048", - "option_operagx_version": "1.0.0.0", + "$GMOperaGXOptions":"", + "%Name":"operagx", + "name":"operagx", + "option_operagx_display_cursor":true, + "option_operagx_editUrl":"", + "option_operagx_game_name":"stanncam", + "option_operagx_guid":"", + "option_operagx_internalShareUrl":"", + "option_operagx_interpolate_pixels":true, + "option_operagx_mod_editUrl":"", + "option_operagx_mod_game_name":"stanncam", + "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, + "option_operagx_team_id":"", + "option_operagx_team_name":"", + "option_operagx_texture_page":"2048x2048", + "option_operagx_version":"1.0.0.0", + "resourceType":"GMOperaGXOptions", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy index 9d07097..a567494 100644 --- a/options/tvos/options_tvos.yy +++ b/options/tvos/options_tvos.yy @@ -1,30 +1,32 @@ { - "resourceType": "GMtvOSOptions", - "resourceVersion": "1.3", - "name": "tvOS", - "option_tvos_build_number": 0, - "option_tvos_bundle_name": "com.company.game", - "option_tvos_cocoapods_checkbox": true, - "option_tvos_display_cursor": false, - "option_tvos_display_name": "Made in GameMaker", - "option_tvos_enable_broadcast": false, - "option_tvos_icon_1280": "${base_options_dir}/tvos/icons/1280.png", - "option_tvos_icon_400": "${base_options_dir}/tvos/icons/400.png", - "option_tvos_icon_400_2x": "${base_options_dir}/tvos/icons/400_2x.png", - "option_tvos_interpolate_pixels": true, - "option_tvos_min_version": "10.0", - "option_tvos_output_dir": "~/GameMakerStudio2/tvOS", - "option_tvos_podfile_lock_path": "${options_dir}\\tvos\\Podfile.lock", - "option_tvos_podfile_path": "${options_dir}\\tvos\\Podfile", - "option_tvos_scale": 0, - "option_tvos_splash_time": 0, - "option_tvos_splashscreen": "${base_options_dir}/tvos/splash/splash.png", - "option_tvos_splashscreen_2x": "${base_options_dir}/tvos/splash/splash_2x.png", - "option_tvos_team_id": "", - "option_tvos_texture_page": "2048x2048", - "option_tvos_topshelf": "${base_options_dir}/tvos/topshelf/topshelf.png", - "option_tvos_topshelf_2x": "${base_options_dir}/tvos/topshelf/topshelf_2x.png", - "option_tvos_topshelf_wide": "${base_options_dir}/tvos/topshelf/topshelf_wide.png", - "option_tvos_topshelf_wide_2x": "${base_options_dir}/tvos/topshelf/topshelf_wide_2x.png", - "option_tvos_version": "1.0.0.0", + "$GMtvOSOptions":"", + "%Name":"tvOS", + "name":"tvOS", + "option_tvos_build_number":0, + "option_tvos_bundle_name":"com.company.game", + "option_tvos_cocoapods_checkbox":true, + "option_tvos_display_cursor":false, + "option_tvos_display_name":"Made in GameMaker", + "option_tvos_enable_broadcast":false, + "option_tvos_icon_1280":"${base_options_dir}/tvos/icons/1280.png", + "option_tvos_icon_400":"${base_options_dir}/tvos/icons/400.png", + "option_tvos_icon_400_2x":"${base_options_dir}/tvos/icons/400_2x.png", + "option_tvos_interpolate_pixels":true, + "option_tvos_min_version":"10.0", + "option_tvos_output_dir":"~/GameMakerStudio2/tvOS", + "option_tvos_podfile_lock_path":"${options_dir}\\tvos\\Podfile.lock", + "option_tvos_podfile_path":"${options_dir}\\tvos\\Podfile", + "option_tvos_scale":0, + "option_tvos_splashscreen":"${base_options_dir}/tvos/splash/splash.png", + "option_tvos_splashscreen_2x":"${base_options_dir}/tvos/splash/splash_2x.png", + "option_tvos_splash_time":0, + "option_tvos_team_id":"", + "option_tvos_texture_page":"2048x2048", + "option_tvos_topshelf":"${base_options_dir}/tvos/topshelf/topshelf.png", + "option_tvos_topshelf_2x":"${base_options_dir}/tvos/topshelf/topshelf_2x.png", + "option_tvos_topshelf_wide":"${base_options_dir}/tvos/topshelf/topshelf_wide.png", + "option_tvos_topshelf_wide_2x":"${base_options_dir}/tvos/topshelf/topshelf_wide_2x.png", + "option_tvos_version":"1.0.0.0", + "resourceType":"GMtvOSOptions", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 0434a11..5a965a6 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -1,34 +1,36 @@ { - "resourceType": "GMWindowsOptions", - "resourceVersion": "1.1", - "name": "Windows", - "option_windows_allow_fullscreen_switching": false, - "option_windows_borderless": false, - "option_windows_company_info": "STANNco", - "option_windows_copy_exe_to_dest": false, - "option_windows_copyright_info": "", - "option_windows_description_info": "A GameMaker Game", - "option_windows_disable_sandbox": false, - "option_windows_display_cursor": true, - "option_windows_display_name": "STANNcam example project", - "option_windows_enable_steam": false, - "option_windows_executable_name": "${project_name}.exe", - "option_windows_icon": "${base_options_dir}/windows/icons/icon.ico", - "option_windows_installer_finished": "${base_options_dir}/windows/installer/finished.bmp", - "option_windows_installer_header": "${base_options_dir}/windows/installer/header.bmp", - "option_windows_interpolate_pixels": false, - "option_windows_license": "${base_options_dir}/windows/installer/license.txt", - "option_windows_nsis_file": "${base_options_dir}/windows/installer/nsis_script.nsi", - "option_windows_product_info": "STANNcam", - "option_windows_resize_window": true, - "option_windows_save_location": 0, - "option_windows_scale": 0, - "option_windows_sleep_margin": 10, - "option_windows_splash_screen": "${base_options_dir}/windows/splash/splash.png", - "option_windows_start_fullscreen": false, - "option_windows_steam_use_alternative_launcher": false, - "option_windows_texture_page": "2048x2048", - "option_windows_use_splash": false, - "option_windows_version": "2.3.0.0", - "option_windows_vsync": false, + "$GMWindowsOptions":"", + "%Name":"Windows", + "name":"Windows", + "option_windows_allow_fullscreen_switching":false, + "option_windows_borderless":false, + "option_windows_company_info":"STANNco", + "option_windows_copyright_info":"", + "option_windows_copy_exe_to_dest":false, + "option_windows_description_info":"A GameMaker Game", + "option_windows_disable_sandbox":false, + "option_windows_display_cursor":true, + "option_windows_display_name":"STANNcam example project", + "option_windows_enable_steam":false, + "option_windows_executable_name":"${project_name}.exe", + "option_windows_icon":"${base_options_dir}/windows/icons/icon.ico", + "option_windows_installer_finished":"${base_options_dir}/windows/installer/finished.bmp", + "option_windows_installer_header":"${base_options_dir}/windows/installer/header.bmp", + "option_windows_interpolate_pixels":false, + "option_windows_license":"${base_options_dir}/windows/installer/license.txt", + "option_windows_nsis_file":"${base_options_dir}/windows/installer/nsis_script.nsi", + "option_windows_product_info":"STANNcam", + "option_windows_resize_window":true, + "option_windows_save_location":0, + "option_windows_scale":0, + "option_windows_sleep_margin":10, + "option_windows_splash_screen":"${base_options_dir}/windows/splash/splash.png", + "option_windows_start_fullscreen":false, + "option_windows_steam_use_alternative_launcher":false, + "option_windows_texture_page":"2048x2048", + "option_windows_use_splash":false, + "option_windows_version":"2.3.0.0", + "option_windows_vsync":false, + "resourceType":"GMWindowsOptions", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/rooms/rm_init/rm_init.yy b/rooms/rm_init/rm_init.yy index f6bf576..82f18b2 100644 --- a/rooms/rm_init/rm_init.yy +++ b/rooms/rm_init/rm_init.yy @@ -1,41 +1,43 @@ { - "resourceType": "GMRoom", - "resourceVersion": "1.0", - "name": "rm_init", - "creationCodeFile": "", - "inheritCode": false, - "inheritCreationOrder": false, - "inheritLayers": false, - "instanceCreationOrder": [ + "$GMRoom":"", + "%Name":"rm_init", + "creationCodeFile":"", + "inheritCode":false, + "inheritCreationOrder":false, + "inheritLayers":false, + "instanceCreationOrder":[ {"name":"inst_775365B7","path":"rooms/rm_init/rm_init.yy",}, ], - "isDnd": false, - "layers": [ - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_775365B7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_game_controller","path":"objects/obj_game_controller/obj_game_controller.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":16.0,"y":16.0,}, - ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, - {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4033242726,"depth":100,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, + "isDnd":false, + "layers":[ + {"$GMRInstanceLayer":"","%Name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"$GMRInstance":"","%Name":"inst_775365B7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_775365B7","objectId":{"name":"obj_game_controller","path":"objects/obj_game_controller/obj_game_controller.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":16.0,"y":16.0,}, + ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, + {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4033242726,"depth":100,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Background","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, ], - "parent": { - "name": "Rooms", - "path": "folders/Rooms.yy", + "name":"rm_init", + "parent":{ + "name":"Rooms", + "path":"folders/Rooms.yy", }, - "parentRoom": null, - "physicsSettings": { - "inheritPhysicsSettings": false, - "PhysicsWorld": false, - "PhysicsWorldGravityX": 0.0, - "PhysicsWorldGravityY": 10.0, - "PhysicsWorldPixToMetres": 0.1, + "parentRoom":null, + "physicsSettings":{ + "inheritPhysicsSettings":false, + "PhysicsWorld":false, + "PhysicsWorldGravityX":0.0, + "PhysicsWorldGravityY":10.0, + "PhysicsWorldPixToMetres":0.1, }, - "roomSettings": { - "Height": 80, - "inheritRoomSettings": false, - "persistent": false, - "Width": 80, + "resourceType":"GMRoom", + "resourceVersion":"2.0", + "roomSettings":{ + "Height":80, + "inheritRoomSettings":false, + "persistent":false, + "Width":80, }, - "sequenceId": null, - "views": [ + "sequenceId":null, + "views":[ {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, @@ -45,11 +47,11 @@ {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, ], - "viewSettings": { - "clearDisplayBuffer": true, - "clearViewBackground": false, - "enableViews": false, - "inheritViewSettings": false, + "viewSettings":{ + "clearDisplayBuffer":true, + "clearViewBackground":false, + "enableViews":false, + "inheritViewSettings":false, }, - "volume": 1.0, + "volume":1.0, } \ No newline at end of file diff --git a/rooms/rm_pixel_grid/rm_pixel_grid.yy b/rooms/rm_pixel_grid/rm_pixel_grid.yy index 3196573..6efb270 100644 --- a/rooms/rm_pixel_grid/rm_pixel_grid.yy +++ b/rooms/rm_pixel_grid/rm_pixel_grid.yy @@ -1,41 +1,43 @@ { - "resourceType": "GMRoom", - "resourceVersion": "1.0", - "name": "rm_pixel_grid", - "creationCodeFile": "rooms/rm_pixel_grid/RoomCreationCode.gml", - "inheritCode": false, - "inheritCreationOrder": false, - "inheritLayers": false, - "instanceCreationOrder": [ + "$GMRoom":"", + "%Name":"rm_pixel_grid", + "creationCodeFile":"rooms/rm_pixel_grid/RoomCreationCode.gml", + "inheritCode":false, + "inheritCreationOrder":false, + "inheritLayers":false, + "instanceCreationOrder":[ {"name":"inst_88130FE","path":"rooms/rm_pixel_grid/rm_pixel_grid.yy",}, ], - "isDnd": false, - "layers": [ - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"different_name_than_instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_88130FE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_camera_pixel_grid","path":"objects/obj_camera_pixel_grid/obj_camera_pixel_grid.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":32.0,}, - ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, - {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Backgrounds_1","animationFPS":1.0,"animationSpeedType":1,"colour":4294967295,"depth":100,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"hspeed":0.0,"htiled":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":{"name":"spr_pixel_grid_test","path":"sprites/spr_pixel_grid_test/spr_pixel_grid_test.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":true,"x":0,"y":0,}, + "isDnd":false, + "layers":[ + {"$GMRInstanceLayer":"","%Name":"different_name_than_instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"$GMRInstance":"","%Name":"inst_88130FE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_88130FE","objectId":{"name":"obj_camera_pixel_grid","path":"objects/obj_camera_pixel_grid/obj_camera_pixel_grid.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":32.0,}, + ],"layers":[],"name":"different_name_than_instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, + {"$GMRBackgroundLayer":"","%Name":"Backgrounds_1","animationFPS":1.0,"animationSpeedType":1,"colour":4294967295,"depth":100,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"hspeed":0.0,"htiled":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Backgrounds_1","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":{"name":"spr_pixel_grid_test","path":"sprites/spr_pixel_grid_test/spr_pixel_grid_test.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":true,"x":0,"y":0,}, ], - "parent": { - "name": "Rooms", - "path": "folders/Rooms.yy", + "name":"rm_pixel_grid", + "parent":{ + "name":"Rooms", + "path":"folders/Rooms.yy", }, - "parentRoom": null, - "physicsSettings": { - "inheritPhysicsSettings": false, - "PhysicsWorld": false, - "PhysicsWorldGravityX": 0.0, - "PhysicsWorldGravityY": 10.0, - "PhysicsWorldPixToMetres": 0.1, + "parentRoom":null, + "physicsSettings":{ + "inheritPhysicsSettings":false, + "PhysicsWorld":false, + "PhysicsWorldGravityX":0.0, + "PhysicsWorldGravityY":10.0, + "PhysicsWorldPixToMetres":0.1, }, - "roomSettings": { - "Height": 100, - "inheritRoomSettings": false, - "persistent": false, - "Width": 100, + "resourceType":"GMRoom", + "resourceVersion":"2.0", + "roomSettings":{ + "Height":100, + "inheritRoomSettings":false, + "persistent":false, + "Width":100, }, - "sequenceId": null, - "views": [ + "sequenceId":null, + "views":[ {"hborder":32,"hport":10,"hspeed":-1,"hview":10,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":10,"wview":10,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, @@ -45,11 +47,11 @@ {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, ], - "viewSettings": { - "clearDisplayBuffer": true, - "clearViewBackground": false, - "enableViews": false, - "inheritViewSettings": false, + "viewSettings":{ + "clearDisplayBuffer":true, + "clearViewBackground":false, + "enableViews":false, + "inheritViewSettings":false, }, - "volume": 1.0, + "volume":1.0, } \ No newline at end of file diff --git a/rooms/rm_sidescroller/rm_sidescroller.yy b/rooms/rm_sidescroller/rm_sidescroller.yy index 71141af..d967f02 100644 --- a/rooms/rm_sidescroller/rm_sidescroller.yy +++ b/rooms/rm_sidescroller/rm_sidescroller.yy @@ -1,12 +1,11 @@ { - "resourceType": "GMRoom", - "resourceVersion": "1.0", - "name": "rm_sidescroller", - "creationCodeFile": "", - "inheritCode": false, - "inheritCreationOrder": false, - "inheritLayers": false, - "instanceCreationOrder": [ + "$GMRoom":"", + "%Name":"rm_sidescroller", + "creationCodeFile":"", + "inheritCode":false, + "inheritCreationOrder":false, + "inheritLayers":false, + "instanceCreationOrder":[ {"name":"inst_25469891","path":"rooms/rm_sidescroller/rm_sidescroller.yy",}, {"name":"inst_38912525","path":"rooms/rm_sidescroller/rm_sidescroller.yy",}, {"name":"inst_43F6B6EE","path":"rooms/rm_sidescroller/rm_sidescroller.yy",}, @@ -31,67 +30,78 @@ {"name":"inst_A25C63","path":"rooms/rm_sidescroller/rm_sidescroller.yy",}, {"name":"inst_6ED6D58C","path":"rooms/rm_sidescroller/rm_sidescroller.yy",}, ], - "isDnd": false, - "layers": [ - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"collisions","depth":0,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_25469891","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":9.0,"x":0.0,"y":0.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_38912525","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":3.0,"scaleY":1.0,"x":0.0,"y":288.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_43F6B6EE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":5.0,"scaleY":2.0,"x":0.0,"y":320.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_28A7422B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":26.0,"scaleY":3.0,"x":0.0,"y":384.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_6F3597CA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":3.0,"scaleY":0.84375,"x":736.0,"y":288.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_1D3444A7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":9.0,"scaleY":7.0,"x":832.0,"y":0.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_330D94B4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":6.0,"scaleY":0.78125,"x":448.0,"y":320.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_52A3B4D0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":4.0,"scaleY":0.8125,"x":256.0,"y":192.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_3DFDFCE0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":5.0,"scaleY":0.8125,"x":480.0,"y":96.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_4538CAB8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":35.0,"scaleY":7.5,"x":0.0,"y":-240.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_1BCFE384","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":19.0,"scaleY":7.0,"x":1184.0,"y":0.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_24DBD3F6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1152.0,"y":96.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_E069A96","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":192.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_13CF63D1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":30.0,"scaleY":6.0,"x":832.0,"y":288.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_EDC733D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":2.0,"x":1728.0,"y":224.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_1E9D41CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":19.0,"scaleY":7.5,"x":1184.0,"y":-240.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_29C053D1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"rotation":0.0,"scaleX":2.0,"scaleY":1.0,"x":1120.0,"y":-272.0,}, - ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":false,}, - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"camera_zones","depth":100,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_2417DA4E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_stanncam_zone_2side","path":"objects/obj_stanncam_zone_2side/obj_stanncam_zone_2side.yy",},"properties":[],"rotation":0.0,"scaleX":4.0,"scaleY":28.000002,"x":1120.0,"y":-240.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_A25C63","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_stanncam_zone","path":"objects/obj_stanncam_zone/obj_stanncam_zone.yy",},"properties":[],"rotation":0.0,"scaleX":24.875,"scaleY":16.3125,"x":346.0,"y":148.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_6ED6D58C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_stanncam_zone_u","path":"objects/obj_stanncam_zone_u/obj_stanncam_zone_u.yy",},"properties":[],"rotation":0.0,"scaleX":60.000004,"scaleY":6.0,"x":832.0,"y":208.0,}, - ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":200,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_7AF44202","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_camera_sidescroller","path":"objects/obj_camera_sidescroller/obj_camera_sidescroller.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":48.0,"y":16.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_3F03D43","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_player_sidescroller","path":"objects/obj_player_sidescroller/obj_player_sidescroller.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":80.0,"y":288.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_3C1837A1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_player_sidescroller2","path":"objects/obj_player_sidescroller2/obj_player_sidescroller2.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":498.0,"y":320.0,}, - ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, - {"resourceType":"GMRTileLayer","resourceVersion":"1.1","name":"Tiles_1","depth":300,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"tiles":{"SerialiseHeight":15,"SerialiseWidth":56,"TileCompressedData":[ -1,25,-13,0,-12,-2147483648,1,17,-7,1,4,25,0,0,17,-18,1,1,25,-13,0,-12,-2147483648,1,17,-7,1,4,25,0,0,17,-18,1,1,25,-13,0,-12,-2147483648,1,17,-7,1,4,25,0,0,17,-18,1,1,25,-10,0,-3, -1879048192,6,-2147483648,44,34,34,24,46,-6,-2147483648,1,17,-7,1,4,25,0,44,10,-18,1,1,25,-12,0,1,1879048192,-4,-2147483648,1,33,-7,-2147483648,1,17,-7,1,4,25,0,0,17,-18,1,1,25,-10,0,-3,1879048192,-4,-2147483648,1,45,-7,-2147483648, -1,17,-7,1,4,25,0,0,17,-18,1,1,25,-7,0,6,44,24,34,46,1879048192,1879048192,-12,-2147483648,1,41,-7,29,4,31,46,-2147483648,41,-16,29,3,13,29,25,-8,0,1,33,-6,0,-10,-2147483648,1,0,-27,-2147483648,3,33,-2147483648,25,-8, -0,2,45,0,-3,1879048192,1,0,-6,-2147483648,-23,0,-10,-2147483648,5,33,-2147483648,3,21,37,-13,0,-7,-2147483648,4,44,24,34,23,-27,21,7,4,21,1,1,3,21,37,-9,0,1,36,-4,34,1,38,-4,-2147483648,18,33,-2147483648,17,5,29,13, -29,29,13,29,29,13,29,29,13,29,29,13,-5,29,3,13,29,9,-10,1,1,25,-6,0,-3,-2147483648,1,33,-4,-2147483648,1,33,-4,-2147483648,18,33,-2147483648,17,25,0,33,0,0,45,0,0,45,0,-2147483648,45,-2147483648,-2147483648,33,-5,-2147483648,3, -33,-2147483648,17,-10,1,1,3,-9,21,1,4,-4,21,11,4,21,21,22,34,32,34,10,25,0,33,-7,0,-4,-2147483648,1,33,-5,-2147483648,3,33,-2147483648,17,-7,1,1,5,-4,29,1,13,-7,29,1,13,-4,29,4,9,1,1,25, --3,0,4,17,25,0,33,-7,0,-4,-2147483648,1,33,-5,-2147483648,3,33,-2147483648,17,-7,1,1,25,-4,0,1,33,-7,0,1,33,-4,0,4,17,1,1,25,-3,0,4,17,25,0,33,-8,0,-3,-2147483648,1,33,-5,-2147483648,3,33,-2147483648, -17,-6,1,],"TileDataFormat":1,},"tilesetId":{"name":"ts_pixel_side_Underwater","path":"tilesets/ts_pixel_side_Underwater/ts_pixel_side_Underwater.yy",},"userdefinedDepth":false,"visible":true,"x":0,"y":0,}, + "isDnd":false, + "layers":[ + {"$GMRInstanceLayer":"","%Name":"collisions","depth":0,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"$GMRInstance":"","%Name":"inst_25469891","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_25469891","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":9.0,"x":0.0,"y":0.0,}, + {"$GMRInstance":"","%Name":"inst_38912525","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_38912525","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":3.0,"scaleY":1.0,"x":0.0,"y":288.0,}, + {"$GMRInstance":"","%Name":"inst_43F6B6EE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_43F6B6EE","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":5.0,"scaleY":2.0,"x":0.0,"y":320.0,}, + {"$GMRInstance":"","%Name":"inst_28A7422B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_28A7422B","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":26.0,"scaleY":3.0,"x":0.0,"y":384.0,}, + {"$GMRInstance":"","%Name":"inst_6F3597CA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6F3597CA","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":3.0,"scaleY":0.84375,"x":736.0,"y":288.0,}, + {"$GMRInstance":"","%Name":"inst_1D3444A7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1D3444A7","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":9.0,"scaleY":7.0,"x":832.0,"y":0.0,}, + {"$GMRInstance":"","%Name":"inst_330D94B4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_330D94B4","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":6.0,"scaleY":0.78125,"x":448.0,"y":320.0,}, + {"$GMRInstance":"","%Name":"inst_52A3B4D0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_52A3B4D0","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":4.0,"scaleY":0.8125,"x":256.0,"y":192.0,}, + {"$GMRInstance":"","%Name":"inst_3DFDFCE0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3DFDFCE0","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":5.0,"scaleY":0.8125,"x":480.0,"y":96.0,}, + {"$GMRInstance":"","%Name":"inst_4538CAB8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4538CAB8","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":35.0,"scaleY":7.5,"x":0.0,"y":-240.0,}, + {"$GMRInstance":"","%Name":"inst_1BCFE384","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1BCFE384","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":19.0,"scaleY":7.0,"x":1184.0,"y":0.0,}, + {"$GMRInstance":"","%Name":"inst_24DBD3F6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_24DBD3F6","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1152.0,"y":96.0,}, + {"$GMRInstance":"","%Name":"inst_E069A96","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E069A96","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":192.0,}, + {"$GMRInstance":"","%Name":"inst_13CF63D1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_13CF63D1","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":30.0,"scaleY":6.0,"x":832.0,"y":288.0,}, + {"$GMRInstance":"","%Name":"inst_EDC733D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EDC733D","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":2.0,"x":1728.0,"y":224.0,}, + {"$GMRInstance":"","%Name":"inst_1E9D41CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1E9D41CC","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":19.0,"scaleY":7.5,"x":1184.0,"y":-240.0,}, + {"$GMRInstance":"","%Name":"inst_29C053D1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_29C053D1","objectId":{"name":"obj_collision","path":"objects/obj_collision/obj_collision.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":2.0,"scaleY":1.0,"x":1120.0,"y":-272.0,}, + ],"layers":[],"name":"collisions","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":false,}, + {"$GMRInstanceLayer":"","%Name":"camera_zones","depth":100,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"$GMRInstance":"","%Name":"inst_2417DA4E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2417DA4E","objectId":{"name":"obj_stanncam_zone_2side","path":"objects/obj_stanncam_zone_2side/obj_stanncam_zone_2side.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":4.0,"scaleY":28.000002,"x":1120.0,"y":-240.0,}, + {"$GMRInstance":"","%Name":"inst_A25C63","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A25C63","objectId":{"name":"obj_stanncam_zone","path":"objects/obj_stanncam_zone/obj_stanncam_zone.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":24.875,"scaleY":16.3125,"x":346.0,"y":148.0,}, + {"$GMRInstance":"","%Name":"inst_6ED6D58C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6ED6D58C","objectId":{"name":"obj_stanncam_zone_u","path":"objects/obj_stanncam_zone_u/obj_stanncam_zone_u.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":60.000004,"scaleY":6.0,"x":832.0,"y":208.0,}, + ],"layers":[],"name":"camera_zones","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, + {"$GMRInstanceLayer":"","%Name":"Instances","depth":200,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"$GMRInstance":"","%Name":"inst_7AF44202","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7AF44202","objectId":{"name":"obj_camera_sidescroller","path":"objects/obj_camera_sidescroller/obj_camera_sidescroller.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":48.0,"y":16.0,}, + {"$GMRInstance":"","%Name":"inst_3F03D43","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3F03D43","objectId":{"name":"obj_player_sidescroller","path":"objects/obj_player_sidescroller/obj_player_sidescroller.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":80.0,"y":288.0,}, + {"$GMRInstance":"","%Name":"inst_3C1837A1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3C1837A1","objectId":{"name":"obj_player_sidescroller2","path":"objects/obj_player_sidescroller2/obj_player_sidescroller2.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":498.0,"y":320.0,}, + ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, + {"$GMRTileLayer":"","%Name":"Tiles_1","depth":300,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Tiles_1","properties":[],"resourceType":"GMRTileLayer","resourceVersion":"2.0","tiles":{"SerialiseHeight":15,"SerialiseWidth":56,"TileCompressedData":[ + 1,25,-13,0,-12,-2147483648,1,17,-7,1,4,25,0,0,17,-18,1,1,25,-13,0,-12,-2147483648,1,17,-7,1,4,25,0,0, + 17,-18,1,1,25,-13,0,-12,-2147483648,1,17,-7,1,4,25,0,0,17,-18,1,1,25,-10,0,-3,1879048192,6,-2147483648, + 44,34,34,24,46,-6,-2147483648,1,17,-7,1,4,25,0,44,10,-18,1,1,25,-12,0,1,1879048192,-4,-2147483648,1, + 33,-7,-2147483648,1,17,-7,1,4,25,0,0,17,-18,1,1,25,-10,0,-3,1879048192,-4,-2147483648,1,45,-7,-2147483648, + 1,17,-7,1,4,25,0,0,17,-18,1,1,25,-7,0,6,44,24,34,46,1879048192,1879048192,-12,-2147483648,1,41,-7,29, + 4,31,46,-2147483648,41,-16,29,3,13,29,25,-8,0,1,33,-6,0,-10,-2147483648,1,0,-27,-2147483648,3,33,-2147483648, + 25,-8,0,2,45,0,-3,1879048192,1,0,-6,-2147483648,-23,0,-10,-2147483648,5,33,-2147483648,3,21,37,-13,0, + -7,-2147483648,4,44,24,34,23,-27,21,7,4,21,1,1,3,21,37,-9,0,1,36,-4,34,1,38,-4,-2147483648,18,33,-2147483648, + 17,5,29,13,29,29,13,29,29,13,29,29,13,29,29,13,-5,29,3,13,29,9,-10,1,1,25,-6,0,-3,-2147483648,1,33,-4, + -2147483648,1,33,-4,-2147483648,18,33,-2147483648,17,25,0,33,0,0,45,0,0,45,0,-2147483648,45,-2147483648, + -2147483648,33,-5,-2147483648,3,33,-2147483648,17,-10,1,1,3,-9,21,1,4,-4,21,11,4,21,21,22,34,32,34,10, + 25,0,33,-7,0,-4,-2147483648,1,33,-5,-2147483648,3,33,-2147483648,17,-7,1,1,5,-4,29,1,13,-7,29,1,13,-4, + 29,4,9,1,1,25,-3,0,4,17,25,0,33,-7,0,-4,-2147483648,1,33,-5,-2147483648,3,33,-2147483648,17,-7,1,1,25, + -4,0,1,33,-7,0,1,33,-4,0,4,17,1,1,25,-3,0,4,17,25,0,33,-8,0,-3,-2147483648,1,33,-5,-2147483648,3,33, + -2147483648,17,-6,1, + ],"TileDataFormat":1,},"tilesetId":{"name":"ts_pixel_side_Underwater","path":"tilesets/ts_pixel_side_Underwater/ts_pixel_side_Underwater.yy",},"userdefinedDepth":false,"visible":true,"x":0,"y":0,}, ], - "parent": { - "name": "Rooms", - "path": "folders/Rooms.yy", + "name":"rm_sidescroller", + "parent":{ + "name":"Rooms", + "path":"folders/Rooms.yy", }, - "parentRoom": null, - "physicsSettings": { - "inheritPhysicsSettings": false, - "PhysicsWorld": false, - "PhysicsWorldGravityX": 0.0, - "PhysicsWorldGravityY": 10.0, - "PhysicsWorldPixToMetres": 0.1, + "parentRoom":null, + "physicsSettings":{ + "inheritPhysicsSettings":false, + "PhysicsWorld":false, + "PhysicsWorldGravityX":0.0, + "PhysicsWorldGravityY":10.0, + "PhysicsWorldPixToMetres":0.1, }, - "roomSettings": { - "Height": 480, - "inheritRoomSettings": false, - "persistent": false, - "Width": 1792, + "resourceType":"GMRoom", + "resourceVersion":"2.0", + "roomSettings":{ + "Height":480, + "inheritRoomSettings":false, + "persistent":false, + "Width":1792, }, - "sequenceId": null, - "views": [ + "sequenceId":null, + "views":[ {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, @@ -101,11 +111,11 @@ {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, ], - "viewSettings": { - "clearDisplayBuffer": true, - "clearViewBackground": false, - "enableViews": false, - "inheritViewSettings": false, + "viewSettings":{ + "clearDisplayBuffer":true, + "clearViewBackground":false, + "enableViews":false, + "inheritViewSettings":false, }, - "volume": 1.0, + "volume":1.0, } \ No newline at end of file diff --git a/rooms/rm_test/rm_test.yy b/rooms/rm_test/rm_test.yy index 34507a6..d307feb 100644 --- a/rooms/rm_test/rm_test.yy +++ b/rooms/rm_test/rm_test.yy @@ -1,12 +1,11 @@ { - "resourceType": "GMRoom", - "resourceVersion": "1.0", - "name": "rm_test", - "creationCodeFile": "${project_dir}/rooms/Room1/RoomCreationCode.gml", - "inheritCode": false, - "inheritCreationOrder": false, - "inheritLayers": false, - "instanceCreationOrder": [ + "$GMRoom":"", + "%Name":"rm_test", + "creationCodeFile":"${project_dir}/rooms/Room1/RoomCreationCode.gml", + "inheritCode":false, + "inheritCreationOrder":false, + "inheritLayers":false, + "instanceCreationOrder":[ {"name":"inst_28868B2A","path":"rooms/rm_test/rm_test.yy",}, {"name":"inst_4BF294D5","path":"rooms/rm_test/rm_test.yy",}, {"name":"inst_BEB4411","path":"rooms/rm_test/rm_test.yy",}, @@ -14,40 +13,42 @@ {"name":"inst_15296A95","path":"rooms/rm_test/rm_test.yy",}, {"name":"inst_2DE44815","path":"rooms/rm_test/rm_test.yy",}, ], - "isDnd": false, - "layers": [ - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_4BF294D5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_ball","path":"objects/obj_ball/obj_ball.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":112.0,"y":80.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_BEB4411","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_player","path":"objects/obj_player/obj_player.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":160.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_606FE50A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_player2","path":"objects/obj_player2/obj_player2.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":272.0,"y":144.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_15296A95","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_tv","path":"objects/obj_tv/obj_tv.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":304.0,"y":48.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_28868B2A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_camera","path":"objects/obj_camera/obj_camera.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":16.0,"y":16.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_2DE44815","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_stanncam_zone","path":"objects/obj_stanncam_zone/obj_stanncam_zone.yy",},"properties":[],"rotation":0.0,"scaleX":10.200001,"scaleY":10.199999,"x":254.0,"y":6.0,}, - ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, - {"resourceType":"GMRTileLayer","resourceVersion":"1.1","name":"Tiles_1","depth":100,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"tiles":{"SerialiseHeight":8,"SerialiseWidth":14,"TileCompressedData":[ --112,1,],"TileDataFormat":1,},"tilesetId":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"userdefinedDepth":false,"visible":true,"x":0,"y":0,}, - {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Backgrounds_1","animationFPS":1.0,"animationSpeedType":1,"colour":4294967295,"depth":200,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"hspeed":0.0,"htiled":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":{"name":"spr_bg","path":"sprites/spr_bg/spr_bg.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":true,"x":0,"y":0,}, + "isDnd":false, + "layers":[ + {"$GMRInstanceLayer":"","%Name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"$GMRInstance":"","%Name":"inst_4BF294D5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4BF294D5","objectId":{"name":"obj_ball","path":"objects/obj_ball/obj_ball.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":112.0,"y":80.0,}, + {"$GMRInstance":"","%Name":"inst_BEB4411","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BEB4411","objectId":{"name":"obj_player","path":"objects/obj_player/obj_player.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":160.0,}, + {"$GMRInstance":"","%Name":"inst_606FE50A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_606FE50A","objectId":{"name":"obj_player2","path":"objects/obj_player2/obj_player2.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":272.0,"y":144.0,}, + {"$GMRInstance":"","%Name":"inst_15296A95","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_15296A95","objectId":{"name":"obj_tv","path":"objects/obj_tv/obj_tv.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":304.0,"y":48.0,}, + {"$GMRInstance":"","%Name":"inst_28868B2A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_28868B2A","objectId":{"name":"obj_camera","path":"objects/obj_camera/obj_camera.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":16.0,"y":16.0,}, + {"$GMRInstance":"","%Name":"inst_2DE44815","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2DE44815","objectId":{"name":"obj_stanncam_zone","path":"objects/obj_stanncam_zone/obj_stanncam_zone.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":10.200001,"scaleY":10.199999,"x":254.0,"y":6.0,}, + ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, + {"$GMRTileLayer":"","%Name":"Tiles_1","depth":100,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Tiles_1","properties":[],"resourceType":"GMRTileLayer","resourceVersion":"2.0","tiles":{"SerialiseHeight":8,"SerialiseWidth":14,"TileCompressedData":[-112,1,],"TileDataFormat":1,},"tilesetId":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"userdefinedDepth":false,"visible":true,"x":0,"y":0,}, + {"$GMRBackgroundLayer":"","%Name":"Backgrounds_1","animationFPS":1.0,"animationSpeedType":1,"colour":4294967295,"depth":200,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"hspeed":0.0,"htiled":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Backgrounds_1","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":{"name":"spr_bg","path":"sprites/spr_bg/spr_bg.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":true,"x":0,"y":0,}, ], - "parent": { - "name": "Rooms", - "path": "folders/Rooms.yy", + "name":"rm_test", + "parent":{ + "name":"Rooms", + "path":"folders/Rooms.yy", }, - "parentRoom": null, - "physicsSettings": { - "inheritPhysicsSettings": false, - "PhysicsWorld": false, - "PhysicsWorldGravityX": 0.0, - "PhysicsWorldGravityY": 10.0, - "PhysicsWorldPixToMetres": 0.1, + "parentRoom":null, + "physicsSettings":{ + "inheritPhysicsSettings":false, + "PhysicsWorld":false, + "PhysicsWorldGravityX":0.0, + "PhysicsWorldGravityY":10.0, + "PhysicsWorldPixToMetres":0.1, }, - "roomSettings": { - "Height": 256, - "inheritRoomSettings": false, - "persistent": false, - "Width": 448, + "resourceType":"GMRoom", + "resourceVersion":"2.0", + "roomSettings":{ + "Height":256, + "inheritRoomSettings":false, + "persistent":false, + "Width":448, }, - "sequenceId": null, - "views": [ + "sequenceId":null, + "views":[ {"hborder":32,"hport":10,"hspeed":-1,"hview":10,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":10,"wview":10,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, @@ -57,11 +58,11 @@ {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, ], - "viewSettings": { - "clearDisplayBuffer": true, - "clearViewBackground": false, - "enableViews": false, - "inheritViewSettings": false, + "viewSettings":{ + "clearDisplayBuffer":true, + "clearViewBackground":false, + "enableViews":false, + "inheritViewSettings":false, }, - "volume": 1.0, + "volume":1.0, } \ No newline at end of file diff --git a/scripts/draw_sprite_ext_tiled/draw_sprite_ext_tiled.yy b/scripts/draw_sprite_ext_tiled/draw_sprite_ext_tiled.yy index dd4fb6b..24a388c 100644 --- a/scripts/draw_sprite_ext_tiled/draw_sprite_ext_tiled.yy +++ b/scripts/draw_sprite_ext_tiled/draw_sprite_ext_tiled.yy @@ -1,11 +1,13 @@ { - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "draw_sprite_ext_tiled", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", + "$GMScript":"", + "%Name":"draw_sprite_ext_tiled", + "isCompatibility":false, + "isDnD":false, + "name":"draw_sprite_ext_tiled", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", }, + "resourceType":"GMScript", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/scripts/draw_text_outline/draw_text_outline.yy b/scripts/draw_text_outline/draw_text_outline.yy index bf577ab..2cc17f4 100644 --- a/scripts/draw_text_outline/draw_text_outline.yy +++ b/scripts/draw_text_outline/draw_text_outline.yy @@ -1,11 +1,13 @@ { - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "draw_text_outline", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", + "$GMScript":"", + "%Name":"draw_text_outline", + "isCompatibility":false, + "isDnD":false, + "name":"draw_text_outline", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", }, + "resourceType":"GMScript", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/scripts/macros/macros.yy b/scripts/macros/macros.yy index 4f24d48..a2f0d79 100644 --- a/scripts/macros/macros.yy +++ b/scripts/macros/macros.yy @@ -1,11 +1,13 @@ { - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "macros", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", + "$GMScript":"", + "%Name":"macros", + "isCompatibility":false, + "isDnD":false, + "name":"macros", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", }, + "resourceType":"GMScript", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/scripts/stanncam/stanncam.yy b/scripts/stanncam/stanncam.yy index 1c91e48..17cc85f 100644 --- a/scripts/stanncam/stanncam.yy +++ b/scripts/stanncam/stanncam.yy @@ -1,11 +1,13 @@ { - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "stanncam", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "STANNcam", - "path": "folders/STANNcam.yy", + "$GMScript":"", + "%Name":"stanncam", + "isCompatibility":false, + "isDnD":false, + "name":"stanncam", + "parent":{ + "name":"STANNcam", + "path":"folders/STANNcam.yy", }, + "resourceType":"GMScript", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/scripts/stanncam_animcurve/stanncam_animcurve.yy b/scripts/stanncam_animcurve/stanncam_animcurve.yy index 29a910a..77194e3 100644 --- a/scripts/stanncam_animcurve/stanncam_animcurve.yy +++ b/scripts/stanncam_animcurve/stanncam_animcurve.yy @@ -1,11 +1,13 @@ { - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "stanncam_animcurve", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Miscellaneous", - "path": "folders/STANNcam/Miscellaneous.yy", + "$GMScript":"", + "%Name":"stanncam_animcurve", + "isCompatibility":false, + "isDnD":false, + "name":"stanncam_animcurve", + "parent":{ + "name":"Miscellaneous", + "path":"folders/STANNcam/Miscellaneous.yy", }, + "resourceType":"GMScript", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/scripts/stanncam_macros/stanncam_macros.yy b/scripts/stanncam_macros/stanncam_macros.yy index 53e854f..b746bc7 100644 --- a/scripts/stanncam_macros/stanncam_macros.yy +++ b/scripts/stanncam_macros/stanncam_macros.yy @@ -1,11 +1,13 @@ { - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "stanncam_macros", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Miscellaneous", - "path": "folders/STANNcam/Miscellaneous.yy", + "$GMScript":"", + "%Name":"stanncam_macros", + "isCompatibility":false, + "isDnD":false, + "name":"stanncam_macros", + "parent":{ + "name":"Miscellaneous", + "path":"folders/STANNcam/Miscellaneous.yy", }, + "resourceType":"GMScript", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/scripts/stanncam_manager/stanncam_manager.yy b/scripts/stanncam_manager/stanncam_manager.yy index 3dfb95b..e19af7f 100644 --- a/scripts/stanncam_manager/stanncam_manager.yy +++ b/scripts/stanncam_manager/stanncam_manager.yy @@ -1,11 +1,13 @@ { - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "stanncam_manager", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "STANNcam", - "path": "folders/STANNcam.yy", + "$GMScript":"", + "%Name":"stanncam_manager", + "isCompatibility":false, + "isDnD":false, + "name":"stanncam_manager", + "parent":{ + "name":"STANNcam", + "path":"folders/STANNcam.yy", }, + "resourceType":"GMScript", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/scripts/stanncam_resolution_presets/stanncam_resolution_presets.yy b/scripts/stanncam_resolution_presets/stanncam_resolution_presets.yy index 7250894..7316685 100644 --- a/scripts/stanncam_resolution_presets/stanncam_resolution_presets.yy +++ b/scripts/stanncam_resolution_presets/stanncam_resolution_presets.yy @@ -1,11 +1,13 @@ { - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "stanncam_resolution_presets", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Miscellaneous", - "path": "folders/STANNcam/Miscellaneous.yy", + "$GMScript":"", + "%Name":"stanncam_resolution_presets", + "isCompatibility":false, + "isDnD":false, + "name":"stanncam_resolution_presets", + "parent":{ + "name":"Miscellaneous", + "path":"folders/STANNcam/Miscellaneous.yy", }, + "resourceType":"GMScript", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/scripts/stanncam_shake/stanncam_shake.yy b/scripts/stanncam_shake/stanncam_shake.yy index 1b3dd78..35fa685 100644 --- a/scripts/stanncam_shake/stanncam_shake.yy +++ b/scripts/stanncam_shake/stanncam_shake.yy @@ -1,11 +1,13 @@ { - "resourceType": "GMScript", - "resourceVersion": "1.0", - "name": "stanncam_shake", - "isCompatibility": false, - "isDnD": false, - "parent": { - "name": "Miscellaneous", - "path": "folders/STANNcam/Miscellaneous.yy", + "$GMScript":"", + "%Name":"stanncam_shake", + "isCompatibility":false, + "isDnD":false, + "name":"stanncam_shake", + "parent":{ + "name":"Miscellaneous", + "path":"folders/STANNcam/Miscellaneous.yy", }, + "resourceType":"GMScript", + "resourceVersion":"2.0", } \ No newline at end of file diff --git a/sprites/spr_arrow/spr_arrow.yy b/sprites/spr_arrow/spr_arrow.yy index 55580fc..74e6b09 100644 --- a/sprites/spr_arrow/spr_arrow.yy +++ b/sprites/spr_arrow/spr_arrow.yy @@ -1,77 +1,95 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_arrow", - "bbox_bottom": 45, - "bbox_left": 0, - "bbox_right": 69, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e",}, + "$GMSprite":"", + "%Name":"spr_arrow", + "bboxMode":0, + "bbox_bottom":45, + "bbox_left":0, + "bbox_right":69, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 51, - "gridY": 51, - "height": 46, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4a98bca5-875b-452d-9fec-1b80c036d5f2","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"79bf20b2-e262-4265-8a1a-d57f21af8b6a","blendMode":0,"displayName":"Layer 1","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":51, + "gridY":51, + "height":46, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"4a98bca5-875b-452d-9fec-1b80c036d5f2","blendMode":0,"displayName":"default","isLocked":false,"name":"4a98bca5-875b-452d-9fec-1b80c036d5f2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"79bf20b2-e262-4265-8a1a-d57f21af8b6a","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"79bf20b2-e262-4265-8a1a-d57f21af8b6a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 1, - "parent": { - "name": "gui", - "path": "folders/Sprites/gui.yy", + "name":"spr_arrow", + "nineSlice":null, + "origin":1, + "parent":{ + "name":"gui", + "path":"folders/Sprites/gui.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_arrow", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 2.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","path":"sprites/spr_arrow/spr_arrow.yy",},},},"Disabled":false,"id":"9fcbf0d7-aff9-4f58-a7b8-6d3e8488396c","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","path":"sprites/spr_arrow/spr_arrow.yy",},},},"Disabled":false,"id":"02009123-e026-494d-9c2c-e3d3248d6208","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_arrow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_arrow", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9fcbf0d7-aff9-4f58-a7b8-6d3e8488396c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"02009123-e026-494d-9c2c-e3d3248d6208","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 35, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":35, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 70, + "type":0, + "VTile":false, + "width":70, } \ No newline at end of file diff --git a/sprites/spr_arrow_small/spr_arrow_small.yy b/sprites/spr_arrow_small/spr_arrow_small.yy index 3cc437a..40df668 100644 --- a/sprites/spr_arrow_small/spr_arrow_small.yy +++ b/sprites/spr_arrow_small/spr_arrow_small.yy @@ -1,76 +1,94 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_arrow_small", - "bbox_bottom": 6, - "bbox_left": 0, - "bbox_right": 9, - "bbox_top": 1, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e",}, + "$GMSprite":"", + "%Name":"spr_arrow_small", + "bboxMode":0, + "bbox_bottom":6, + "bbox_left":0, + "bbox_right":9, + "bbox_top":1, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 51, - "gridY": 51, - "height": 7, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3210fd01-7382-4aa7-b86e-b2f4f7df87bd","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":51, + "gridY":51, + "height":7, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"3210fd01-7382-4aa7-b86e-b2f4f7df87bd","blendMode":0,"displayName":"default","isLocked":false,"name":"3210fd01-7382-4aa7-b86e-b2f4f7df87bd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 1, - "parent": { - "name": "gui", - "path": "folders/Sprites/gui.yy", + "name":"spr_arrow_small", + "nineSlice":null, + "origin":1, + "parent":{ + "name":"gui", + "path":"folders/Sprites/gui.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_arrow_small", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 2.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},},},"Disabled":false,"id":"66b03764-d23e-4c1d-a2d2-f4be575eacc0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},},},"Disabled":false,"id":"5a961afb-4f00-43e9-a866-e8054f5bea6b","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_arrow_small", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_arrow_small", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"66b03764-d23e-4c1d-a2d2-f4be575eacc0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5a961afb-4f00-43e9-a866-e8054f5bea6b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 5, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":5, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 10, + "type":0, + "VTile":false, + "width":10, } \ No newline at end of file diff --git a/sprites/spr_ball/spr_ball.yy b/sprites/spr_ball/spr_ball.yy index f0ab786..a8f8fb1 100644 --- a/sprites/spr_ball/spr_ball.yy +++ b/sprites/spr_ball/spr_ball.yy @@ -1,74 +1,90 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_ball", - "bbox_bottom": 63, - "bbox_left": 0, - "bbox_right": 63, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"89a15171-096d-4273-b5e1-bed216c67447",}, + "$GMSprite":"", + "%Name":"spr_ball", + "bboxMode":0, + "bbox_bottom":63, + "bbox_left":0, + "bbox_right":63, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"89a15171-096d-4273-b5e1-bed216c67447","name":"89a15171-096d-4273-b5e1-bed216c67447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 64, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a85f0884-bccb-4d64-91e7-91e920726f39","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a85f0884-bccb-4d64-91e7-91e920726f39","blendMode":0,"displayName":"default","isLocked":false,"name":"a85f0884-bccb-4d64-91e7-91e920726f39","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 4, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "name":"spr_ball", + "nineSlice":null, + "origin":4, + "parent":{ + "name":"Sprites", + "path":"folders/Sprites.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_ball", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"89a15171-096d-4273-b5e1-bed216c67447","path":"sprites/spr_ball/spr_ball.yy",},},},"Disabled":false,"id":"08c475be-3a5e-499d-a363-9bc528f6eda7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_ball", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_ball", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a15171-096d-4273-b5e1-bed216c67447","path":"sprites/spr_ball/spr_ball.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"08c475be-3a5e-499d-a363-9bc528f6eda7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 32, - "yorigin": 32, + "visibleRange":null, + "volume":1.0, + "xorigin":32, + "yorigin":32, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 64, + "type":0, + "VTile":false, + "width":64, } \ No newline at end of file diff --git a/sprites/spr_bg/spr_bg.yy b/sprites/spr_bg/spr_bg.yy index 2d24bd1..b452555 100644 --- a/sprites/spr_bg/spr_bg.yy +++ b/sprites/spr_bg/spr_bg.yy @@ -1,75 +1,91 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_bg", - "bbox_bottom": 31, - "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3",}, + "$GMSprite":"", + "%Name":"spr_bg", + "bboxMode":0, + "bbox_bottom":31, + "bbox_left":0, + "bbox_right":31, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 32, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d797d937-1b8b-4f7e-aa6e-b01b3d661531","blendMode":0,"displayName":"Layer 1","isLocked":false,"opacity":80.0,"visible":true,}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bed84a38-1422-4fe6-8871-3c553508ef23","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":32, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"d797d937-1b8b-4f7e-aa6e-b01b3d661531","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"d797d937-1b8b-4f7e-aa6e-b01b3d661531","opacity":80.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"bed84a38-1422-4fe6-8871-3c553508ef23","blendMode":0,"displayName":"default","isLocked":false,"name":"bed84a38-1422-4fe6-8871-3c553508ef23","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "tile", - "path": "folders/Sprites/tile.yy", + "name":"spr_bg", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"tile", + "path":"folders/Sprites/tile.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_bg", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_bg/spr_bg.yy",},},},"Disabled":false,"id":"c6af7e4d-0598-4b4b-b35b-f9024321a62a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_bg", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_bg", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_bg/spr_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c6af7e4d-0598-4b4b-b35b-f9024321a62a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 32, + "type":0, + "VTile":false, + "width":32, } \ No newline at end of file diff --git a/sprites/spr_bg2/spr_bg2.yy b/sprites/spr_bg2/spr_bg2.yy index 1684a0f..cae719f 100644 --- a/sprites/spr_bg2/spr_bg2.yy +++ b/sprites/spr_bg2/spr_bg2.yy @@ -1,75 +1,91 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_bg2", - "bbox_bottom": 31, - "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3",}, + "$GMSprite":"", + "%Name":"spr_bg2", + "bboxMode":0, + "bbox_bottom":31, + "bbox_left":0, + "bbox_right":31, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 32, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d797d937-1b8b-4f7e-aa6e-b01b3d661531","blendMode":0,"displayName":"Layer 1","isLocked":false,"opacity":80.0,"visible":true,}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bed84a38-1422-4fe6-8871-3c553508ef23","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":32, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"d797d937-1b8b-4f7e-aa6e-b01b3d661531","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"d797d937-1b8b-4f7e-aa6e-b01b3d661531","opacity":80.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"bed84a38-1422-4fe6-8871-3c553508ef23","blendMode":0,"displayName":"default","isLocked":false,"name":"bed84a38-1422-4fe6-8871-3c553508ef23","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "BG", - "path": "folders/Sprites/BG.yy", + "name":"spr_bg2", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"BG", + "path":"folders/Sprites/BG.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_bg2", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_bg2/spr_bg2.yy",},},},"Disabled":false,"id":"1fd1cfb1-db8e-4d30-b1e3-46e5757d875c","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_bg2", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_bg2", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_bg2/spr_bg2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1fd1cfb1-db8e-4d30-b1e3-46e5757d875c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 32, + "type":0, + "VTile":false, + "width":32, } \ No newline at end of file diff --git a/sprites/spr_collision/spr_collision.yy b/sprites/spr_collision/spr_collision.yy index cc314b2..53f4128 100644 --- a/sprites/spr_collision/spr_collision.yy +++ b/sprites/spr_collision/spr_collision.yy @@ -1,74 +1,90 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_collision", - "bbox_bottom": 31, - "bbox_left": 0, - "bbox_right": 31, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3",}, + "$GMSprite":"", + "%Name":"spr_collision", + "bboxMode":0, + "bbox_bottom":31, + "bbox_left":0, + "bbox_right":31, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 32, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1424c1da-6011-424b-b805-a58db26d7bcc","blendMode":0,"displayName":"default","isLocked":false,"opacity":50.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":32, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1424c1da-6011-424b-b805-a58db26d7bcc","blendMode":0,"displayName":"default","isLocked":false,"name":"1424c1da-6011-424b-b805-a58db26d7bcc","opacity":50.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "tile", - "path": "folders/Sprites/tile.yy", + "name":"spr_collision", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"tile", + "path":"folders/Sprites/tile.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_collision", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_collision/spr_collision.yy",},},},"Disabled":false,"id":"b812eb00-8d23-447a-9c1b-e024f98aeb23","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_collision", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_collision", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_collision/spr_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b812eb00-8d23-447a-9c1b-e024f98aeb23","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 32, + "type":0, + "VTile":false, + "width":32, } \ No newline at end of file diff --git a/sprites/spr_pengu/spr_pengu.yy b/sprites/spr_pengu/spr_pengu.yy index b4c7b56..69d92d1 100644 --- a/sprites/spr_pengu/spr_pengu.yy +++ b/sprites/spr_pengu/spr_pengu.yy @@ -1,76 +1,94 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_pengu", - "bbox_bottom": 31, - "bbox_left": 6, - "bbox_right": 28, - "bbox_top": 6, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d2c4810f-6b41-442f-948d-d7f65df25f8c",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a2ef49bc-93ae-4ff2-8bb0-6be755f719dd",}, + "$GMSprite":"", + "%Name":"spr_pengu", + "bboxMode":0, + "bbox_bottom":31, + "bbox_left":6, + "bbox_right":28, + "bbox_top":6, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"d2c4810f-6b41-442f-948d-d7f65df25f8c","name":"d2c4810f-6b41-442f-948d-d7f65df25f8c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"a2ef49bc-93ae-4ff2-8bb0-6be755f719dd","name":"a2ef49bc-93ae-4ff2-8bb0-6be755f719dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 32, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ba51ab86-230f-4f17-a833-3a46bbc810c5","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":32, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"ba51ab86-230f-4f17-a833-3a46bbc810c5","blendMode":0,"displayName":"default","isLocked":false,"name":"ba51ab86-230f-4f17-a833-3a46bbc810c5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 7, - "parent": { - "name": "players", - "path": "folders/Sprites/players.yy", + "name":"spr_pengu", + "nineSlice":null, + "origin":7, + "parent":{ + "name":"players", + "path":"folders/Sprites/players.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_pengu", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 2.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 0.05, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d2c4810f-6b41-442f-948d-d7f65df25f8c","path":"sprites/spr_pengu/spr_pengu.yy",},},},"Disabled":false,"id":"9a2727f6-c707-4b39-bba5-f2646b5b68c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a2ef49bc-93ae-4ff2-8bb0-6be755f719dd","path":"sprites/spr_pengu/spr_pengu.yy",},},},"Disabled":false,"id":"7ed66149-6f80-4f79-ace9-a2e809179eee","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_pengu", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_pengu", + "playback":1, + "playbackSpeed":0.05, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2c4810f-6b41-442f-948d-d7f65df25f8c","path":"sprites/spr_pengu/spr_pengu.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9a2727f6-c707-4b39-bba5-f2646b5b68c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2ef49bc-93ae-4ff2-8bb0-6be755f719dd","path":"sprites/spr_pengu/spr_pengu.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ed66149-6f80-4f79-ace9-a2e809179eee","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 16, - "yorigin": 32, + "visibleRange":null, + "volume":1.0, + "xorigin":16, + "yorigin":32, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 32, + "type":0, + "VTile":false, + "width":32, } \ No newline at end of file diff --git a/sprites/spr_pengu2/spr_pengu2.yy b/sprites/spr_pengu2/spr_pengu2.yy index 27fd20d..bd1baa4 100644 --- a/sprites/spr_pengu2/spr_pengu2.yy +++ b/sprites/spr_pengu2/spr_pengu2.yy @@ -1,76 +1,94 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_pengu2", - "bbox_bottom": 31, - "bbox_left": 6, - "bbox_right": 28, - "bbox_top": 6, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d2c4810f-6b41-442f-948d-d7f65df25f8c",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a2ef49bc-93ae-4ff2-8bb0-6be755f719dd",}, + "$GMSprite":"", + "%Name":"spr_pengu2", + "bboxMode":0, + "bbox_bottom":31, + "bbox_left":6, + "bbox_right":28, + "bbox_top":6, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"d2c4810f-6b41-442f-948d-d7f65df25f8c","name":"d2c4810f-6b41-442f-948d-d7f65df25f8c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"a2ef49bc-93ae-4ff2-8bb0-6be755f719dd","name":"a2ef49bc-93ae-4ff2-8bb0-6be755f719dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 32, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ba51ab86-230f-4f17-a833-3a46bbc810c5","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":32, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"ba51ab86-230f-4f17-a833-3a46bbc810c5","blendMode":0,"displayName":"default","isLocked":false,"name":"ba51ab86-230f-4f17-a833-3a46bbc810c5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 7, - "parent": { - "name": "players", - "path": "folders/Sprites/players.yy", + "name":"spr_pengu2", + "nineSlice":null, + "origin":7, + "parent":{ + "name":"players", + "path":"folders/Sprites/players.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_pengu2", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 2.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 0.05, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d2c4810f-6b41-442f-948d-d7f65df25f8c","path":"sprites/spr_pengu2/spr_pengu2.yy",},},},"Disabled":false,"id":"73a5d111-32c8-4638-a0ef-fce2b0bc3ded","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a2ef49bc-93ae-4ff2-8bb0-6be755f719dd","path":"sprites/spr_pengu2/spr_pengu2.yy",},},},"Disabled":false,"id":"3c8a641d-c754-4eae-a3ea-c7322fac6b87","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_pengu2", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_pengu2", + "playback":1, + "playbackSpeed":0.05, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2c4810f-6b41-442f-948d-d7f65df25f8c","path":"sprites/spr_pengu2/spr_pengu2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"73a5d111-32c8-4638-a0ef-fce2b0bc3ded","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2ef49bc-93ae-4ff2-8bb0-6be755f719dd","path":"sprites/spr_pengu2/spr_pengu2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3c8a641d-c754-4eae-a3ea-c7322fac6b87","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 16, - "yorigin": 32, + "visibleRange":null, + "volume":1.0, + "xorigin":16, + "yorigin":32, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 32, + "type":0, + "VTile":false, + "width":32, } \ No newline at end of file diff --git a/sprites/spr_pixel_grid_test/spr_pixel_grid_test.yy b/sprites/spr_pixel_grid_test/spr_pixel_grid_test.yy index a369745..387301c 100644 --- a/sprites/spr_pixel_grid_test/spr_pixel_grid_test.yy +++ b/sprites/spr_pixel_grid_test/spr_pixel_grid_test.yy @@ -1,74 +1,90 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_pixel_grid_test", - "bbox_bottom": 99, - "bbox_left": 0, - "bbox_right": 99, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"0dcd4c8a-a7cd-4375-b887-6995f6cc78c6",}, + "$GMSprite":"", + "%Name":"spr_pixel_grid_test", + "bboxMode":0, + "bbox_bottom":99, + "bbox_left":0, + "bbox_right":99, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"0dcd4c8a-a7cd-4375-b887-6995f6cc78c6","name":"0dcd4c8a-a7cd-4375-b887-6995f6cc78c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 100, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4f866d93-1570-4348-8d31-23d595ce3c6b","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":100, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"4f866d93-1570-4348-8d31-23d595ce3c6b","blendMode":0,"displayName":"default","isLocked":false,"name":"4f866d93-1570-4348-8d31-23d595ce3c6b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "BG", - "path": "folders/Sprites/BG.yy", + "name":"spr_pixel_grid_test", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"BG", + "path":"folders/Sprites/BG.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_pixel_grid_test", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"0dcd4c8a-a7cd-4375-b887-6995f6cc78c6","path":"sprites/spr_pixel_grid_test/spr_pixel_grid_test.yy",},},},"Disabled":false,"id":"4725ecf2-bc49-4977-96dd-117eca696680","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_pixel_grid_test", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_pixel_grid_test", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dcd4c8a-a7cd-4375-b887-6995f6cc78c6","path":"sprites/spr_pixel_grid_test/spr_pixel_grid_test.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4725ecf2-bc49-4977-96dd-117eca696680","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 100, + "type":0, + "VTile":false, + "width":100, } \ No newline at end of file diff --git a/sprites/spr_pixel_side_Underwater/spr_pixel_side_Underwater.yy b/sprites/spr_pixel_side_Underwater/spr_pixel_side_Underwater.yy index 1cdcdf0..b03b734 100644 --- a/sprites/spr_pixel_side_Underwater/spr_pixel_side_Underwater.yy +++ b/sprites/spr_pixel_side_Underwater/spr_pixel_side_Underwater.yy @@ -1,74 +1,90 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_pixel_side_Underwater", - "bbox_bottom": 191, - "bbox_left": 0, - "bbox_right": 255, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"dae6def4-3e97-477c-a99d-ee6e4037420d",}, + "$GMSprite":"", + "%Name":"spr_pixel_side_Underwater", + "bboxMode":0, + "bbox_bottom":191, + "bbox_left":0, + "bbox_right":255, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"dae6def4-3e97-477c-a99d-ee6e4037420d","name":"dae6def4-3e97-477c-a99d-ee6e4037420d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 192, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6387e633-22c3-45c9-a755-caf8be645935","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":192, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"6387e633-22c3-45c9-a755-caf8be645935","blendMode":0,"displayName":"default","isLocked":false,"name":"6387e633-22c3-45c9-a755-caf8be645935","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "tile", - "path": "folders/Sprites/tile.yy", + "name":"spr_pixel_side_Underwater", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"tile", + "path":"folders/Sprites/tile.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_pixel_side_Underwater", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"dae6def4-3e97-477c-a99d-ee6e4037420d","path":"sprites/spr_pixel_side_Underwater/spr_pixel_side_Underwater.yy",},},},"Disabled":false,"id":"9e895299-c397-4f7c-8828-db101507df2a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_pixel_side_Underwater", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_pixel_side_Underwater", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dae6def4-3e97-477c-a99d-ee6e4037420d","path":"sprites/spr_pixel_side_Underwater/spr_pixel_side_Underwater.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9e895299-c397-4f7c-8828-db101507df2a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 256, + "type":0, + "VTile":false, + "width":256, } \ No newline at end of file diff --git a/sprites/spr_player2_idle/spr_player2_idle.yy b/sprites/spr_player2_idle/spr_player2_idle.yy index e432976..b645609 100644 --- a/sprites/spr_player2_idle/spr_player2_idle.yy +++ b/sprites/spr_player2_idle/spr_player2_idle.yy @@ -1,74 +1,90 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_player2_idle", - "bbox_bottom": 10, - "bbox_left": 3, - "bbox_right": 8, - "bbox_top": 1, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09",}, + "$GMSprite":"", + "%Name":"spr_player2_idle", + "bboxMode":0, + "bbox_bottom":10, + "bbox_left":3, + "bbox_right":8, + "bbox_top":1, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 11, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":11, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 7, - "parent": { - "name": "players", - "path": "folders/Sprites/players.yy", + "name":"spr_player2_idle", + "nineSlice":null, + "origin":7, + "parent":{ + "name":"players", + "path":"folders/Sprites/players.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_player2_idle", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 0.2, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player2_idle/spr_player2_idle.yy",},},},"Disabled":false,"id":"f4086892-5bd8-4310-a65a-ca7ad42739c2","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_player2_idle", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_player2_idle", + "playback":1, + "playbackSpeed":0.2, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player2_idle/spr_player2_idle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f4086892-5bd8-4310-a65a-ca7ad42739c2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 6, - "yorigin": 11, + "visibleRange":null, + "volume":1.0, + "xorigin":6, + "yorigin":11, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 12, + "type":0, + "VTile":false, + "width":12, } \ No newline at end of file diff --git a/sprites/spr_player2_moving/spr_player2_moving.yy b/sprites/spr_player2_moving/spr_player2_moving.yy index ed8d56c..8b45254 100644 --- a/sprites/spr_player2_moving/spr_player2_moving.yy +++ b/sprites/spr_player2_moving/spr_player2_moving.yy @@ -1,76 +1,94 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_player2_moving", - "bbox_bottom": 10, - "bbox_left": 1, - "bbox_right": 10, - "bbox_top": 1, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672",}, + "$GMSprite":"", + "%Name":"spr_player2_moving", + "bboxMode":0, + "bbox_bottom":10, + "bbox_left":1, + "bbox_right":10, + "bbox_top":1, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 11, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":11, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 7, - "parent": { - "name": "players", - "path": "folders/Sprites/players.yy", + "name":"spr_player2_moving", + "nineSlice":null, + "origin":7, + "parent":{ + "name":"players", + "path":"folders/Sprites/players.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_player2_moving", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 2.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 0.1, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player2_moving/spr_player2_moving.yy",},},},"Disabled":false,"id":"df5daded-5d7c-47cc-9099-87a5c13bffae","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","path":"sprites/spr_player2_moving/spr_player2_moving.yy",},},},"Disabled":false,"id":"9807de71-eb91-48eb-ae37-abde603ed83a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_player2_moving", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_player2_moving", + "playback":1, + "playbackSpeed":0.1, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player2_moving/spr_player2_moving.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"df5daded-5d7c-47cc-9099-87a5c13bffae","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","path":"sprites/spr_player2_moving/spr_player2_moving.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9807de71-eb91-48eb-ae37-abde603ed83a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 6, - "yorigin": 11, + "visibleRange":null, + "volume":1.0, + "xorigin":6, + "yorigin":11, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 12, + "type":0, + "VTile":false, + "width":12, } \ No newline at end of file diff --git a/sprites/spr_player_idle/spr_player_idle.yy b/sprites/spr_player_idle/spr_player_idle.yy index fe8a3e0..cb2ed18 100644 --- a/sprites/spr_player_idle/spr_player_idle.yy +++ b/sprites/spr_player_idle/spr_player_idle.yy @@ -1,74 +1,90 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_player_idle", - "bbox_bottom": 10, - "bbox_left": 3, - "bbox_right": 8, - "bbox_top": 1, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09",}, + "$GMSprite":"", + "%Name":"spr_player_idle", + "bboxMode":0, + "bbox_bottom":10, + "bbox_left":3, + "bbox_right":8, + "bbox_top":1, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 11, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":11, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 7, - "parent": { - "name": "players", - "path": "folders/Sprites/players.yy", + "name":"spr_player_idle", + "nineSlice":null, + "origin":7, + "parent":{ + "name":"players", + "path":"folders/Sprites/players.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_player_idle", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 0.2, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player_idle/spr_player_idle.yy",},},},"Disabled":false,"id":"a1a3f3b3-0702-4892-adaf-39099977cbc1","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_player_idle", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_player_idle", + "playback":1, + "playbackSpeed":0.2, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player_idle/spr_player_idle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a1a3f3b3-0702-4892-adaf-39099977cbc1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 6, - "yorigin": 11, + "visibleRange":null, + "volume":1.0, + "xorigin":6, + "yorigin":11, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 12, + "type":0, + "VTile":false, + "width":12, } \ No newline at end of file diff --git a/sprites/spr_player_moving/spr_player_moving.yy b/sprites/spr_player_moving/spr_player_moving.yy index 8bd48ed..ee485d2 100644 --- a/sprites/spr_player_moving/spr_player_moving.yy +++ b/sprites/spr_player_moving/spr_player_moving.yy @@ -1,76 +1,94 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_player_moving", - "bbox_bottom": 10, - "bbox_left": 1, - "bbox_right": 10, - "bbox_top": 1, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09",}, - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672",}, + "$GMSprite":"", + "%Name":"spr_player_moving", + "bboxMode":0, + "bbox_bottom":10, + "bbox_left":1, + "bbox_right":10, + "bbox_top":1, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 11, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":11, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 7, - "parent": { - "name": "players", - "path": "folders/Sprites/players.yy", + "name":"spr_player_moving", + "nineSlice":null, + "origin":7, + "parent":{ + "name":"players", + "path":"folders/Sprites/players.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_player_moving", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 2.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 0.1, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player_moving/spr_player_moving.yy",},},},"Disabled":false,"id":"eac30cb0-0d0f-4d52-b911-fcb0e9caf624","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","path":"sprites/spr_player_moving/spr_player_moving.yy",},},},"Disabled":false,"id":"088325c1-7772-4ba3-ac9e-62e51881a76c","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_player_moving", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_player_moving", + "playback":1, + "playbackSpeed":0.1, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player_moving/spr_player_moving.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"eac30cb0-0d0f-4d52-b911-fcb0e9caf624","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","path":"sprites/spr_player_moving/spr_player_moving.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"088325c1-7772-4ba3-ac9e-62e51881a76c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 6, - "yorigin": 11, + "visibleRange":null, + "volume":1.0, + "xorigin":6, + "yorigin":11, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 12, + "type":0, + "VTile":false, + "width":12, } \ No newline at end of file diff --git a/sprites/spr_stanncam_zone/spr_stanncam_zone.yy b/sprites/spr_stanncam_zone/spr_stanncam_zone.yy index 33b37b3..44faa6e 100644 --- a/sprites/spr_stanncam_zone/spr_stanncam_zone.yy +++ b/sprites/spr_stanncam_zone/spr_stanncam_zone.yy @@ -1,97 +1,109 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_stanncam_zone", - "bbox_bottom": 15, - "bbox_left": 0, - "bbox_right": 15, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914",}, + "$GMSprite":"", + "%Name":"spr_stanncam_zone", + "bboxMode":0, + "bbox_bottom":15, + "bbox_left":0, + "bbox_right":15, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 16, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":16, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","blendMode":0,"displayName":"default","isLocked":false,"name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": { - "resourceType": "GMNineSliceData", - "resourceVersion": "1.0", - "bottom": 3, - "enabled": true, - "guideColour": [ - 4294902015, - 4294902015, - 4294902015, - 4294902015, - ], - "highlightColour": 1728023040, - "highlightStyle": 0, - "left": 3, - "right": 3, - "tileMode": [ + "name":"spr_stanncam_zone", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":3, + "enabled":true, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":3, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":3, + "tileMode":[ 0, 0, 0, 0, 0, ], - "top": 3, + "top":3, }, - "origin": 0, - "parent": { - "name": "Sprites", - "path": "folders/STANNcam/Miscellaneous/Sprites.yy", + "origin":0, + "parent":{ + "name":"Sprites", + "path":"folders/STANNcam/Miscellaneous/Sprites.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_stanncam_zone", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","path":"sprites/spr_stanncam_zone/spr_stanncam_zone.yy",},},},"Disabled":false,"id":"5646b359-c75f-4280-b443-339f4019b230","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_stanncam_zone", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_stanncam_zone", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","path":"sprites/spr_stanncam_zone/spr_stanncam_zone.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5646b359-c75f-4280-b443-339f4019b230","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 16, + "type":0, + "VTile":false, + "width":16, } \ No newline at end of file diff --git a/sprites/spr_stanncam_zone_1side/spr_stanncam_zone_1side.yy b/sprites/spr_stanncam_zone_1side/spr_stanncam_zone_1side.yy index 83d99eb..08798e5 100644 --- a/sprites/spr_stanncam_zone_1side/spr_stanncam_zone_1side.yy +++ b/sprites/spr_stanncam_zone_1side/spr_stanncam_zone_1side.yy @@ -1,98 +1,110 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_stanncam_zone_1side", - "bbox_bottom": 15, - "bbox_left": 0, - "bbox_right": 15, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914",}, + "$GMSprite":"", + "%Name":"spr_stanncam_zone_1side", + "bboxMode":0, + "bbox_bottom":15, + "bbox_left":0, + "bbox_right":15, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 16, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"76d49faf-df58-47ca-9f03-02785f5fcb2f","blendMode":0,"displayName":"Layer 1","isLocked":false,"opacity":20.0,"visible":true,}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":16, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"76d49faf-df58-47ca-9f03-02785f5fcb2f","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"76d49faf-df58-47ca-9f03-02785f5fcb2f","opacity":20.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","blendMode":0,"displayName":"default","isLocked":false,"name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": { - "resourceType": "GMNineSliceData", - "resourceVersion": "1.0", - "bottom": 3, - "enabled": true, - "guideColour": [ - 4294902015, - 4294902015, - 4294902015, - 4294902015, - ], - "highlightColour": 1728023040, - "highlightStyle": 0, - "left": 3, - "right": 3, - "tileMode": [ + "name":"spr_stanncam_zone_1side", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":3, + "enabled":true, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":3, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":3, + "tileMode":[ 0, 0, 0, 0, 0, ], - "top": 3, + "top":3, }, - "origin": 0, - "parent": { - "name": "Sprites", - "path": "folders/STANNcam/Miscellaneous/Sprites.yy", + "origin":0, + "parent":{ + "name":"Sprites", + "path":"folders/STANNcam/Miscellaneous/Sprites.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_stanncam_zone_1side", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","path":"sprites/spr_stanncam_zone_1side/spr_stanncam_zone_1side.yy",},},},"Disabled":false,"id":"544d66cf-6085-4f78-91d7-210864c4fbae","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_stanncam_zone_1side", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_stanncam_zone_1side", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","path":"sprites/spr_stanncam_zone_1side/spr_stanncam_zone_1side.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"544d66cf-6085-4f78-91d7-210864c4fbae","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 16, + "type":0, + "VTile":false, + "width":16, } \ No newline at end of file diff --git a/sprites/spr_stanncam_zone_2side/spr_stanncam_zone_2side.yy b/sprites/spr_stanncam_zone_2side/spr_stanncam_zone_2side.yy index 82c7047..d23ab69 100644 --- a/sprites/spr_stanncam_zone_2side/spr_stanncam_zone_2side.yy +++ b/sprites/spr_stanncam_zone_2side/spr_stanncam_zone_2side.yy @@ -1,98 +1,110 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_stanncam_zone_2side", - "bbox_bottom": 15, - "bbox_left": 0, - "bbox_right": 15, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914",}, + "$GMSprite":"", + "%Name":"spr_stanncam_zone_2side", + "bboxMode":0, + "bbox_bottom":15, + "bbox_left":0, + "bbox_right":15, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 16, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"132f2d99-70f5-4cbb-b3aa-b40016946f9f","blendMode":0,"displayName":"Layer 1","isLocked":false,"opacity":20.0,"visible":true,}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":16, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"132f2d99-70f5-4cbb-b3aa-b40016946f9f","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"132f2d99-70f5-4cbb-b3aa-b40016946f9f","opacity":20.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","blendMode":0,"displayName":"default","isLocked":false,"name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": { - "resourceType": "GMNineSliceData", - "resourceVersion": "1.0", - "bottom": 3, - "enabled": true, - "guideColour": [ - 4294902015, - 4294902015, - 4294902015, - 4294902015, - ], - "highlightColour": 1728023040, - "highlightStyle": 0, - "left": 3, - "right": 3, - "tileMode": [ + "name":"spr_stanncam_zone_2side", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":3, + "enabled":true, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":3, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":3, + "tileMode":[ 0, 0, 0, 0, 0, ], - "top": 3, + "top":3, }, - "origin": 0, - "parent": { - "name": "Sprites", - "path": "folders/STANNcam/Miscellaneous/Sprites.yy", + "origin":0, + "parent":{ + "name":"Sprites", + "path":"folders/STANNcam/Miscellaneous/Sprites.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_stanncam_zone_2side", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","path":"sprites/spr_stanncam_zone_2side/spr_stanncam_zone_2side.yy",},},},"Disabled":false,"id":"f1737391-6fa0-4fcd-b422-2f4740b1ebb8","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_stanncam_zone_2side", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_stanncam_zone_2side", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","path":"sprites/spr_stanncam_zone_2side/spr_stanncam_zone_2side.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f1737391-6fa0-4fcd-b422-2f4740b1ebb8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 16, + "type":0, + "VTile":false, + "width":16, } \ No newline at end of file diff --git a/sprites/spr_stanncam_zone_corner/spr_stanncam_zone_corner.yy b/sprites/spr_stanncam_zone_corner/spr_stanncam_zone_corner.yy index 1c1d2a3..f4eaeb5 100644 --- a/sprites/spr_stanncam_zone_corner/spr_stanncam_zone_corner.yy +++ b/sprites/spr_stanncam_zone_corner/spr_stanncam_zone_corner.yy @@ -1,98 +1,110 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_stanncam_zone_corner", - "bbox_bottom": 15, - "bbox_left": 0, - "bbox_right": 15, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914",}, + "$GMSprite":"", + "%Name":"spr_stanncam_zone_corner", + "bboxMode":0, + "bbox_bottom":15, + "bbox_left":0, + "bbox_right":15, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 16, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"76d49faf-df58-47ca-9f03-02785f5fcb2f","blendMode":0,"displayName":"Layer 1","isLocked":false,"opacity":20.0,"visible":true,}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":16, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"76d49faf-df58-47ca-9f03-02785f5fcb2f","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"76d49faf-df58-47ca-9f03-02785f5fcb2f","opacity":20.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","blendMode":0,"displayName":"default","isLocked":false,"name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": { - "resourceType": "GMNineSliceData", - "resourceVersion": "1.0", - "bottom": 3, - "enabled": true, - "guideColour": [ - 4294902015, - 4294902015, - 4294902015, - 4294902015, - ], - "highlightColour": 1728023040, - "highlightStyle": 0, - "left": 3, - "right": 3, - "tileMode": [ + "name":"spr_stanncam_zone_corner", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":3, + "enabled":true, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":3, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":3, + "tileMode":[ 0, 0, 0, 0, 0, ], - "top": 3, + "top":3, }, - "origin": 0, - "parent": { - "name": "Sprites", - "path": "folders/STANNcam/Miscellaneous/Sprites.yy", + "origin":0, + "parent":{ + "name":"Sprites", + "path":"folders/STANNcam/Miscellaneous/Sprites.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_stanncam_zone_corner", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","path":"sprites/spr_stanncam_zone_corner/spr_stanncam_zone_corner.yy",},},},"Disabled":false,"id":"2236c912-b723-450d-adb6-70d49e453327","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_stanncam_zone_corner", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_stanncam_zone_corner", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","path":"sprites/spr_stanncam_zone_corner/spr_stanncam_zone_corner.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2236c912-b723-450d-adb6-70d49e453327","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 16, + "type":0, + "VTile":false, + "width":16, } \ No newline at end of file diff --git a/sprites/spr_stanncam_zone_u/spr_stanncam_zone_u.yy b/sprites/spr_stanncam_zone_u/spr_stanncam_zone_u.yy index e3fdb9b..b468392 100644 --- a/sprites/spr_stanncam_zone_u/spr_stanncam_zone_u.yy +++ b/sprites/spr_stanncam_zone_u/spr_stanncam_zone_u.yy @@ -1,98 +1,110 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_stanncam_zone_u", - "bbox_bottom": 15, - "bbox_left": 0, - "bbox_right": 15, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914",}, + "$GMSprite":"", + "%Name":"spr_stanncam_zone_u", + "bboxMode":0, + "bbox_bottom":15, + "bbox_left":0, + "bbox_right":15, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 16, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"76d49faf-df58-47ca-9f03-02785f5fcb2f","blendMode":0,"displayName":"Layer 1","isLocked":false,"opacity":20.0,"visible":true,}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":16, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"76d49faf-df58-47ca-9f03-02785f5fcb2f","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"76d49faf-df58-47ca-9f03-02785f5fcb2f","opacity":20.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","blendMode":0,"displayName":"default","isLocked":false,"name":"f6884eec-9d9a-4a19-b539-64ffb7c6c359","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": { - "resourceType": "GMNineSliceData", - "resourceVersion": "1.0", - "bottom": 3, - "enabled": true, - "guideColour": [ - 4294902015, - 4294902015, - 4294902015, - 4294902015, - ], - "highlightColour": 1728023040, - "highlightStyle": 0, - "left": 3, - "right": 3, - "tileMode": [ + "name":"spr_stanncam_zone_u", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":3, + "enabled":true, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":3, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":3, + "tileMode":[ 0, 0, 0, 0, 0, ], - "top": 3, + "top":3, }, - "origin": 0, - "parent": { - "name": "Sprites", - "path": "folders/STANNcam/Miscellaneous/Sprites.yy", + "origin":0, + "parent":{ + "name":"Sprites", + "path":"folders/STANNcam/Miscellaneous/Sprites.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_stanncam_zone_u", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","path":"sprites/spr_stanncam_zone_u/spr_stanncam_zone_u.yy",},},},"Disabled":false,"id":"827bdbf5-c4c4-423b-a915-1462a3544cfe","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_stanncam_zone_u", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_stanncam_zone_u", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0c5359e-863a-4eb0-a39c-8d0c9ea08914","path":"sprites/spr_stanncam_zone_u/spr_stanncam_zone_u.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"827bdbf5-c4c4-423b-a915-1462a3544cfe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 16, + "type":0, + "VTile":false, + "width":16, } \ No newline at end of file diff --git a/sprites/spr_tile_bg/spr_tile_bg.yy b/sprites/spr_tile_bg/spr_tile_bg.yy index 7393cbf..8b7f106 100644 --- a/sprites/spr_tile_bg/spr_tile_bg.yy +++ b/sprites/spr_tile_bg/spr_tile_bg.yy @@ -1,74 +1,90 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_tile_bg", - "bbox_bottom": 31, - "bbox_left": 32, - "bbox_right": 63, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3",}, + "$GMSprite":"", + "%Name":"spr_tile_bg", + "bboxMode":0, + "bbox_bottom":31, + "bbox_left":32, + "bbox_right":63, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 32, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bed84a38-1422-4fe6-8871-3c553508ef23","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":32, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"bed84a38-1422-4fe6-8871-3c553508ef23","blendMode":0,"displayName":"default","isLocked":false,"name":"bed84a38-1422-4fe6-8871-3c553508ef23","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "tile", - "path": "folders/Sprites/tile.yy", + "name":"spr_tile_bg", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"tile", + "path":"folders/Sprites/tile.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_tile_bg", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_tile_bg/spr_tile_bg.yy",},},},"Disabled":false,"id":"309dd744-34d6-46cb-b4bd-9c86c59311e5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_tile_bg", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tile_bg", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_tile_bg/spr_tile_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"309dd744-34d6-46cb-b4bd-9c86c59311e5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 64, + "type":0, + "VTile":false, + "width":64, } \ No newline at end of file diff --git a/sprites/spr_tv/spr_tv.yy b/sprites/spr_tv/spr_tv.yy index 6d21bee..68274f8 100644 --- a/sprites/spr_tv/spr_tv.yy +++ b/sprites/spr_tv/spr_tv.yy @@ -1,74 +1,90 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_tv", - "bbox_bottom": 63, - "bbox_left": 0, - "bbox_right": 63, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ca68646b-1689-4d76-b7ab-b0c225cc8d31",}, + "$GMSprite":"", + "%Name":"spr_tv", + "bboxMode":0, + "bbox_bottom":63, + "bbox_left":0, + "bbox_right":63, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"ca68646b-1689-4d76-b7ab-b0c225cc8d31","name":"ca68646b-1689-4d76-b7ab-b0c225cc8d31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 64, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9bc939da-2fec-4e13-aa9c-105eb44921f3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"9bc939da-2fec-4e13-aa9c-105eb44921f3","blendMode":0,"displayName":"default","isLocked":false,"name":"9bc939da-2fec-4e13-aa9c-105eb44921f3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "name":"spr_tv", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"Sprites", + "path":"folders/Sprites.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_tv", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 1.0, - "playbackSpeedType": 1, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ca68646b-1689-4d76-b7ab-b0c225cc8d31","path":"sprites/spr_tv/spr_tv.yy",},},},"Disabled":false,"id":"d337b439-7ffc-4d02-973f-5a39b2dc1705","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_tv", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tv", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca68646b-1689-4d76-b7ab-b0c225cc8d31","path":"sprites/spr_tv/spr_tv.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d337b439-7ffc-4d02-973f-5a39b2dc1705","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 64, + "type":0, + "VTile":false, + "width":64, } \ No newline at end of file diff --git a/sprites/spr_underwater/spr_underwater.yy b/sprites/spr_underwater/spr_underwater.yy index 3150bd8..0babaa5 100644 --- a/sprites/spr_underwater/spr_underwater.yy +++ b/sprites/spr_underwater/spr_underwater.yy @@ -1,74 +1,90 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_underwater", - "bbox_bottom": 1079, - "bbox_left": 0, - "bbox_right": 1919, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"39fd8e7b-11b6-44f2-a59e-3ad4c70ede07",}, + "$GMSprite":"", + "%Name":"spr_underwater", + "bboxMode":0, + "bbox_bottom":1079, + "bbox_left":0, + "bbox_right":1919, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"39fd8e7b-11b6-44f2-a59e-3ad4c70ede07","name":"39fd8e7b-11b6-44f2-a59e-3ad4c70ede07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 1080, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"2ec2b468-5ef8-40ea-9006-501db8b069af","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":1080, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"2ec2b468-5ef8-40ea-9006-501db8b069af","blendMode":0,"displayName":"default","isLocked":false,"name":"2ec2b468-5ef8-40ea-9006-501db8b069af","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": null, - "origin": 0, - "parent": { - "name": "BG", - "path": "folders/Sprites/BG.yy", + "name":"spr_underwater", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"BG", + "path":"folders/Sprites/BG.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_underwater", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"39fd8e7b-11b6-44f2-a59e-3ad4c70ede07","path":"sprites/spr_underwater/spr_underwater.yy",},},},"Disabled":false,"id":"2757aea5-6d65-4d6c-8894-b1b5527463b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_underwater", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_underwater", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39fd8e7b-11b6-44f2-a59e-3ad4c70ede07","path":"sprites/spr_underwater/spr_underwater.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2757aea5-6d65-4d6c-8894-b1b5527463b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 1920, + "type":0, + "VTile":false, + "width":1920, } \ No newline at end of file diff --git a/sprites/spr_underwater_layer00/spr_underwater_layer00.yy b/sprites/spr_underwater_layer00/spr_underwater_layer00.yy index 6c3012e..9cdecb1 100644 --- a/sprites/spr_underwater_layer00/spr_underwater_layer00.yy +++ b/sprites/spr_underwater_layer00/spr_underwater_layer00.yy @@ -1,97 +1,109 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_underwater_layer00", - "bbox_bottom": 269, - "bbox_left": 0, - "bbox_right": 479, - "bbox_top": 0, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d4e3f691-4316-4ce9-9a6d-ddc9d577c075",}, + "$GMSprite":"", + "%Name":"spr_underwater_layer00", + "bboxMode":0, + "bbox_bottom":269, + "bbox_left":0, + "bbox_right":479, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"d4e3f691-4316-4ce9-9a6d-ddc9d577c075","name":"d4e3f691-4316-4ce9-9a6d-ddc9d577c075","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 270, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"ca428743-36ed-4f30-a586-e0ce80685662","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":270, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"ca428743-36ed-4f30-a586-e0ce80685662","blendMode":0,"displayName":"default","isLocked":false,"name":"ca428743-36ed-4f30-a586-e0ce80685662","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": { - "resourceType": "GMNineSliceData", - "resourceVersion": "1.0", - "bottom": 0, - "enabled": false, - "guideColour": [ - 4294902015, - 4294902015, - 4294902015, - 4294902015, - ], - "highlightColour": 1728023040, - "highlightStyle": 0, - "left": 0, - "right": 0, - "tileMode": [ + "name":"spr_underwater_layer00", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ 0, 0, 0, 0, 1, ], - "top": 0, + "top":0, }, - "origin": 0, - "parent": { - "name": "Layers", - "path": "folders/Sprites/BG/Layers.yy", + "origin":0, + "parent":{ + "name":"Layers", + "path":"folders/Sprites/BG/Layers.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_underwater_layer00", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d4e3f691-4316-4ce9-9a6d-ddc9d577c075","path":"sprites/spr_underwater_layer00/spr_underwater_layer00.yy",},},},"Disabled":false,"id":"80c73f58-1fa7-4b93-b802-ccac1b7e9d5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_underwater_layer00", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_underwater_layer00", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4e3f691-4316-4ce9-9a6d-ddc9d577c075","path":"sprites/spr_underwater_layer00/spr_underwater_layer00.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"80c73f58-1fa7-4b93-b802-ccac1b7e9d5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 480, + "type":0, + "VTile":false, + "width":480, } \ No newline at end of file diff --git a/sprites/spr_underwater_layer01/spr_underwater_layer01.yy b/sprites/spr_underwater_layer01/spr_underwater_layer01.yy index 8f8edd0..4d763e6 100644 --- a/sprites/spr_underwater_layer01/spr_underwater_layer01.yy +++ b/sprites/spr_underwater_layer01/spr_underwater_layer01.yy @@ -1,97 +1,109 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_underwater_layer01", - "bbox_bottom": 269, - "bbox_left": 0, - "bbox_right": 479, - "bbox_top": 22, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4b447b47-ddae-4ba9-8ffb-eaf4b1557c6f",}, + "$GMSprite":"", + "%Name":"spr_underwater_layer01", + "bboxMode":0, + "bbox_bottom":269, + "bbox_left":0, + "bbox_right":479, + "bbox_top":22, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"4b447b47-ddae-4ba9-8ffb-eaf4b1557c6f","name":"4b447b47-ddae-4ba9-8ffb-eaf4b1557c6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 270, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c16629aa-b897-4fc8-a7a4-528254e93169","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":270, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c16629aa-b897-4fc8-a7a4-528254e93169","blendMode":0,"displayName":"default","isLocked":false,"name":"c16629aa-b897-4fc8-a7a4-528254e93169","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": { - "resourceType": "GMNineSliceData", - "resourceVersion": "1.0", - "bottom": 0, - "enabled": false, - "guideColour": [ - 4294902015, - 4294902015, - 4294902015, - 4294902015, - ], - "highlightColour": 1728023040, - "highlightStyle": 0, - "left": 0, - "right": 0, - "tileMode": [ + "name":"spr_underwater_layer01", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ 0, 0, 0, 0, 1, ], - "top": 0, + "top":0, }, - "origin": 0, - "parent": { - "name": "Layers", - "path": "folders/Sprites/BG/Layers.yy", + "origin":0, + "parent":{ + "name":"Layers", + "path":"folders/Sprites/BG/Layers.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_underwater_layer01", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4b447b47-ddae-4ba9-8ffb-eaf4b1557c6f","path":"sprites/spr_underwater_layer01/spr_underwater_layer01.yy",},},},"Disabled":false,"id":"0de0f00a-ef83-47e1-aa82-df5efdbcf2c2","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_underwater_layer01", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_underwater_layer01", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b447b47-ddae-4ba9-8ffb-eaf4b1557c6f","path":"sprites/spr_underwater_layer01/spr_underwater_layer01.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0de0f00a-ef83-47e1-aa82-df5efdbcf2c2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 480, + "type":0, + "VTile":false, + "width":480, } \ No newline at end of file diff --git a/sprites/spr_underwater_layer02/spr_underwater_layer02.yy b/sprites/spr_underwater_layer02/spr_underwater_layer02.yy index 5ac9831..85a483f 100644 --- a/sprites/spr_underwater_layer02/spr_underwater_layer02.yy +++ b/sprites/spr_underwater_layer02/spr_underwater_layer02.yy @@ -1,97 +1,109 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_underwater_layer02", - "bbox_bottom": 117, - "bbox_left": 20, - "bbox_right": 465, - "bbox_top": 48, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4bcdea5c-3c14-4829-95a4-2e776dac0116",}, + "$GMSprite":"", + "%Name":"spr_underwater_layer02", + "bboxMode":0, + "bbox_bottom":117, + "bbox_left":20, + "bbox_right":465, + "bbox_top":48, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"4bcdea5c-3c14-4829-95a4-2e776dac0116","name":"4bcdea5c-3c14-4829-95a4-2e776dac0116","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 270, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3a4ac70a-7236-44a1-85bf-da8e5a8c645c","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":270, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"3a4ac70a-7236-44a1-85bf-da8e5a8c645c","blendMode":0,"displayName":"default","isLocked":false,"name":"3a4ac70a-7236-44a1-85bf-da8e5a8c645c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": { - "resourceType": "GMNineSliceData", - "resourceVersion": "1.0", - "bottom": 0, - "enabled": false, - "guideColour": [ - 4294902015, - 4294902015, - 4294902015, - 4294902015, - ], - "highlightColour": 1728023040, - "highlightStyle": 0, - "left": 0, - "right": 0, - "tileMode": [ + "name":"spr_underwater_layer02", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ 0, 0, 0, 0, 1, ], - "top": 0, + "top":0, }, - "origin": 0, - "parent": { - "name": "Layers", - "path": "folders/Sprites/BG/Layers.yy", + "origin":0, + "parent":{ + "name":"Layers", + "path":"folders/Sprites/BG/Layers.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_underwater_layer02", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4bcdea5c-3c14-4829-95a4-2e776dac0116","path":"sprites/spr_underwater_layer02/spr_underwater_layer02.yy",},},},"Disabled":false,"id":"84f4358c-ee75-4894-9d0a-aa7ac842e1da","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_underwater_layer02", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_underwater_layer02", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bcdea5c-3c14-4829-95a4-2e776dac0116","path":"sprites/spr_underwater_layer02/spr_underwater_layer02.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"84f4358c-ee75-4894-9d0a-aa7ac842e1da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 480, + "type":0, + "VTile":false, + "width":480, } \ No newline at end of file diff --git a/sprites/spr_underwater_layer03/spr_underwater_layer03.yy b/sprites/spr_underwater_layer03/spr_underwater_layer03.yy index 891347b..bba94be 100644 --- a/sprites/spr_underwater_layer03/spr_underwater_layer03.yy +++ b/sprites/spr_underwater_layer03/spr_underwater_layer03.yy @@ -1,97 +1,109 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_underwater_layer03", - "bbox_bottom": 269, - "bbox_left": 0, - "bbox_right": 479, - "bbox_top": 84, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d5e06d27-9b8f-4fc6-b978-629fd04f0a32",}, + "$GMSprite":"", + "%Name":"spr_underwater_layer03", + "bboxMode":0, + "bbox_bottom":269, + "bbox_left":0, + "bbox_right":479, + "bbox_top":84, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"d5e06d27-9b8f-4fc6-b978-629fd04f0a32","name":"d5e06d27-9b8f-4fc6-b978-629fd04f0a32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 270, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"b2b66523-fdbc-4201-8bdf-7e1f64151767","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":270, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b2b66523-fdbc-4201-8bdf-7e1f64151767","blendMode":0,"displayName":"default","isLocked":false,"name":"b2b66523-fdbc-4201-8bdf-7e1f64151767","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": { - "resourceType": "GMNineSliceData", - "resourceVersion": "1.0", - "bottom": 0, - "enabled": false, - "guideColour": [ - 4294902015, - 4294902015, - 4294902015, - 4294902015, - ], - "highlightColour": 1728023040, - "highlightStyle": 0, - "left": 0, - "right": 0, - "tileMode": [ + "name":"spr_underwater_layer03", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ 0, 0, 0, 0, 1, ], - "top": 0, + "top":0, }, - "origin": 0, - "parent": { - "name": "Layers", - "path": "folders/Sprites/BG/Layers.yy", + "origin":0, + "parent":{ + "name":"Layers", + "path":"folders/Sprites/BG/Layers.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_underwater_layer03", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d5e06d27-9b8f-4fc6-b978-629fd04f0a32","path":"sprites/spr_underwater_layer03/spr_underwater_layer03.yy",},},},"Disabled":false,"id":"d735136d-c3e3-46cf-879c-8c198de3863f","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_underwater_layer03", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_underwater_layer03", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5e06d27-9b8f-4fc6-b978-629fd04f0a32","path":"sprites/spr_underwater_layer03/spr_underwater_layer03.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d735136d-c3e3-46cf-879c-8c198de3863f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 480, + "type":0, + "VTile":false, + "width":480, } \ No newline at end of file diff --git a/sprites/spr_underwater_layer04/spr_underwater_layer04.yy b/sprites/spr_underwater_layer04/spr_underwater_layer04.yy index 745a68c..85de1b3 100644 --- a/sprites/spr_underwater_layer04/spr_underwater_layer04.yy +++ b/sprites/spr_underwater_layer04/spr_underwater_layer04.yy @@ -1,97 +1,109 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_underwater_layer04", - "bbox_bottom": 269, - "bbox_left": 0, - "bbox_right": 479, - "bbox_top": 105, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e75f2776-0535-42b1-9db1-ec75b507bb7a",}, + "$GMSprite":"", + "%Name":"spr_underwater_layer04", + "bboxMode":0, + "bbox_bottom":269, + "bbox_left":0, + "bbox_right":479, + "bbox_top":105, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"e75f2776-0535-42b1-9db1-ec75b507bb7a","name":"e75f2776-0535-42b1-9db1-ec75b507bb7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 270, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1b096359-df3e-414e-826a-43e1b91e6eae","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":270, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1b096359-df3e-414e-826a-43e1b91e6eae","blendMode":0,"displayName":"default","isLocked":false,"name":"1b096359-df3e-414e-826a-43e1b91e6eae","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": { - "resourceType": "GMNineSliceData", - "resourceVersion": "1.0", - "bottom": 0, - "enabled": false, - "guideColour": [ - 4294902015, - 4294902015, - 4294902015, - 4294902015, - ], - "highlightColour": 1728023040, - "highlightStyle": 0, - "left": 0, - "right": 0, - "tileMode": [ + "name":"spr_underwater_layer04", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ 0, 0, 0, 0, 1, ], - "top": 0, + "top":0, }, - "origin": 0, - "parent": { - "name": "Layers", - "path": "folders/Sprites/BG/Layers.yy", + "origin":0, + "parent":{ + "name":"Layers", + "path":"folders/Sprites/BG/Layers.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_underwater_layer04", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e75f2776-0535-42b1-9db1-ec75b507bb7a","path":"sprites/spr_underwater_layer04/spr_underwater_layer04.yy",},},},"Disabled":false,"id":"e495b2b3-173c-4677-9409-2680870fcd51","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_underwater_layer04", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_underwater_layer04", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e75f2776-0535-42b1-9db1-ec75b507bb7a","path":"sprites/spr_underwater_layer04/spr_underwater_layer04.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e495b2b3-173c-4677-9409-2680870fcd51","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 480, + "type":0, + "VTile":false, + "width":480, } \ No newline at end of file diff --git a/sprites/spr_underwater_layer05/spr_underwater_layer05.yy b/sprites/spr_underwater_layer05/spr_underwater_layer05.yy index ad3653f..d71f402 100644 --- a/sprites/spr_underwater_layer05/spr_underwater_layer05.yy +++ b/sprites/spr_underwater_layer05/spr_underwater_layer05.yy @@ -1,97 +1,109 @@ { - "resourceType": "GMSprite", - "resourceVersion": "1.0", - "name": "spr_underwater_layer05", - "bbox_bottom": 269, - "bbox_left": 0, - "bbox_right": 479, - "bbox_top": 108, - "bboxMode": 0, - "collisionKind": 1, - "collisionTolerance": 0, - "DynamicTexturePage": false, - "edgeFiltering": false, - "For3D": false, - "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b737a9c8-8f1e-4c64-ae64-398dec4c5f7e",}, + "$GMSprite":"", + "%Name":"spr_underwater_layer05", + "bboxMode":0, + "bbox_bottom":269, + "bbox_left":0, + "bbox_right":479, + "bbox_top":108, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"b737a9c8-8f1e-4c64-ae64-398dec4c5f7e","name":"b737a9c8-8f1e-4c64-ae64-398dec4c5f7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], - "gridX": 0, - "gridY": 0, - "height": 270, - "HTile": false, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"40bfaf72-0526-41f2-8f80-97caf05c5274","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + "gridX":0, + "gridY":0, + "height":270, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"40bfaf72-0526-41f2-8f80-97caf05c5274","blendMode":0,"displayName":"default","isLocked":false,"name":"40bfaf72-0526-41f2-8f80-97caf05c5274","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "nineSlice": { - "resourceType": "GMNineSliceData", - "resourceVersion": "1.0", - "bottom": 0, - "enabled": false, - "guideColour": [ - 4294902015, - 4294902015, - 4294902015, - 4294902015, - ], - "highlightColour": 1728023040, - "highlightStyle": 0, - "left": 0, - "right": 0, - "tileMode": [ + "name":"spr_underwater_layer05", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ 0, 0, 0, 0, 1, ], - "top": 0, + "top":0, }, - "origin": 0, - "parent": { - "name": "Layers", - "path": "folders/Sprites/BG/Layers.yy", + "origin":0, + "parent":{ + "name":"Layers", + "path":"folders/Sprites/BG/Layers.yy", }, - "preMultiplyAlpha": false, - "sequence": { - "resourceType": "GMSequence", - "resourceVersion": "1.4", - "name": "spr_underwater_layer05", - "autoRecord": true, - "backdropHeight": 768, - "backdropImageOpacity": 0.5, - "backdropImagePath": "", - "backdropWidth": 1366, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "eventStubScript": null, - "eventToFunction": {}, - "length": 1.0, - "lockOrigin": false, - "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "showBackdrop": true, - "showBackdropImage": false, - "timeUnits": 1, - "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b737a9c8-8f1e-4c64-ae64-398dec4c5f7e","path":"sprites/spr_underwater_layer05/spr_underwater_layer05.yy",},},},"Disabled":false,"id":"06a15665-e101-405e-bb42-cde890d716f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"spr_underwater_layer05", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_underwater_layer05", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b737a9c8-8f1e-4c64-ae64-398dec4c5f7e","path":"sprites/spr_underwater_layer05/spr_underwater_layer05.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"06a15665-e101-405e-bb42-cde890d716f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange": null, - "volume": 1.0, - "xorigin": 0, - "yorigin": 0, + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, }, - "swatchColours": null, - "swfPrecision": 2.525, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "type": 0, - "VTile": false, - "width": 480, + "type":0, + "VTile":false, + "width":480, } \ No newline at end of file diff --git a/stanncam.resource_order b/stanncam.resource_order index 5011b08..201b774 100644 --- a/stanncam.resource_order +++ b/stanncam.resource_order @@ -1,9 +1,9 @@ { - "FolderOrderSettings": [ + "FolderOrderSettings":[ {"name":"Sprites","order":3,"path":"folders/STANNcam/Miscellaneous/Sprites.yy",}, {"name":"Zones","order":5,"path":"folders/STANNcam/Zones.yy",}, ], - "ResourceOrderSettings": [ + "ResourceOrderSettings":[ {"name":"obj_stanncam_zone_corner","order":3,"path":"objects/obj_stanncam_zone_corner/obj_stanncam_zone_corner.yy",}, {"name":"spr_stanncam_zone_2side","order":2,"path":"sprites/spr_stanncam_zone_2side/spr_stanncam_zone_2side.yy",}, {"name":"spr_stanncam_zone_corner","order":3,"path":"sprites/spr_stanncam_zone_corner/spr_stanncam_zone_corner.yy",}, diff --git a/stanncam.yyp b/stanncam.yyp index 9b76f5a..945820f 100644 --- a/stanncam.yyp +++ b/stanncam.yyp @@ -1,42 +1,42 @@ { - "resourceType": "GMProject", - "resourceVersion": "1.7", - "name": "stanncam", - "AudioGroups": [ - {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,}, + "$GMProject":"", + "%Name":"stanncam", + "AudioGroups":[ + {"$GMAudioGroup":"","%Name":"audiogroup_default","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,}, ], - "configs": { - "children": [], - "name": "Default", + "configs":{ + "children":[], + "name":"Default", }, - "defaultScriptType": 1, - "Folders": [ - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Fonts","folderPath":"folders/Fonts.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Objects","folderPath":"folders/Objects.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"sidescroller","folderPath":"folders/Objects/sidescroller.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"topdown","folderPath":"folders/Objects/topdown.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Rooms","folderPath":"folders/Rooms.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Scripts","folderPath":"folders/Scripts.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Sprites","folderPath":"folders/Sprites.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"BG","folderPath":"folders/Sprites/BG.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Layers","folderPath":"folders/Sprites/BG/Layers.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"gui","folderPath":"folders/Sprites/gui.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"players","folderPath":"folders/Sprites/players.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"tile","folderPath":"folders/Sprites/tile.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"STANNcam","folderPath":"folders/STANNcam.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Miscellaneous","folderPath":"folders/STANNcam/Miscellaneous.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Animation Curves - Add more as needed","folderPath":"folders/STANNcam/Miscellaneous/Animation Curves - Add more as needed.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Sprites","folderPath":"folders/STANNcam/Miscellaneous/Sprites.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Zones","folderPath":"folders/STANNcam/Zones.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Tile Sets","folderPath":"folders/Tile Sets.yy",}, + "defaultScriptType":1, + "Folders":[ + {"$GMFolder":"","%Name":"Fonts","folderPath":"folders/Fonts.yy","name":"Fonts","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Objects","folderPath":"folders/Objects.yy","name":"Objects","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"sidescroller","folderPath":"folders/Objects/sidescroller.yy","name":"sidescroller","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"topdown","folderPath":"folders/Objects/topdown.yy","name":"topdown","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Rooms","folderPath":"folders/Rooms.yy","name":"Rooms","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Scripts","folderPath":"folders/Scripts.yy","name":"Scripts","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Sprites","folderPath":"folders/Sprites.yy","name":"Sprites","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"BG","folderPath":"folders/Sprites/BG.yy","name":"BG","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Layers","folderPath":"folders/Sprites/BG/Layers.yy","name":"Layers","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"gui","folderPath":"folders/Sprites/gui.yy","name":"gui","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"players","folderPath":"folders/Sprites/players.yy","name":"players","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"tile","folderPath":"folders/Sprites/tile.yy","name":"tile","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"STANNcam","folderPath":"folders/STANNcam.yy","name":"STANNcam","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Miscellaneous","folderPath":"folders/STANNcam/Miscellaneous.yy","name":"Miscellaneous","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Animation Curves - Add more as needed","folderPath":"folders/STANNcam/Miscellaneous/Animation Curves - Add more as needed.yy","name":"Animation Curves - Add more as needed","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Sprites","folderPath":"folders/STANNcam/Miscellaneous/Sprites.yy","name":"Sprites","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Zones","folderPath":"folders/STANNcam/Zones.yy","name":"Zones","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Tile Sets","folderPath":"folders/Tile Sets.yy","name":"Tile Sets","resourceType":"GMFolder","resourceVersion":"2.0",}, ], - "IncludedFiles": [], - "isEcma": false, - "LibraryEmitters": [], - "MetaData": { - "IDEVersion": "2023.11.0.121", + "IncludedFiles":[], + "isEcma":false, + "LibraryEmitters":[], + "MetaData":{ + "IDEVersion":"2024.2.0.132", }, - "resources": [ + "name":"stanncam", + "resources":[ {"id":{"name":"macros","path":"scripts/macros/macros.yy",},}, {"id":{"name":"spr_underwater","path":"sprites/spr_underwater/spr_underwater.yy",},}, {"id":{"name":"obj_stanncam_zone_corner","path":"objects/obj_stanncam_zone_corner/obj_stanncam_zone_corner.yy",},}, @@ -103,14 +103,16 @@ {"id":{"name":"obj_stanncam_zone_1side","path":"objects/obj_stanncam_zone_1side/obj_stanncam_zone_1side.yy",},}, {"id":{"name":"f_hires","path":"fonts/f_hires/f_hires.yy",},}, ], - "RoomOrderNodes": [ + "resourceType":"GMProject", + "resourceVersion":"2.0", + "RoomOrderNodes":[ {"roomId":{"name":"rm_init","path":"rooms/rm_init/rm_init.yy",},}, + {"roomId":{"name":"rm_pixel_grid","path":"rooms/rm_pixel_grid/rm_pixel_grid.yy",},}, {"roomId":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},}, {"roomId":{"name":"rm_sidescroller","path":"rooms/rm_sidescroller/rm_sidescroller.yy",},}, - {"roomId":{"name":"rm_pixel_grid","path":"rooms/rm_pixel_grid/rm_pixel_grid.yy",},}, ], - "templateType": null, - "TextureGroups": [ - {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":0,"targets":-1,}, + "templateType":null, + "TextureGroups":[ + {"$GMTextureGroup":"","%Name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":0,"name":"Default","resourceType":"GMTextureGroup","resourceVersion":"2.0","targets":-1,}, ], } \ No newline at end of file diff --git a/tilesets/TileSet1/TileSet1.yy b/tilesets/TileSet1/TileSet1.yy index 77d6c95..b54f7fe 100644 --- a/tilesets/TileSet1/TileSet1.yy +++ b/tilesets/TileSet1/TileSet1.yy @@ -1,43 +1,42 @@ { - "resourceType": "GMTileSet", - "resourceVersion": "1.0", - "name": "TileSet1", - "autoTileSets": [], - "macroPageTiles": { - "SerialiseHeight": 0, - "SerialiseWidth": 0, - "TileSerialiseData": [], + "$GMTileSet":"", + "%Name":"TileSet1", + "autoTileSets":[], + "macroPageTiles":{ + "SerialiseHeight":0, + "SerialiseWidth":0, + "TileSerialiseData":[], }, - "out_columns": 1, - "out_tilehborder": 2, - "out_tilevborder": 2, - "parent": { - "name": "Tile Sets", - "path": "folders/Tile Sets.yy", + "name":"TileSet1", + "out_columns":1, + "out_tilehborder":2, + "out_tilevborder":2, + "parent":{ + "name":"Tile Sets", + "path":"folders/Tile Sets.yy", }, - "spriteId": { - "name": "spr_tile_bg", - "path": "sprites/spr_tile_bg/spr_tile_bg.yy", + "resourceType":"GMTileSet", + "resourceVersion":"2.0", + "spriteId":{ + "name":"spr_tile_bg", + "path":"sprites/spr_tile_bg/spr_tile_bg.yy", }, - "spriteNoExport": true, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "spriteNoExport":true, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "tile_count": 2, - "tileAnimation": { - "FrameData": [ - 0, - 1, - ], - "SerialiseFrameCount": 1, + "tileAnimation":{ + "FrameData":[0,1,], + "SerialiseFrameCount":1, }, - "tileAnimationFrames": [], - "tileAnimationSpeed": 15.0, - "tileHeight": 32, - "tilehsep": 0, - "tilevsep": 0, - "tileWidth": 32, - "tilexoff": 0, - "tileyoff": 0, + "tileAnimationFrames":[], + "tileAnimationSpeed":15.0, + "tileHeight":32, + "tilehsep":0, + "tilevsep":0, + "tileWidth":32, + "tilexoff":0, + "tileyoff":0, + "tile_count":2, } \ No newline at end of file diff --git a/tilesets/ts_pixel_side_Underwater/ts_pixel_side_Underwater.yy b/tilesets/ts_pixel_side_Underwater/ts_pixel_side_Underwater.yy index 20ca92c..a5fee47 100644 --- a/tilesets/ts_pixel_side_Underwater/ts_pixel_side_Underwater.yy +++ b/tilesets/ts_pixel_side_Underwater/ts_pixel_side_Underwater.yy @@ -1,139 +1,50 @@ { - "resourceType": "GMTileSet", - "resourceVersion": "1.0", - "name": "ts_pixel_side_Underwater", - "autoTileSets": [ - {"resourceType":"GMAutoTileSet","resourceVersion":"1.0","name":"47 Tile Side Underwater","closed_edge":false,"tiles":[ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - 44, - 45, - 46, - 47, + "$GMTileSet":"", + "%Name":"ts_pixel_side_Underwater", + "autoTileSets":[ + {"$GMAutoTileSet":"","%Name":"47 Tile Side Underwater","closed_edge":false,"name":"47 Tile Side Underwater","resourceType":"GMAutoTileSet","resourceVersion":"2.0","tiles":[ + 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37, + 38,39,40,41,42,43,44,45,46,47, ],}, ], - "macroPageTiles": { - "SerialiseHeight": 0, - "SerialiseWidth": 0, - "TileSerialiseData": [], + "macroPageTiles":{ + "SerialiseHeight":0, + "SerialiseWidth":0, + "TileSerialiseData":[], }, - "out_columns": 7, - "out_tilehborder": 2, - "out_tilevborder": 2, - "parent": { - "name": "Tile Sets", - "path": "folders/Tile Sets.yy", + "name":"ts_pixel_side_Underwater", + "out_columns":7, + "out_tilehborder":2, + "out_tilevborder":2, + "parent":{ + "name":"Tile Sets", + "path":"folders/Tile Sets.yy", }, - "spriteId": { - "name": "spr_pixel_side_Underwater", - "path": "sprites/spr_pixel_side_Underwater/spr_pixel_side_Underwater.yy", + "resourceType":"GMTileSet", + "resourceVersion":"2.0", + "spriteId":{ + "name":"spr_pixel_side_Underwater", + "path":"sprites/spr_pixel_side_Underwater/spr_pixel_side_Underwater.yy", }, - "spriteNoExport": true, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", + "spriteNoExport":true, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", }, - "tile_count": 48, - "tileAnimation": { - "FrameData": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - 44, - 45, - 46, - 47, + "tileAnimation":{ + "FrameData":[ + 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36, + 37,38,39,40,41,42,43,44,45,46,47, ], - "SerialiseFrameCount": 1, + "SerialiseFrameCount":1, }, - "tileAnimationFrames": [], - "tileAnimationSpeed": 15.0, - "tileHeight": 32, - "tilehsep": 0, - "tilevsep": 0, - "tileWidth": 32, - "tilexoff": 0, - "tileyoff": 0, + "tileAnimationFrames":[], + "tileAnimationSpeed":15.0, + "tileHeight":32, + "tilehsep":0, + "tilevsep":0, + "tileWidth":32, + "tilexoff":0, + "tileyoff":0, + "tile_count":48, } \ No newline at end of file From c4b9c2f15bedcf71d1c5b307d8b932f918d8140e Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Wed, 27 Mar 2024 02:42:34 +0100 Subject: [PATCH 02/14] fixed edge warping --- scripts/stanncam/stanncam.gml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/stanncam/stanncam.gml b/scripts/stanncam/stanncam.gml index 9a6e91c..844cc9e 100644 --- a/scripts/stanncam/stanncam.gml +++ b/scripts/stanncam/stanncam.gml @@ -622,8 +622,8 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf //if on it is handled by the draw events if(smooth_draw){ var _ceiled_zoom = ceil(zoom_amount); //ensures the new surface size is a whole number - var _new_width = width * _ceiled_zoom; - var _new_height = height * _ceiled_zoom; + var _new_width = width * _ceiled_zoom + 1; //smooth drawing needs the surface to be 1 pixel wider and taller to remove edge warping + var _new_height = height * _ceiled_zoom + 1; } else { var _new_width = floor(width * zoom_amount); var _new_height = floor(height * zoom_amount); @@ -650,7 +650,11 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf var _new_x = x + offset_x - (width * 0.5) + __shake_x; var _new_y = y + offset_y - (height * 0.5) + __shake_y; - if(!smooth_draw){ // when smooth draw is off, the actual camera position gets rounded to whole numbers + if(smooth_draw){ //smooth drawing requires one extra pixel on the camera surface to remove edge warping, this is to fix the offset that occurs with that + if(_new_x < 1) _new_x -= 1; + if(_new_y < 1) _new_y -= 1; + + } else { // when smooth draw is off, the actual camera position gets rounded to whole numbers _new_x = round(_new_x); _new_y = round(_new_y); } @@ -718,8 +722,11 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf if(smooth_draw){ //seperates position into whole and fractional parts - x_frac = frac(_new_x); - y_frac = frac(_new_y); + if(_new_x > 0) x_frac = frac(_new_x); + else x_frac = 1 + frac(_new_x); //when position is negative, fraction is too, and so this is to compensate for that + + if(_new_y > 0) y_frac = frac(_new_y); + else y_frac = 1 + frac(_new_y); _new_x = floor(abs(_new_x)) * sign(_new_x); _new_y = floor(abs(_new_y)) * sign(_new_y); From a35f184968311e870afd1612c3ddac813eeaab17 Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Wed, 27 Mar 2024 17:36:30 +0100 Subject: [PATCH 03/14] improved movement and simplified zooming without debug draw now still appears relatively smooth --- scripts/stanncam/stanncam.gml | 68 +++++++++++++---------------------- 1 file changed, 24 insertions(+), 44 deletions(-) diff --git a/scripts/stanncam/stanncam.gml b/scripts/stanncam/stanncam.gml index 9a6e91c..111f0d5 100644 --- a/scripts/stanncam/stanncam.gml +++ b/scripts/stanncam/stanncam.gml @@ -161,22 +161,30 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf __xTo = follow.x; __yTo = follow.y; + var _x_dist = __xTo - x; var _y_dist = __yTo - y; bounds_dist_w = (max(bounds_w, abs(_x_dist)) - bounds_w) * sign(_x_dist); bounds_dist_h = (max(bounds_h, abs(_y_dist)) - bounds_h) * sign(_y_dist); + bounds_dist_w = round(bounds_dist_w * 100) / 100 //rounds to 2 decimal places + bounds_dist_h = round(bounds_dist_h * 100) / 100 //more decimal places makes the position flbbbbare up at certain points + + show_debug_message($"w: {bounds_dist_w} h: {bounds_dist_h}"); + //update camera position if(abs(__xTo - x) > bounds_w){ var _spd = (bounds_dist_w / spd_threshold) * spd; + x += _spd; } if(abs(y - __yTo) > bounds_h){ var _spd = (bounds_dist_h / spd_threshold) * spd; + y += _spd; - } + } } else if(__moving){ __t++; @@ -256,8 +264,6 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf if(zoom_amount == __zoomTo) __zooming = false; } - zoom_x = ((width * zoom_amount) - width) * 0.5; - zoom_y = ((height * zoom_amount) - height) * 0.5; } #endregion @@ -327,8 +333,6 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf if(_duration == 0){ //if duration is 0 the view is updated immediately width = _width; height = _height; - zoom_x = ((width * zoom_amount) - width) * 0.5; - zoom_y = ((height * zoom_amount) - height) * 0.5; __update_view_size(); } else { __size_change = true; @@ -373,8 +377,6 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf static zoom = function(_zoom, _duration=0){ if(_duration == 0){ //if duration is 0 the view is updated immediately zoom_amount = _zoom; - zoom_x = ((width * zoom_amount) - width) * 0.5; - zoom_y = ((height * zoom_amount) - height) * 0.5; if(!get_paused()) { __update_view_size(); } @@ -617,23 +619,20 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf /// @description updates the view size /// @param {Bool} [_force=false] /// @ignore - static __update_view_size = function(_force=false){ - //if smooth_draw is off maintains pixel perfection even when zooming in and out - //if on it is handled by the draw events - if(smooth_draw){ - var _ceiled_zoom = ceil(zoom_amount); //ensures the new surface size is a whole number - var _new_width = width * _ceiled_zoom; - var _new_height = height * _ceiled_zoom; - } else { - var _new_width = floor(width * zoom_amount); - var _new_height = floor(height * zoom_amount); - - var _width_2px = _new_width mod 2; - var _height_2px = _new_height mod 2; - - _new_width = _new_width - _width_2px; - _new_height = _new_height - _height_2px; - } + static __update_view_size = function(_force=false){ + //ensures the new surface size is a whole number + var _new_width = (width * zoom_amount); + var _new_height = (height * zoom_amount); + + var _width_2px = _new_width mod 2; + var _height_2px = _new_height mod 2; + + _new_width = _new_width - _width_2px; + _new_height = _new_height - _height_2px; + + zoom_x = (_new_width - width) * 0.5; + zoom_y = (_new_height - height) * 0.5; + //only runs if the size has changed (unless forced, used by __check_viewports to initialize) if(_force || surface_get_width(surface) != _new_width || surface_get_height(surface) != _new_height){ __check_surface(); @@ -650,11 +649,6 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf var _new_x = x + offset_x - (width * 0.5) + __shake_x; var _new_y = y + offset_y - (height * 0.5) + __shake_y; - if(!smooth_draw){ // when smooth draw is off, the actual camera position gets rounded to whole numbers - _new_x = round(_new_x); - _new_y = round(_new_y); - } - //apply zoom offset _new_x -= zoom_x; _new_y -= zoom_y; @@ -724,9 +718,6 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf _new_x = floor(abs(_new_x)) * sign(_new_x); _new_y = floor(abs(_new_y)) * sign(_new_y); - } else { - _new_x = ceil(_new_x); - _new_y = ceil(_new_y); } camera_set_view_pos(__camera, _new_x, _new_y); @@ -888,18 +879,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf var _display_scale_x = __obj_stanncam_manager.__display_scale_x; var _display_scale_y = __obj_stanncam_manager.__display_scale_y; - if(smooth_draw){ - //draws super smooth both when moving and zooming - _width *= zoom_amount; - _height *= zoom_amount; - _scale_x /= zoom_amount; - _scale_y /= zoom_amount; - - draw_surface_part_ext(_surface, x_frac + _left, y_frac + _top, _width, _height, _x, _y, _display_scale_x * _scale_x, _display_scale_y * _scale_y, -1, 1); - } else { - //maintains pixel perfection when moving and zooming, appears more stuttery - draw_surface_stretched(_surface, _x, _y, _width * _display_scale_x * _scale_x, _height * _display_scale_y * _scale_y); - } + draw_surface_stretched(_surface, _x, _y, _width * _display_scale_x * _scale_x, _height * _display_scale_y * _scale_y); } #endregion From 81c9ebebf3e3f7386651ab15634729d51df35a48 Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Wed, 27 Mar 2024 17:51:08 +0100 Subject: [PATCH 04/14] new version --- scripts/stanncam_macros/stanncam_macros.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/stanncam_macros/stanncam_macros.gml b/scripts/stanncam_macros/stanncam_macros.gml index b090fe2..f62cdd3 100644 --- a/scripts/stanncam_macros/stanncam_macros.gml +++ b/scripts/stanncam_macros/stanncam_macros.gml @@ -1,3 +1,3 @@ -#macro STANNCAM_VERSION "2.3.0" +#macro STANNCAM_VERSION "2.3.1" show_debug_message("Using STANNcam version " + STANNCAM_VERSION); From 9fc66c5633a785840f63cd60e652a05306ea3f9c Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Sat, 6 Apr 2024 23:02:58 +0200 Subject: [PATCH 05/14] added rounding --- scripts/stanncam/stanncam.gml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/stanncam/stanncam.gml b/scripts/stanncam/stanncam.gml index 111f0d5..df111f7 100644 --- a/scripts/stanncam/stanncam.gml +++ b/scripts/stanncam/stanncam.gml @@ -161,7 +161,6 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf __xTo = follow.x; __yTo = follow.y; - var _x_dist = __xTo - x; var _y_dist = __yTo - y; @@ -171,17 +170,17 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf bounds_dist_w = round(bounds_dist_w * 100) / 100 //rounds to 2 decimal places bounds_dist_h = round(bounds_dist_h * 100) / 100 //more decimal places makes the position flbbbbare up at certain points - show_debug_message($"w: {bounds_dist_w} h: {bounds_dist_h}"); - //update camera position if(abs(__xTo - x) > bounds_w){ - var _spd = (bounds_dist_w / spd_threshold) * spd; + var _spd = (bounds_dist_w / spd_threshold) * spd; + if(smooth_draw) _spd = round(_spd); x += _spd; } if(abs(y - __yTo) > bounds_h){ var _spd = (bounds_dist_h / spd_threshold) * spd; + if(smooth_draw) _spd = round(_spd); y += _spd; } From 497ea18c5bd926806f8c2362892eb715e6385183 Mon Sep 17 00:00:00 2001 From: Brent Frymire Date: Fri, 12 Apr 2024 16:21:56 -0400 Subject: [PATCH 06/14] Fix spacing --- scripts/stanncam/stanncam.gml | 24 +++++++++---------- scripts/stanncam_manager/stanncam_manager.gml | 16 ++++++------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/stanncam/stanncam.gml b/scripts/stanncam/stanncam.gml index df111f7..c9a0f01 100644 --- a/scripts/stanncam/stanncam.gml +++ b/scripts/stanncam/stanncam.gml @@ -172,7 +172,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf //update camera position if(abs(__xTo - x) > bounds_w){ - var _spd = (bounds_dist_w / spd_threshold) * spd; + var _spd = (bounds_dist_w / spd_threshold) * spd; if(smooth_draw) _spd = round(_spd); x += _spd; @@ -183,7 +183,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf if(smooth_draw) _spd = round(_spd); y += _spd; - } + } } else if(__moving){ __t++; @@ -376,7 +376,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf static zoom = function(_zoom, _duration=0){ if(_duration == 0){ //if duration is 0 the view is updated immediately zoom_amount = _zoom; - if(!get_paused()) { + if(!get_paused()){ __update_view_size(); } } else { @@ -428,20 +428,20 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf /// @function set_paused /// @description sets camera paused state /// @param {Bool} _paused - static set_paused = function(_paused) { + static set_paused = function(_paused){ paused = _paused; } /// @function get_paused /// @description gets camera's paused state /// @returns {Bool} - static get_paused = function() { + static get_paused = function(){ return paused; } /// @function toggle_paused /// @description toggles the camera's paused state - static toggle_paused = function() { + static toggle_paused = function(){ set_paused(!get_paused()); } @@ -618,9 +618,9 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf /// @description updates the view size /// @param {Bool} [_force=false] /// @ignore - static __update_view_size = function(_force=false){ + static __update_view_size = function(_force=false){ //ensures the new surface size is a whole number - var _new_width = (width * zoom_amount); + var _new_width = (width * zoom_amount); var _new_height = (height * zoom_amount); var _width_2px = _new_width mod 2; @@ -652,7 +652,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf _new_x -= zoom_x; _new_y -= zoom_y; - //zone constricting + //zone constricting if(__zone != noone){ var _zone_constrain_x = 0; var _zone_constrain_y = 0; @@ -675,7 +675,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf //horizontal check if(__zone.sprite_width <= (width * zoom_amount) && __zone.left && __zone.right){ //if the zones width is smaller than the camera and both left and right are constraining the cam will be pushed to its middle - _zone_constrain_x = (__zone.x+__zone.sprite_width/2) - (_new_x+(width*zoom_amount)/2); + _zone_constrain_x = (__zone.x + __zone.sprite_width * 0.5) - (_new_x + (width * zoom_amount) * 0.5); } else { if(__zone.left) _zone_constrain_x += _left; if(__zone.right) _zone_constrain_x += _right; @@ -683,7 +683,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf //vertical check if(__zone.sprite_height <= (height * zoom_amount) && __zone.top && __zone.bottom){ - _zone_constrain_y = (__zone.y+__zone.sprite_height/2) - (_new_y+(height*zoom_amount)/2); + _zone_constrain_y = (__zone.y + __zone.sprite_height * 0.5) - (_new_y + (height * zoom_amount) * 0.5); } else { if(__zone.top) _zone_constrain_y += _top; if(__zone.bottom) _zone_constrain_y += _bottom; @@ -887,7 +887,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf * @function toString * @returns {String} */ - static toString = function() { + static toString = function(){ return ""; } diff --git a/scripts/stanncam_manager/stanncam_manager.gml b/scripts/stanncam_manager/stanncam_manager.gml index 61c7798..81929ab 100644 --- a/scripts/stanncam_manager/stanncam_manager.gml +++ b/scripts/stanncam_manager/stanncam_manager.gml @@ -63,12 +63,12 @@ function stanncam_init(_game_w, _game_h, _resolution_w=_game_w, _resolution_h=_g /// @function stanncam_destroy /// @description removes all stanncam references from the game, the opposite of stanncam_init /// @param {Bool} [_application_surface_draw_enable=true] -function stanncam_destroy(_application_surface_draw_enable = true){ +function stanncam_destroy(_application_surface_draw_enable=true){ application_surface_draw_enable(_application_surface_draw_enable); - time_source_destroy(global.stanncam_time_source,true); - for (var i = 0; i < array_length(global.stanncams); ++i) { - if(global.stanncams[i] != -1) { + time_source_destroy(global.stanncam_time_source,true); + for (var i = 0; i < array_length(global.stanncams); ++i){ + if(global.stanncams[i] != -1){ global.stanncams[i].destroy(); } } @@ -353,7 +353,7 @@ function stanncam_debug_set_draw_zones(_should_draw){ /// @function stanncam_toggle_cameras_paused /// @description toggles camera's paused state -function stanncam_toggle_cameras_paused() { +function stanncam_toggle_cameras_paused(){ var _len = array_length(global.stanncams); for (var i = 0; i < _len; ++i){ var _camera = global.stanncams[i]; @@ -366,7 +366,7 @@ function stanncam_toggle_cameras_paused() { /// @function stanncam_set_cameras_paused /// @description sets all cameras to paused state /// @param {Bool} _paused -function stanncam_set_cameras_paused(_paused) { +function stanncam_set_cameras_paused(_paused){ var _len = array_length(global.stanncams); for (var i = 0; i < _len; ++i){ var _camera = global.stanncams[i]; @@ -378,12 +378,12 @@ function stanncam_set_cameras_paused(_paused) { /// @function stanncam_cameras_pause /// @description sets all cameras to paused state -function stanncam_cameras_pause() { +function stanncam_cameras_pause(){ return stanncam_set_cameras_paused(true); } /// @function stanncam_cameras_unpause /// @description sets all cameras to an unpaused state -function stanncam_cameras_unpause() { +function stanncam_cameras_unpause(){ return stanncam_set_cameras_paused(false); } From 776ff60c08a588fcd16f0e68fbc3990c658f450f Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Sat, 13 Apr 2024 21:16:34 +0200 Subject: [PATCH 07/14] Revert "Merge branch '2.3.1' into edge-warp" This reverts commit c882781e52ccd7494a24fa73b7ca3c31fa4cee7a, reversing changes made to c4b9c2f15bedcf71d1c5b307d8b932f918d8140e. --- scripts/stanncam_macros/stanncam_macros.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/stanncam_macros/stanncam_macros.gml b/scripts/stanncam_macros/stanncam_macros.gml index f62cdd3..b090fe2 100644 --- a/scripts/stanncam_macros/stanncam_macros.gml +++ b/scripts/stanncam_macros/stanncam_macros.gml @@ -1,3 +1,3 @@ -#macro STANNCAM_VERSION "2.3.1" +#macro STANNCAM_VERSION "2.3.0" show_debug_message("Using STANNcam version " + STANNCAM_VERSION); From b4f1a9b1e786b091b9ce5c8603d19842f3b5c17f Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Sat, 13 Apr 2024 21:16:56 +0200 Subject: [PATCH 08/14] Revert "Revert "Merge branch '2.3.1' into edge-warp"" This reverts commit 776ff60c08a588fcd16f0e68fbc3990c658f450f. --- scripts/stanncam_macros/stanncam_macros.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/stanncam_macros/stanncam_macros.gml b/scripts/stanncam_macros/stanncam_macros.gml index b090fe2..f62cdd3 100644 --- a/scripts/stanncam_macros/stanncam_macros.gml +++ b/scripts/stanncam_macros/stanncam_macros.gml @@ -1,3 +1,3 @@ -#macro STANNCAM_VERSION "2.3.0" +#macro STANNCAM_VERSION "2.3.1" show_debug_message("Using STANNcam version " + STANNCAM_VERSION); From fb898eee730cc1701d5c014e240c6c29f492d9e7 Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Wed, 24 Apr 2024 19:37:06 +0200 Subject: [PATCH 09/14] progress on removing edge warping, need to fix zooming with smooth_draw off --- objects/obj_camera_pixel_grid/Draw_64.gml | 5 +++ scripts/stanncam/stanncam.gml | 52 ++++++++++++++--------- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/objects/obj_camera_pixel_grid/Draw_64.gml b/objects/obj_camera_pixel_grid/Draw_64.gml index 8581a2d..bcdde3c 100644 --- a/objects/obj_camera_pixel_grid/Draw_64.gml +++ b/objects/obj_camera_pixel_grid/Draw_64.gml @@ -12,6 +12,11 @@ draw_text_outline(1, _offset * 3, "[B] smooth camera: " + (cam1.smooth_draw ? "O draw_text_outline(1, _offset * 4, "[1 & 2 & 3] to switch", _outline_width, _precision); draw_text_outline(1, _offset * 5, "between example rooms", _outline_width, _precision); +//draw current camera position +draw_set_halign(fa_right); +draw_text_outline(-1, 0, $"x:{cam1.get_x()} y:{cam1.get_y()} ", _outline_width, _precision); +draw_text_outline(-1, _offset * 1, $"x_frac:{cam1.x_frac} y_frac:{cam1.y_frac} ", _outline_width, _precision); + //draw current resolution text draw_set_halign(fa_right); draw_text_outline(global.gui_w - 1, 0, "Game size: " + string(global.game_w) + " x " + string(global.game_h), _outline_width, _precision); diff --git a/scripts/stanncam/stanncam.gml b/scripts/stanncam/stanncam.gml index 844cc9e..886218d 100644 --- a/scripts/stanncam/stanncam.gml +++ b/scripts/stanncam/stanncam.gml @@ -650,11 +650,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf var _new_x = x + offset_x - (width * 0.5) + __shake_x; var _new_y = y + offset_y - (height * 0.5) + __shake_y; - if(smooth_draw){ //smooth drawing requires one extra pixel on the camera surface to remove edge warping, this is to fix the offset that occurs with that - if(_new_x < 1) _new_x -= 1; - if(_new_y < 1) _new_y -= 1; - - } else { // when smooth draw is off, the actual camera position gets rounded to whole numbers + if(!smooth_draw){// when smooth draw is off, the actual camera position gets rounded to whole numbers _new_x = round(_new_x); _new_y = round(_new_y); } @@ -662,6 +658,11 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf //apply zoom offset _new_x -= zoom_x; _new_y -= zoom_y; + + if(smooth_draw){ //smooth drawing requires one extra pixel on the camera surface to remove edge warping, this is to fix the offset that occurs with that + if(_new_x <= 0) _new_x -= 1; + if(_new_y <= 0) _new_y -= 1; + } //zone constricting if(__zone != noone){ @@ -722,8 +723,10 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf if(smooth_draw){ //seperates position into whole and fractional parts + //when position is negative, fraction is too, and so this is to compensate for that + if(_new_x > 0) x_frac = frac(_new_x); - else x_frac = 1 + frac(_new_x); //when position is negative, fraction is too, and so this is to compensate for that + else x_frac = 1 + frac(_new_x); if(_new_y > 0) y_frac = frac(_new_y); else y_frac = 1 + frac(_new_y); @@ -802,7 +805,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf static draw = function(_x, _y, _scale_x=1, _scale_y=1){ __check_surface(); __debug_draw(); - draw_surf(surface, _x, _y, _scale_x, _scale_y, 0, 0, width, height); + draw_surf(surface, _x, _y, _scale_x, _scale_y,0,0,width,height); } /// @function draw_no_compensate @@ -815,7 +818,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf static draw_no_compensate = function(_x, _y, _scale_x=1, _scale_y=1){ __check_surface(); __debug_draw(); - draw_surf(surface, _x, _y, _scale_x, _scale_y, 0, 0, width, height, false); + draw_surf(surface, _x, _y, _scale_x, _scale_y,0,0,width,height,false); } /// @function draw_part @@ -878,7 +881,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf /// @param {Real} [_height=surface_get_height(_surface)] /// @param {Bool} [_ratio_compensate=true] /// @ignore - static draw_surf = function(_surface, _x, _y, _scale_x=1, _scale_y=1, _left=0, _top=0, _width=surface_get_width(_surface), _height=surface_get_height(_surface), _ratio_compensate=true){ + static draw_surf = function(_surface, _x, _y, _scale_x=1, _scale_y=1, _left=0, _top=0, _width=width, _height=height, _ratio_compensate=true){ if(!surface_exists(_surface)){ return; } @@ -894,19 +897,30 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf var _display_scale_x = __obj_stanncam_manager.__display_scale_x; var _display_scale_y = __obj_stanncam_manager.__display_scale_y; + + var _zoom_amount = zoom_amount; + var x_frac_ = x_frac; + var y_frac_ = y_frac; - if(smooth_draw){ - //draws super smooth both when moving and zooming - _width *= zoom_amount; - _height *= zoom_amount; - _scale_x /= zoom_amount; - _scale_y /= zoom_amount; + if(!smooth_draw){ //if smooth draw is off, the zoom amount becomes stepped to 0.02, and frac_x/y are 0 - draw_surface_part_ext(_surface, x_frac + _left, y_frac + _top, _width, _height, _x, _y, _display_scale_x * _scale_x, _display_scale_y * _scale_y, -1, 1); - } else { - //maintains pixel perfection when moving and zooming, appears more stuttery - draw_surface_stretched(_surface, _x, _y, _width * _display_scale_x * _scale_x, _height * _display_scale_y * _scale_y); + //var floored_zoom = floor(zoom_amount * 100); + //_zoom_amount = (floored_zoom - (floored_zoom mod 2)) / 100; + x_frac = 0; + y_frac = 0; } + + _width *= _zoom_amount; + _height *= _zoom_amount; + _scale_x /= _zoom_amount; + _scale_y /= _zoom_amount; + + show_debug_message(_width) + show_debug_message(_height) + show_debug_message(_scale_x) + show_debug_message(_scale_y) + + draw_surface_part_ext(_surface, x_frac_ + _left, y_frac_ + _top, _width, _height, _x, _y, _display_scale_x * _scale_x, _display_scale_y * _scale_y, -1, 1); } #endregion From 3984eb64e25fcb56d4fdc7b31b97ddc116a5091a Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Wed, 24 Apr 2024 22:09:41 +0200 Subject: [PATCH 10/14] further improved, but now zooming within a zone causes stutters --- scripts/stanncam/stanncam.gml | 46 ++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/scripts/stanncam/stanncam.gml b/scripts/stanncam/stanncam.gml index 886218d..dc2bc80 100644 --- a/scripts/stanncam/stanncam.gml +++ b/scripts/stanncam/stanncam.gml @@ -373,8 +373,13 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf static zoom = function(_zoom, _duration=0){ if(_duration == 0){ //if duration is 0 the view is updated immediately zoom_amount = _zoom; + + //gamemaker has some rounding issues, so here we round to nearest second decimal place, IE 0.19999999 becomes 0.02 yes this is neccesary 💀 + zoom_amount = round(zoom_amount * 100) / 100; + zoom_x = ((width * zoom_amount) - width) * 0.5; zoom_y = ((height * zoom_amount) - height) * 0.5; + if(!get_paused()) { __update_view_size(); } @@ -898,30 +903,27 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf var _display_scale_x = __obj_stanncam_manager.__display_scale_x; var _display_scale_y = __obj_stanncam_manager.__display_scale_y; - var _zoom_amount = zoom_amount; - var x_frac_ = x_frac; - var y_frac_ = y_frac; - - if(!smooth_draw){ //if smooth draw is off, the zoom amount becomes stepped to 0.02, and frac_x/y are 0 + if(smooth_draw){ //if smooth draw is off, the zoom amount becomes stepped to 0.02, and frac_x/y are 0 - //var floored_zoom = floor(zoom_amount * 100); - //_zoom_amount = (floored_zoom - (floored_zoom mod 2)) / 100; - x_frac = 0; - y_frac = 0; - } + _width *= zoom_amount; + _height *= zoom_amount; + _scale_x /= zoom_amount; + _scale_y /= zoom_amount; - _width *= _zoom_amount; - _height *= _zoom_amount; - _scale_x /= _zoom_amount; - _scale_y /= _zoom_amount; - - show_debug_message(_width) - show_debug_message(_height) - show_debug_message(_scale_x) - show_debug_message(_scale_y) - - draw_surface_part_ext(_surface, x_frac_ + _left, y_frac_ + _top, _width, _height, _x, _y, _display_scale_x * _scale_x, _display_scale_y * _scale_y, -1, 1); - + draw_surface_part_ext(_surface, x_frac + _left, y_frac + _top, _width, _height, _x, _y, _display_scale_x * _scale_x, _display_scale_y * _scale_y, -1, 1); + + } else { + var _width_stepped = (_width * zoom_amount); + var _height_stepped = (_height * zoom_amount); + + _width_stepped -= _width_stepped mod 2; + _height_stepped -= _height_stepped mod 2; + + _scale_x = _width / _width_stepped; + _scale_y = _height / _height_stepped; + + draw_surface_part_ext(_surface, _left, _top, _width_stepped, _height_stepped, _x, _y, _display_scale_x * _scale_x, _display_scale_y * _scale_y, -1, 1); + } } #endregion From 665f7c96b037fb07a866638dda03dc23cac6c76a Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Tue, 30 Apr 2024 13:58:40 +0200 Subject: [PATCH 11/14] snapped zoomed width/height in some areas if smooth_draw is off --- scripts/stanncam/stanncam.gml | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/scripts/stanncam/stanncam.gml b/scripts/stanncam/stanncam.gml index dc2bc80..8c01ead 100644 --- a/scripts/stanncam/stanncam.gml +++ b/scripts/stanncam/stanncam.gml @@ -668,7 +668,15 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf if(_new_x <= 0) _new_x -= 1; if(_new_y <= 0) _new_y -= 1; } - + + //without smooth_draw zooming needs to be snapped a bit + var _width_stepped = (width * zoom_amount); + var _height_stepped = (height * zoom_amount); + if(!smooth_draw){ + _width_stepped -= _width_stepped mod 2; + _height_stepped -= _height_stepped mod 2; + } + //zone constricting if(__zone != noone){ var _zone_constrain_x = 0; @@ -680,27 +688,27 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf _left = max(0, __zone.bbox_left - _new_x); } if(__zone.right){ - _right = -max(0, _new_x + (width * zoom_amount) - __zone.bbox_right); + _right = -max(0, _new_x + _width_stepped - __zone.bbox_right); } if(__zone.top){ _top = max(0, __zone.bbox_top - _new_y); } if(__zone.bottom){ - _bottom = -max(0, _new_y + (height * zoom_amount) - __zone.bbox_bottom); + _bottom = -max(0, _new_y + _height_stepped - __zone.bbox_bottom); } //horizontal check - if(__zone.sprite_width <= (width * zoom_amount) && __zone.left && __zone.right){ + if(__zone.sprite_width <= (_width_stepped) && __zone.left && __zone.right){ //if the zones width is smaller than the camera and both left and right are constraining the cam will be pushed to its middle - _zone_constrain_x = (__zone.x+__zone.sprite_width/2) - (_new_x+(width*zoom_amount)/2); + _zone_constrain_x = (__zone.x+__zone.sprite_width/2) - (_new_x+_width_stepped/2); } else { if(__zone.left) _zone_constrain_x += _left; if(__zone.right) _zone_constrain_x += _right; } //vertical check - if(__zone.sprite_height <= (height * zoom_amount) && __zone.top && __zone.bottom){ - _zone_constrain_y = (__zone.y+__zone.sprite_height/2) - (_new_y+(height*zoom_amount)/2); + if(__zone.sprite_height <= (_height_stepped) && __zone.top && __zone.bottom){ + _zone_constrain_y = (__zone.y+__zone.sprite_height/2) - (_new_y+_height_stepped/2); } else { if(__zone.top) _zone_constrain_y += _top; if(__zone.bottom) _zone_constrain_y += _bottom; @@ -716,8 +724,8 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf //Constrains camera to room if(room_constrain){ - __constrain_offset_x = (clamp(_new_x, 0, room_width - width * zoom_amount) - _new_x); - __constrain_offset_y = (clamp(_new_y, 0, room_height - height * zoom_amount) - _new_y); + __constrain_offset_x = (clamp(_new_x, 0, room_width - _width_stepped) - _new_x); + __constrain_offset_y = (clamp(_new_y, 0, room_height - _height_stepped) - _new_y); _new_x += __constrain_offset_x; _new_y += __constrain_offset_y; @@ -915,14 +923,15 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf } else { var _width_stepped = (_width * zoom_amount); var _height_stepped = (_height * zoom_amount); - + _width_stepped -= _width_stepped mod 2; _height_stepped -= _height_stepped mod 2; - + _scale_x = _width / _width_stepped; _scale_y = _height / _height_stepped; draw_surface_part_ext(_surface, _left, _top, _width_stepped, _height_stepped, _x, _y, _display_scale_x * _scale_x, _display_scale_y * _scale_y, -1, 1); + //draw_surface_stretched(_surface, _x, _y, _width * _display_scale_x * _scale_x, _height * _display_scale_y * _scale_y); } } #endregion From 179cf264601d87b74761d44c7347d334cd0db0b5 Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Tue, 30 Apr 2024 13:59:03 +0200 Subject: [PATCH 12/14] removed old code --- scripts/stanncam/stanncam.gml | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/stanncam/stanncam.gml b/scripts/stanncam/stanncam.gml index 8c01ead..e0cf15a 100644 --- a/scripts/stanncam/stanncam.gml +++ b/scripts/stanncam/stanncam.gml @@ -931,7 +931,6 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf _scale_y = _height / _height_stepped; draw_surface_part_ext(_surface, _left, _top, _width_stepped, _height_stepped, _x, _y, _display_scale_x * _scale_x, _display_scale_y * _scale_y, -1, 1); - //draw_surface_stretched(_surface, _x, _y, _width * _display_scale_x * _scale_x, _height * _display_scale_y * _scale_y); } } #endregion From 3b47bd72b606638c07a78876eeaec405746e7f2d Mon Sep 17 00:00:00 2001 From: Jack Conradsen Date: Tue, 30 Apr 2024 14:00:49 +0200 Subject: [PATCH 13/14] add options to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ed38cc0..59107bb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ # Stitch files stitch.config.json tmp/ +/options From 4604918f91c7a7eda1e3adf1232344e0bfae5dd9 Mon Sep 17 00:00:00 2001 From: Brent Frymire Date: Fri, 10 May 2024 12:34:05 -0400 Subject: [PATCH 14/14] Fix spacing --- objects/obj_camera_pixel_grid/Draw_64.gml | 2 +- objects/obj_camera_pixel_grid/Step_0.gml | 8 ++- objects/obj_stanncam_zone/Create_0.gml | 8 +-- objects/obj_stanncam_zone_1side/Create_0.gml | 29 +++++----- objects/obj_stanncam_zone_2side/Create_0.gml | 29 +++++----- objects/obj_stanncam_zone_corner/Create_0.gml | 29 +++++----- objects/obj_stanncam_zone_u/Create_0.gml | 29 +++++----- scripts/stanncam/stanncam.gml | 54 +++++++++---------- scripts/stanncam_manager/stanncam_manager.gml | 2 +- 9 files changed, 91 insertions(+), 99 deletions(-) diff --git a/objects/obj_camera_pixel_grid/Draw_64.gml b/objects/obj_camera_pixel_grid/Draw_64.gml index bcdde3c..e674f67 100644 --- a/objects/obj_camera_pixel_grid/Draw_64.gml +++ b/objects/obj_camera_pixel_grid/Draw_64.gml @@ -40,6 +40,6 @@ draw_text_outline(global.gui_w - 1, _offset * 3, "window mode: " + _window_mode_ var mx = cam1.room_to_gui_x(cam1.get_mouse_x()); var my = cam1.room_to_gui_y(cam1.get_mouse_y()); draw_set_halign(fa_left); -draw_text(mx,my,$"{mx} {my}"); +draw_text(mx, my, $"{mx} {my}"); diff --git a/objects/obj_camera_pixel_grid/Step_0.gml b/objects/obj_camera_pixel_grid/Step_0.gml index ad9c7d4..53f34c4 100644 --- a/objects/obj_camera_pixel_grid/Step_0.gml +++ b/objects/obj_camera_pixel_grid/Step_0.gml @@ -1,4 +1,3 @@ - //toggle zoom in if(mouse_check_button_pressed(mb_right)){ zoom_mode++; @@ -71,14 +70,13 @@ if(_hinput != 0) hspd += _hinput*acceleration_spd; else hspd -= min(abs(hspd), deacceleration_spd) * sign(hspd); if(_vinput != 0) vspd += _vinput*acceleration_spd; -else vspd -= min(abs(vspd), deacceleration_spd) * sign(vspd); +else vspd -= min(abs(vspd), deacceleration_spd) * sign(vspd); -hspd = clamp(hspd,-max_spd,max_spd); -vspd = clamp(vspd,-max_spd,max_spd); +hspd = clamp(hspd, -max_spd, max_spd); +vspd = clamp(vspd, -max_spd, max_spd); if(hspd != 0 || vspd != 0){ var _x = cam1.x + hspd; var _y = cam1.y + vspd; cam1.move(_x, _y, 0); } - diff --git a/objects/obj_stanncam_zone/Create_0.gml b/objects/obj_stanncam_zone/Create_0.gml index 12c6292..e603108 100644 --- a/objects/obj_stanncam_zone/Create_0.gml +++ b/objects/obj_stanncam_zone/Create_0.gml @@ -1,8 +1,8 @@ /// @description which sides to constrain -left = true; -top = true; -right = true; -bottom = true; +left = true; +top = true; +right = true; +bottom = true; image_angle = (image_angle mod 360 + 360) mod 360; diff --git a/objects/obj_stanncam_zone_1side/Create_0.gml b/objects/obj_stanncam_zone_1side/Create_0.gml index 7c8cb20..875ce76 100644 --- a/objects/obj_stanncam_zone_1side/Create_0.gml +++ b/objects/obj_stanncam_zone_1side/Create_0.gml @@ -1,22 +1,21 @@ -/// @description event_inherited(); -left = false; -top = false; -right = false; -bottom = false; +left = false; +top = false; +right = false; +bottom = false; switch (image_angle) { - case 0: - right = true; - break; - case 90: - top = true; - break; + case 0: + right = true; + break; + case 90: + top = true; + break; case 180: - left = true; - break; + left = true; + break; case 270: - bottom = true; - break; + bottom = true; + break; } diff --git a/objects/obj_stanncam_zone_2side/Create_0.gml b/objects/obj_stanncam_zone_2side/Create_0.gml index 6e9134b..f65ced9 100644 --- a/objects/obj_stanncam_zone_2side/Create_0.gml +++ b/objects/obj_stanncam_zone_2side/Create_0.gml @@ -1,26 +1,25 @@ -/// @description event_inherited(); -left = false; -top = false; -right = false; -bottom = false; +left = false; +top = false; +right = false; +bottom = false; switch (image_angle) { - case 0: - right = true; + case 0: + right = true; left = true; - break; - case 90: - top = true; + break; + case 90: + top = true; bottom = true; - break; + break; case 180: - right = true; + right = true; left = true; - break; + break; case 270: - top = true; + top = true; bottom = true; - break; + break; } diff --git a/objects/obj_stanncam_zone_corner/Create_0.gml b/objects/obj_stanncam_zone_corner/Create_0.gml index c154cc6..acdecd5 100644 --- a/objects/obj_stanncam_zone_corner/Create_0.gml +++ b/objects/obj_stanncam_zone_corner/Create_0.gml @@ -1,26 +1,25 @@ -/// @description event_inherited(); -left = false; -top = false; -right = false; -bottom = false; +left = false; +top = false; +right = false; +bottom = false; switch (image_angle) { - case 0: - right = true; + case 0: + right = true; bottom = true; - break; - case 90: - top = true; + break; + case 90: + top = true; right = true; - break; + break; case 180: - left = true; + left = true; top = true; - break; + break; case 270: - bottom = true; + bottom = true; left = true; - break; + break; } diff --git a/objects/obj_stanncam_zone_u/Create_0.gml b/objects/obj_stanncam_zone_u/Create_0.gml index 9c82788..0e1197f 100644 --- a/objects/obj_stanncam_zone_u/Create_0.gml +++ b/objects/obj_stanncam_zone_u/Create_0.gml @@ -1,22 +1,21 @@ -/// @description event_inherited(); -left = true; -top = true; -right = true; -bottom = true; +left = true; +top = true; +right = true; +bottom = true; switch (image_angle) { - case 0: - left = false; - break; - case 90: - bottom = false; - break; + case 0: + left = false; + break; + case 90: + bottom = false; + break; case 180: - right = false; - break; + right = false; + break; case 270: - top = false; - break; + top = false; + break; } diff --git a/scripts/stanncam/stanncam.gml b/scripts/stanncam/stanncam.gml index 7b93036..e3f37d7 100644 --- a/scripts/stanncam/stanncam.gml +++ b/scripts/stanncam/stanncam.gml @@ -167,18 +167,18 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf bounds_dist_w = (max(bounds_w, abs(_x_dist)) - bounds_w) * sign(_x_dist); bounds_dist_h = (max(bounds_h, abs(_y_dist)) - bounds_h) * sign(_y_dist); - bounds_dist_w = round(bounds_dist_w * 100) / 100 //rounds to 2 decimal places - bounds_dist_h = round(bounds_dist_h * 100) / 100 //more decimal places makes the position flbbbbare up at certain points + bounds_dist_w = round(bounds_dist_w * 100) / 100; //rounds to 2 decimal places + bounds_dist_h = round(bounds_dist_h * 100) / 100; //more decimal places may cause the position to fluctuate at certain points //update camera position - if(abs(__xTo - x) > bounds_w){ + if(abs(_x_dist) > bounds_w){ var _spd = (bounds_dist_w / spd_threshold) * spd; if(smooth_draw) _spd = round(_spd); x += _spd; } - if(abs(y - __yTo) > bounds_h){ + if(abs(_y_dist) > bounds_h){ var _spd = (bounds_dist_h / spd_threshold) * spd; if(smooth_draw) _spd = round(_spd); @@ -383,7 +383,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf zoom_x = ((width * zoom_amount) - width) * 0.5; zoom_y = ((height * zoom_amount) - height) * 0.5; - if(!get_paused()) { + if(!get_paused()){ __update_view_size(); } } else { @@ -630,16 +630,16 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf //if on it is handled by the draw events if(smooth_draw){ var _ceiled_zoom = ceil(zoom_amount); //ensures the new surface size is a whole number - var _new_width = width * _ceiled_zoom + 1; //smooth drawing needs the surface to be 1 pixel wider and taller to remove edge warping + var _new_width = width * _ceiled_zoom + 1; //smooth drawing needs the surface to be 1 pixel wider and taller to remove edge warping var _new_height = height * _ceiled_zoom + 1; } else { - var _new_width = floor(width * zoom_amount); + var _new_width = floor(width * zoom_amount); var _new_height = floor(height * zoom_amount); var _width_2px = _new_width mod 2; var _height_2px = _new_height mod 2; - _new_width = _new_width - _width_2px; + _new_width = _new_width - _width_2px; _new_height = _new_height - _height_2px; } //only runs if the size has changed (unless forced, used by __check_viewports to initialize) @@ -668,19 +668,19 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf _new_y -= zoom_y; if(smooth_draw){ //smooth drawing requires one extra pixel on the camera surface to remove edge warping, this is to fix the offset that occurs with that - if(_new_x <= 0) _new_x -= 1; + if(_new_x <= 0) _new_x -= 1; if(_new_y <= 0) _new_y -= 1; } //without smooth_draw zooming needs to be snapped a bit - var _width_stepped = (width * zoom_amount); + var _width_stepped = (width * zoom_amount); var _height_stepped = (height * zoom_amount); if(!smooth_draw){ - _width_stepped -= _width_stepped mod 2; + _width_stepped -= _width_stepped mod 2; _height_stepped -= _height_stepped mod 2; - } + } - //zone constricting + //zone constricting if(__zone != noone){ var _zone_constrain_x = 0; var _zone_constrain_y = 0; @@ -705,7 +705,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf //if the zones width is smaller than the camera and both left and right are constraining the cam will be pushed to its middle _zone_constrain_x = (__zone.x+__zone.sprite_width/2) - (_new_x+_width_stepped/2); } else { - if(__zone.left) _zone_constrain_x += _left; + if(__zone.left) _zone_constrain_x += _left; if(__zone.right) _zone_constrain_x += _right; } @@ -742,7 +742,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf //when position is negative, fraction is too, and so this is to compensate for that if(_new_x > 0) x_frac = frac(_new_x); - else x_frac = 1 + frac(_new_x); + else x_frac = 1 + frac(_new_x); if(_new_y > 0) y_frac = frac(_new_y); else y_frac = 1 + frac(_new_y); @@ -772,8 +772,8 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf var x_offset = -offset_x - __constrain_offset_x - (__zone_constrain_x * __zone_constrain_amount) + zoom_x; var y_offset = -offset_y - __constrain_offset_y - (__zone_constrain_y * __zone_constrain_amount) + zoom_y; - var _x1 = (width * 0.5) - bounds_w + x_offset; - var _x2 = (width * 0.5) + bounds_w + x_offset; + var _x1 = (width * 0.5) - bounds_w + x_offset; + var _x2 = (width * 0.5) + bounds_w + x_offset; var _y1 = (height * 0.5) - bounds_h + y_offset; var _y2 = (height * 0.5) + bounds_h + y_offset; draw_set_color(c_white); @@ -818,7 +818,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf static draw = function(_x, _y, _scale_x=1, _scale_y=1){ __check_surface(); __debug_draw(); - draw_surf(surface, _x, _y, _scale_x, _scale_y,0,0,width,height); + draw_surf(surface, _x, _y, _scale_x, _scale_y, 0, 0, width, height); } /// @function draw_no_compensate @@ -831,7 +831,7 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf static draw_no_compensate = function(_x, _y, _scale_x=1, _scale_y=1){ __check_surface(); __debug_draw(); - draw_surf(surface, _x, _y, _scale_x, _scale_y,0,0,width,height,false); + draw_surf(surface, _x, _y, _scale_x, _scale_y, 0, 0, width, height, false); } /// @function draw_part @@ -890,8 +890,8 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf /// @param {Real} [_scale_y=1] /// @param {Real} [_left=0] /// @param {Real} [_top=0] - /// @param {Real} [_width=surface_get_width(_surface)] - /// @param {Real} [_height=surface_get_height(_surface)] + /// @param {Real} [_width=width] + /// @param {Real} [_height=height] /// @param {Bool} [_ratio_compensate=true] /// @ignore static draw_surf = function(_surface, _x, _y, _scale_x=1, _scale_y=1, _left=0, _top=0, _width=width, _height=height, _ratio_compensate=true){ @@ -912,22 +912,20 @@ function stanncam(_x=0, _y=0, _width=global.game_w, _height=global.game_h, _surf var _display_scale_y = __obj_stanncam_manager.__display_scale_y; if(smooth_draw){ //if smooth draw is off, the zoom amount becomes stepped to 0.02, and frac_x/y are 0 - - _width *= zoom_amount; + _width *= zoom_amount; _height *= zoom_amount; _scale_x /= zoom_amount; _scale_y /= zoom_amount; draw_surface_part_ext(_surface, x_frac + _left, y_frac + _top, _width, _height, _x, _y, _display_scale_x * _scale_x, _display_scale_y * _scale_y, -1, 1); - } else { - var _width_stepped = (_width * zoom_amount); - var _height_stepped = (_height * zoom_amount); + var _width_stepped = _width * zoom_amount; + var _height_stepped = _height * zoom_amount; - _width_stepped -= _width_stepped mod 2; + _width_stepped -= _width_stepped mod 2; _height_stepped -= _height_stepped mod 2; - _scale_x = _width / _width_stepped; + _scale_x = _width / _width_stepped; _scale_y = _height / _height_stepped; draw_surface_part_ext(_surface, _left, _top, _width_stepped, _height_stepped, _x, _y, _display_scale_x * _scale_x, _display_scale_y * _scale_y, -1, 1); diff --git a/scripts/stanncam_manager/stanncam_manager.gml b/scripts/stanncam_manager/stanncam_manager.gml index 81929ab..86a7785 100644 --- a/scripts/stanncam_manager/stanncam_manager.gml +++ b/scripts/stanncam_manager/stanncam_manager.gml @@ -66,7 +66,7 @@ function stanncam_init(_game_w, _game_h, _resolution_w=_game_w, _resolution_h=_g function stanncam_destroy(_application_surface_draw_enable=true){ application_surface_draw_enable(_application_surface_draw_enable); - time_source_destroy(global.stanncam_time_source,true); + time_source_destroy(global.stanncam_time_source, true); for (var i = 0; i < array_length(global.stanncams); ++i){ if(global.stanncams[i] != -1){ global.stanncams[i].destroy();