diff --git a/LogoJack.png b/LogoJack.png new file mode 100644 index 0000000..745cccc Binary files /dev/null and b/LogoJack.png differ diff --git a/animcurves/stanncam_ac_bouncy/stanncam_ac_bouncy.yy b/animcurves/stanncam_ac_bouncy/stanncam_ac_bouncy.yy new file mode 100644 index 0000000..572e07e --- /dev/null +++ b/animcurves/stanncam_ac_bouncy/stanncam_ac_bouncy.yy @@ -0,0 +1,17 @@ +{ + "resourceType": "GMAnimCurve", + "resourceVersion": "1.2", + "name": "stanncam_ac_bouncy", + "channels": [ + {"resourceType":"GMAnimCurveChannel","resourceVersion":"1.0","name":"curve1","colour":4290799884,"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,}, + ], + "function": 2, + "parent": { + "name": "Animation_curves - add more if needed", + "path": "folders/STANNcam/Animation_curves - add more if needed.yy", + }, +} \ 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 new file mode 100644 index 0000000..5620aaa --- /dev/null +++ b/animcurves/stanncam_ac_ease/stanncam_ac_ease.yy @@ -0,0 +1,16 @@ +{ + "resourceType": "GMAnimCurve", + "resourceVersion": "1.2", + "name": "stanncam_ac_ease", + "channels": [ + {"resourceType":"GMAnimCurveChannel","resourceVersion":"1.0","name":"curve1","colour":4290799884,"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,}, + ], + "function": 2, + "parent": { + "name": "Animation_curves - add more if needed", + "path": "folders/STANNcam/Animation_curves - add more if needed.yy", + }, +} \ 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 new file mode 100644 index 0000000..934fc1d --- /dev/null +++ b/animcurves/stanncam_ac_linear/stanncam_ac_linear.yy @@ -0,0 +1,16 @@ +{ + "resourceType": "GMAnimCurve", + "resourceVersion": "1.2", + "name": "stanncam_ac_linear", + "channels": [ + {"resourceType":"GMAnimCurveChannel","resourceVersion":"1.0","name":"curve1","colour":4290799884,"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,}, + ], + "function": 0, + "parent": { + "name": "Animation_curves - add more if needed", + "path": "folders/STANNcam/Animation_curves - add more if needed.yy", + }, +} \ No newline at end of file diff --git a/fonts/f_hires/f_hires.yy b/fonts/f_hires/f_hires.yy index 1bae5b3..8a63eeb 100644 --- a/fonts/f_hires/f_hires.yy +++ b/fonts/f_hires/f_hires.yy @@ -2,137 +2,140 @@ "resourceType": "GMFont", "resourceVersion": "1.0", "name": "f_hires", - "hinting": 0, - "glyphOperations": 0, - "interpreter": 0, - "pointRounding": 0, + "AntiAlias": 1, "applyKerning": 0, - "fontName": "Atkinson Hyperlegible", - "styleName": "Bold", - "size": 34.0, + "ascender": 39, + "ascenderOffset": 0, "bold": false, - "italic": false, + "canGenerateBitmap": true, "charset": 0, - "AntiAlias": 1, "first": 0, - "last": 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)", - "includeTTF": false, - "TTFName": "", - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "ascenderOffset": 0, - "ascender": 39, + "fontName": "Atkinson Hyperlegible", + "glyphOperations": 0, "glyphs": { - "32": {"x":2,"y":2,"w":15,"h":54,"character":32,"shift":15,"offset":0,}, - "33": {"x":189,"y":170,"w":10,"h":54,"character":33,"shift":13,"offset":1,}, - "34": {"x":171,"y":170,"w":16,"h":54,"character":34,"shift":19,"offset":1,}, - "35": {"x":135,"y":170,"w":34,"h":54,"character":35,"shift":35,"offset":1,}, - "36": {"x":106,"y":170,"w":27,"h":54,"character":36,"shift":28,"offset":1,}, - "37": {"x":61,"y":170,"w":43,"h":54,"character":37,"shift":44,"offset":1,}, - "38": {"x":28,"y":170,"w":31,"h":54,"character":38,"shift":32,"offset":1,}, - "39": {"x":18,"y":170,"w":8,"h":54,"character":39,"shift":10,"offset":1,}, - "40": {"x":2,"y":170,"w":14,"h":54,"character":40,"shift":17,"offset":1,}, - "41": {"x":485,"y":114,"w":14,"h":54,"character":41,"shift":17,"offset":1,}, - "42": {"x":201,"y":170,"w":16,"h":54,"character":42,"shift":20,"offset":2,}, - "43": {"x":459,"y":114,"w":24,"h":54,"character":43,"shift":28,"offset":2,}, - "44": {"x":420,"y":114,"w":10,"h":54,"character":44,"shift":13,"offset":1,}, - "45": {"x":402,"y":114,"w":16,"h":54,"character":45,"shift":19,"offset":1,}, - "46": {"x":390,"y":114,"w":10,"h":54,"character":46,"shift":13,"offset":1,}, - "47": {"x":368,"y":114,"w":20,"h":54,"character":47,"shift":20,"offset":0,}, - "48": {"x":339,"y":114,"w":27,"h":54,"character":48,"shift":30,"offset":2,}, - "49": {"x":323,"y":114,"w":14,"h":54,"character":49,"shift":20,"offset":2,}, - "50": {"x":297,"y":114,"w":24,"h":54,"character":50,"shift":27,"offset":1,}, - "51": {"x":270,"y":114,"w":25,"h":54,"character":51,"shift":27,"offset":1,}, - "52": {"x":242,"y":114,"w":26,"h":54,"character":52,"shift":28,"offset":1,}, - "53": {"x":432,"y":114,"w":25,"h":54,"character":53,"shift":28,"offset":1,}, - "54": {"x":219,"y":170,"w":25,"h":54,"character":54,"shift":29,"offset":2,}, - "55": {"x":246,"y":170,"w":24,"h":54,"character":55,"shift":25,"offset":0,}, - "56": {"x":272,"y":170,"w":26,"h":54,"character":56,"shift":28,"offset":1,}, - "57": {"x":342,"y":226,"w":23,"h":54,"character":57,"shift":25,"offset":1,}, - "58": {"x":330,"y":226,"w":10,"h":54,"character":58,"shift":13,"offset":1,}, - "59": {"x":318,"y":226,"w":10,"h":54,"character":59,"shift":13,"offset":1,}, - "60": {"x":292,"y":226,"w":24,"h":54,"character":60,"shift":26,"offset":1,}, - "61": {"x":266,"y":226,"w":24,"h":54,"character":61,"shift":28,"offset":2,}, - "62": {"x":240,"y":226,"w":24,"h":54,"character":62,"shift":26,"offset":1,}, - "63": {"x":213,"y":226,"w":25,"h":54,"character":63,"shift":28,"offset":1,}, - "64": {"x":179,"y":226,"w":32,"h":54,"character":64,"shift":34,"offset":1,}, - "65": {"x":145,"y":226,"w":32,"h":54,"character":65,"shift":31,"offset":0,}, - "66": {"x":116,"y":226,"w":27,"h":54,"character":66,"shift":29,"offset":1,}, - "67": {"x":85,"y":226,"w":29,"h":54,"character":67,"shift":31,"offset":1,}, - "68": {"x":54,"y":226,"w":29,"h":54,"character":68,"shift":31,"offset":1,}, - "69": {"x":27,"y":226,"w":25,"h":54,"character":69,"shift":26,"offset":1,}, - "70": {"x":2,"y":226,"w":23,"h":54,"character":70,"shift":25,"offset":1,}, - "71": {"x":469,"y":170,"w":30,"h":54,"character":71,"shift":33,"offset":1,}, - "72": {"x":439,"y":170,"w":28,"h":54,"character":72,"shift":31,"offset":1,}, - "73": {"x":420,"y":170,"w":17,"h":54,"character":73,"shift":21,"offset":2,}, - "74": {"x":394,"y":170,"w":24,"h":54,"character":74,"shift":25,"offset":0,}, - "75": {"x":363,"y":170,"w":29,"h":54,"character":75,"shift":30,"offset":1,}, - "76": {"x":338,"y":170,"w":23,"h":54,"character":76,"shift":24,"offset":1,}, - "77": {"x":300,"y":170,"w":36,"h":54,"character":77,"shift":38,"offset":1,}, - "78": {"x":211,"y":114,"w":29,"h":54,"character":78,"shift":32,"offset":1,}, - "79": {"x":176,"y":114,"w":33,"h":54,"character":79,"shift":35,"offset":1,}, - "80": {"x":147,"y":114,"w":27,"h":54,"character":80,"shift":29,"offset":1,}, - "81": {"x":76,"y":58,"w":35,"h":54,"character":81,"shift":35,"offset":1,}, - "82": {"x":31,"y":58,"w":28,"h":54,"character":82,"shift":30,"offset":1,}, - "83": {"x":2,"y":58,"w":27,"h":54,"character":83,"shift":28,"offset":1,}, - "84": {"x":461,"y":2,"w":28,"h":54,"character":84,"shift":28,"offset":0,}, - "85": {"x":432,"y":2,"w":27,"h":54,"character":85,"shift":30,"offset":1,}, - "86": {"x":400,"y":2,"w":30,"h":54,"character":86,"shift":30,"offset":0,}, - "87": {"x":358,"y":2,"w":40,"h":54,"character":87,"shift":40,"offset":0,}, - "88": {"x":324,"y":2,"w":32,"h":54,"character":88,"shift":32,"offset":0,}, - "89": {"x":291,"y":2,"w":31,"h":54,"character":89,"shift":31,"offset":0,}, - "90": {"x":263,"y":2,"w":26,"h":54,"character":90,"shift":28,"offset":1,}, - "91": {"x":61,"y":58,"w":13,"h":54,"character":91,"shift":15,"offset":1,}, - "92": {"x":241,"y":2,"w":20,"h":54,"character":92,"shift":20,"offset":0,}, - "93": {"x":208,"y":2,"w":13,"h":54,"character":93,"shift":15,"offset":1,}, - "94": {"x":183,"y":2,"w":23,"h":54,"character":94,"shift":27,"offset":2,}, - "95": {"x":161,"y":2,"w":20,"h":54,"character":95,"shift":19,"offset":0,}, - "96": {"x":149,"y":2,"w":10,"h":54,"character":96,"shift":14,"offset":2,}, - "97": {"x":123,"y":2,"w":24,"h":54,"character":97,"shift":25,"offset":0,}, - "98": {"x":97,"y":2,"w":24,"h":54,"character":98,"shift":27,"offset":2,}, - "99": {"x":73,"y":2,"w":22,"h":54,"character":99,"shift":24,"offset":1,}, - "100": {"x":46,"y":2,"w":25,"h":54,"character":100,"shift":27,"offset":1,}, - "101": {"x":19,"y":2,"w":25,"h":54,"character":101,"shift":26,"offset":1,}, - "102": {"x":223,"y":2,"w":16,"h":54,"character":102,"shift":17,"offset":0,}, - "103": {"x":113,"y":58,"w":24,"h":54,"character":103,"shift":27,"offset":1,}, - "104": {"x":359,"y":58,"w":22,"h":54,"character":104,"shift":26,"offset":2,}, - "105": {"x":139,"y":58,"w":12,"h":54,"character":105,"shift":14,"offset":1,}, - "106": {"x":105,"y":114,"w":15,"h":54,"character":106,"shift":12,"offset":-4,}, - "107": {"x":79,"y":114,"w":24,"h":54,"character":107,"shift":26,"offset":2,}, - "108": {"x":64,"y":114,"w":13,"h":54,"character":108,"shift":14,"offset":2,}, - "109": {"x":26,"y":114,"w":36,"h":54,"character":109,"shift":40,"offset":2,}, - "110": {"x":2,"y":114,"w":22,"h":54,"character":110,"shift":26,"offset":2,}, - "111": {"x":477,"y":58,"w":24,"h":54,"character":111,"shift":26,"offset":1,}, - "112": {"x":451,"y":58,"w":24,"h":54,"character":112,"shift":27,"offset":2,}, - "113": {"x":419,"y":58,"w":30,"h":54,"character":113,"shift":27,"offset":1,}, - "114": {"x":402,"y":58,"w":15,"h":54,"character":114,"shift":17,"offset":2,}, - "115": {"x":122,"y":114,"w":23,"h":54,"character":115,"shift":24,"offset":0,}, - "116": {"x":383,"y":58,"w":17,"h":54,"character":116,"shift":17,"offset":0,}, - "117": {"x":335,"y":58,"w":22,"h":54,"character":117,"shift":26,"offset":2,}, - "118": {"x":309,"y":58,"w":24,"h":54,"character":118,"shift":24,"offset":0,}, - "119": {"x":274,"y":58,"w":33,"h":54,"character":119,"shift":33,"offset":0,}, - "120": {"x":247,"y":58,"w":25,"h":54,"character":120,"shift":24,"offset":0,}, - "121": {"x":221,"y":58,"w":24,"h":54,"character":121,"shift":23,"offset":0,}, - "122": {"x":197,"y":58,"w":22,"h":54,"character":122,"shift":23,"offset":1,}, - "123": {"x":180,"y":58,"w":15,"h":54,"character":123,"shift":17,"offset":1,}, - "124": {"x":170,"y":58,"w":8,"h":54,"character":124,"shift":11,"offset":1,}, - "125": {"x":153,"y":58,"w":15,"h":54,"character":125,"shift":17,"offset":1,}, - "126": {"x":367,"y":226,"w":22,"h":54,"character":126,"shift":24,"offset":1,}, - "9647": {"x":391,"y":226,"w":26,"h":54,"character":9647,"shift":44,"offset":9,}, + "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", + }, + "pointRounding": 0, "ranges": [ {"lower":32,"upper":127,}, {"lower":9647,"upper":9647,}, ], "regenerateBitmap": false, - "canGenerateBitmap": true, - "maintainGms1Font": false, - "parent": { - "name": "Fonts", - "path": "folders/Fonts.yy", + "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, } \ No newline at end of file diff --git a/fonts/f_pixel/f_pixel.yy b/fonts/f_pixel/f_pixel.yy index fd305e9..44c3c0f 100644 --- a/fonts/f_pixel/f_pixel.yy +++ b/fonts/f_pixel/f_pixel.yy @@ -2,137 +2,140 @@ "resourceType": "GMFont", "resourceVersion": "1.0", "name": "f_pixel", - "hinting": 0, - "glyphOperations": 0, - "interpreter": 0, - "pointRounding": 0, + "AntiAlias": 0, "applyKerning": 0, - "fontName": "04b03", - "styleName": "Regular", - "size": 6.0, + "ascender": 6, + "ascenderOffset": 0, "bold": true, - "italic": false, + "canGenerateBitmap": true, "charset": 0, - "AntiAlias": 0, "first": 0, - "last": 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)", - "includeTTF": false, - "TTFName": "", - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "ascenderOffset": 0, - "ascender": 6, + "fontName": "04b03", + "glyphOperations": 0, "glyphs": { - "32": {"x":2,"y":2,"w":4,"h":8,"character":32,"shift":4,"offset":0,}, - "33": {"x":2,"y":32,"w":1,"h":8,"character":33,"shift":2,"offset":0,}, - "34": {"x":122,"y":22,"w":3,"h":8,"character":34,"shift":4,"offset":0,}, - "35": {"x":115,"y":22,"w":5,"h":8,"character":35,"shift":6,"offset":0,}, - "36": {"x":109,"y":22,"w":4,"h":8,"character":36,"shift":5,"offset":0,}, - "37": {"x":102,"y":22,"w":5,"h":8,"character":37,"shift":6,"offset":0,}, - "38": {"x":95,"y":22,"w":5,"h":8,"character":38,"shift":6,"offset":0,}, - "39": {"x":92,"y":22,"w":1,"h":8,"character":39,"shift":2,"offset":0,}, - "40": {"x":88,"y":22,"w":2,"h":8,"character":40,"shift":3,"offset":0,}, - "41": {"x":84,"y":22,"w":2,"h":8,"character":41,"shift":3,"offset":0,}, - "42": {"x":5,"y":32,"w":3,"h":8,"character":42,"shift":4,"offset":0,}, - "43": {"x":79,"y":22,"w":3,"h":8,"character":43,"shift":4,"offset":0,}, - "44": {"x":69,"y":22,"w":2,"h":8,"character":44,"shift":3,"offset":0,}, - "45": {"x":64,"y":22,"w":3,"h":8,"character":45,"shift":4,"offset":0,}, - "46": {"x":61,"y":22,"w":1,"h":8,"character":46,"shift":2,"offset":0,}, - "47": {"x":54,"y":22,"w":5,"h":8,"character":47,"shift":6,"offset":0,}, - "48": {"x":48,"y":22,"w":4,"h":8,"character":48,"shift":5,"offset":0,}, - "49": {"x":44,"y":22,"w":2,"h":8,"character":49,"shift":3,"offset":0,}, - "50": {"x":38,"y":22,"w":4,"h":8,"character":50,"shift":5,"offset":0,}, - "51": {"x":32,"y":22,"w":4,"h":8,"character":51,"shift":5,"offset":0,}, - "52": {"x":26,"y":22,"w":4,"h":8,"character":52,"shift":5,"offset":0,}, - "53": {"x":73,"y":22,"w":4,"h":8,"character":53,"shift":5,"offset":0,}, - "54": {"x":10,"y":32,"w":4,"h":8,"character":54,"shift":5,"offset":0,}, - "55": {"x":16,"y":32,"w":4,"h":8,"character":55,"shift":5,"offset":0,}, - "56": {"x":22,"y":32,"w":4,"h":8,"character":56,"shift":5,"offset":0,}, - "57": {"x":13,"y":42,"w":4,"h":8,"character":57,"shift":5,"offset":0,}, - "58": {"x":10,"y":42,"w":1,"h":8,"character":58,"shift":2,"offset":0,}, - "59": {"x":7,"y":42,"w":1,"h":8,"character":59,"shift":2,"offset":0,}, - "60": {"x":2,"y":42,"w":3,"h":8,"character":60,"shift":4,"offset":0,}, - "61": {"x":120,"y":32,"w":3,"h":8,"character":61,"shift":4,"offset":0,}, - "62": {"x":115,"y":32,"w":3,"h":8,"character":62,"shift":4,"offset":0,}, - "63": {"x":109,"y":32,"w":4,"h":8,"character":63,"shift":5,"offset":0,}, - "64": {"x":102,"y":32,"w":5,"h":8,"character":64,"shift":6,"offset":0,}, - "65": {"x":96,"y":32,"w":4,"h":8,"character":65,"shift":5,"offset":0,}, - "66": {"x":90,"y":32,"w":4,"h":8,"character":66,"shift":5,"offset":0,}, - "67": {"x":85,"y":32,"w":3,"h":8,"character":67,"shift":4,"offset":0,}, - "68": {"x":79,"y":32,"w":4,"h":8,"character":68,"shift":5,"offset":0,}, - "69": {"x":74,"y":32,"w":3,"h":8,"character":69,"shift":4,"offset":0,}, - "70": {"x":69,"y":32,"w":3,"h":8,"character":70,"shift":4,"offset":0,}, - "71": {"x":63,"y":32,"w":4,"h":8,"character":71,"shift":5,"offset":0,}, - "72": {"x":57,"y":32,"w":4,"h":8,"character":72,"shift":5,"offset":0,}, - "73": {"x":52,"y":32,"w":3,"h":8,"character":73,"shift":4,"offset":0,}, - "74": {"x":46,"y":32,"w":4,"h":8,"character":74,"shift":5,"offset":0,}, - "75": {"x":40,"y":32,"w":4,"h":8,"character":75,"shift":5,"offset":0,}, - "76": {"x":35,"y":32,"w":3,"h":8,"character":76,"shift":4,"offset":0,}, - "77": {"x":28,"y":32,"w":5,"h":8,"character":77,"shift":6,"offset":0,}, - "78": {"x":20,"y":22,"w":4,"h":8,"character":78,"shift":5,"offset":0,}, - "79": {"x":14,"y":22,"w":4,"h":8,"character":79,"shift":5,"offset":0,}, - "80": {"x":8,"y":22,"w":4,"h":8,"character":80,"shift":5,"offset":0,}, - "81": {"x":2,"y":12,"w":4,"h":8,"character":81,"shift":5,"offset":0,}, - "82": {"x":115,"y":2,"w":4,"h":8,"character":82,"shift":5,"offset":0,}, - "83": {"x":109,"y":2,"w":4,"h":8,"character":83,"shift":5,"offset":0,}, - "84": {"x":104,"y":2,"w":3,"h":8,"character":84,"shift":4,"offset":0,}, - "85": {"x":98,"y":2,"w":4,"h":8,"character":85,"shift":5,"offset":0,}, - "86": {"x":92,"y":2,"w":4,"h":8,"character":86,"shift":5,"offset":0,}, - "87": {"x":85,"y":2,"w":5,"h":8,"character":87,"shift":6,"offset":0,}, - "88": {"x":79,"y":2,"w":4,"h":8,"character":88,"shift":5,"offset":0,}, - "89": {"x":73,"y":2,"w":4,"h":8,"character":89,"shift":5,"offset":0,}, - "90": {"x":68,"y":2,"w":3,"h":8,"character":90,"shift":4,"offset":0,}, - "91": {"x":121,"y":2,"w":2,"h":8,"character":91,"shift":3,"offset":0,}, - "92": {"x":61,"y":2,"w":5,"h":8,"character":92,"shift":6,"offset":0,}, - "93": {"x":52,"y":2,"w":2,"h":8,"character":93,"shift":3,"offset":0,}, - "94": {"x":47,"y":2,"w":3,"h":8,"character":94,"shift":4,"offset":0,}, - "95": {"x":41,"y":2,"w":4,"h":8,"character":95,"shift":5,"offset":0,}, - "96": {"x":37,"y":2,"w":2,"h":8,"character":96,"shift":3,"offset":0,}, - "97": {"x":31,"y":2,"w":4,"h":8,"character":97,"shift":5,"offset":0,}, - "98": {"x":25,"y":2,"w":4,"h":8,"character":98,"shift":5,"offset":0,}, - "99": {"x":20,"y":2,"w":3,"h":8,"character":99,"shift":4,"offset":0,}, - "100": {"x":14,"y":2,"w":4,"h":8,"character":100,"shift":5,"offset":0,}, - "101": {"x":8,"y":2,"w":4,"h":8,"character":101,"shift":5,"offset":0,}, - "102": {"x":56,"y":2,"w":3,"h":8,"character":102,"shift":4,"offset":0,}, - "103": {"x":8,"y":12,"w":4,"h":8,"character":103,"shift":5,"offset":0,}, - "104": {"x":66,"y":12,"w":4,"h":8,"character":104,"shift":5,"offset":0,}, - "105": {"x":14,"y":12,"w":1,"h":8,"character":105,"shift":2,"offset":0,}, - "106": {"x":122,"y":12,"w":2,"h":8,"character":106,"shift":3,"offset":0,}, - "107": {"x":116,"y":12,"w":4,"h":8,"character":107,"shift":5,"offset":0,}, - "108": {"x":113,"y":12,"w":1,"h":8,"character":108,"shift":2,"offset":0,}, - "109": {"x":106,"y":12,"w":5,"h":8,"character":109,"shift":6,"offset":0,}, - "110": {"x":100,"y":12,"w":4,"h":8,"character":110,"shift":5,"offset":0,}, - "111": {"x":94,"y":12,"w":4,"h":8,"character":111,"shift":5,"offset":0,}, - "112": {"x":88,"y":12,"w":4,"h":8,"character":112,"shift":5,"offset":0,}, - "113": {"x":82,"y":12,"w":4,"h":8,"character":113,"shift":5,"offset":0,}, - "114": {"x":77,"y":12,"w":3,"h":8,"character":114,"shift":4,"offset":0,}, - "115": {"x":2,"y":22,"w":4,"h":8,"character":115,"shift":5,"offset":0,}, - "116": {"x":72,"y":12,"w":3,"h":8,"character":116,"shift":4,"offset":0,}, - "117": {"x":60,"y":12,"w":4,"h":8,"character":117,"shift":5,"offset":0,}, - "118": {"x":54,"y":12,"w":4,"h":8,"character":118,"shift":5,"offset":0,}, - "119": {"x":47,"y":12,"w":5,"h":8,"character":119,"shift":6,"offset":0,}, - "120": {"x":42,"y":12,"w":3,"h":8,"character":120,"shift":4,"offset":0,}, - "121": {"x":36,"y":12,"w":4,"h":8,"character":121,"shift":5,"offset":0,}, - "122": {"x":30,"y":12,"w":4,"h":8,"character":122,"shift":5,"offset":0,}, - "123": {"x":25,"y":12,"w":3,"h":8,"character":123,"shift":4,"offset":0,}, - "124": {"x":22,"y":12,"w":1,"h":8,"character":124,"shift":2,"offset":0,}, - "125": {"x":17,"y":12,"w":3,"h":8,"character":125,"shift":4,"offset":0,}, - "126": {"x":19,"y":42,"w":4,"h":8,"character":126,"shift":5,"offset":0,}, - "9647": {"x":25,"y":42,"w":4,"h":8,"character":9647,"shift":8,"offset":2,}, + "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", + }, + "pointRounding": 0, "ranges": [ {"lower":32,"upper":127,}, {"lower":9647,"upper":9647,}, ], "regenerateBitmap": false, - "canGenerateBitmap": true, - "maintainGms1Font": false, - "parent": { - "name": "Fonts", - "path": "folders/Fonts.yy", + "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, } \ 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 7a845ad..d92debe 100644 --- a/objects/__obj_stanncam_manager/__obj_stanncam_manager.yy +++ b/objects/__obj_stanncam_manager/__obj_stanncam_manager.yy @@ -2,35 +2,35 @@ "resourceType": "GMObject", "resourceVersion": "1.0", "name": "__obj_stanncam_manager", - "spriteId": null, - "solid": false, - "visible": true, - "managed": true, - "spriteMaskId": null, - "persistent": true, - "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, - "physicsAngularDamping": 0.1, - "physicsFriction": 0.2, - "physicsStartAwake": true, - "physicsKinematic": false, - "physicsShapePoints": [], "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":4,"eventType":7,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":2,"eventType":3,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":76,"eventType":8,"collisionObjectId":null,}, + {"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,}, ], - "properties": [], + "managed": true, "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, } \ No newline at end of file diff --git a/objects/obj_ball/Step_0.gml b/objects/obj_ball/Step_0.gml index f8deb58..a9401be 100644 --- a/objects/obj_ball/Step_0.gml +++ b/objects/obj_ball/Step_0.gml @@ -1,8 +1,2 @@ /// @description -image_angle+=2; - - - - - - +image_angle+=2; \ No newline at end of file diff --git a/objects/obj_ball/obj_ball.yy b/objects/obj_ball/obj_ball.yy index 0de244a..7812ffc 100644 --- a/objects/obj_ball/obj_ball.yy +++ b/objects/obj_ball/obj_ball.yy @@ -2,35 +2,35 @@ "resourceType": "GMObject", "resourceVersion": "1.0", "name": "obj_ball", - "spriteId": { - "name": "spr_ball", - "path": "sprites/spr_ball/spr_ball.yy", - }, - "solid": false, - "visible": true, + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + ], "managed": true, - "spriteMaskId": null, - "persistent": false, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, + "persistent": false, "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, "physicsFriction": 0.2, - "physicsStartAwake": true, + "physicsGroup": 1, "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, "physicsShapePoints": [], - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, - ], + "physicsStartAwake": true, "properties": [], - "overriddenProperties": [], - "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "solid": false, + "spriteId": { + "name": "spr_ball", + "path": "sprites/spr_ball/spr_ball.yy", }, + "spriteMaskId": null, + "visible": true, } \ No newline at end of file diff --git a/objects/obj_camera/Mouse_60.gml b/objects/obj_camera/Mouse_60.gml new file mode 100644 index 0000000..189177a --- /dev/null +++ b/objects/obj_camera/Mouse_60.gml @@ -0,0 +1,5 @@ +/// @description +var zoom_amount = cam1.zoom_amount; +zoom_amount-=0.05 +zoom_amount = clamp(zoom_amount,0.1,2); +cam1.zoom(zoom_amount,0); \ No newline at end of file diff --git a/objects/obj_camera/Mouse_61.gml b/objects/obj_camera/Mouse_61.gml new file mode 100644 index 0000000..703cbba --- /dev/null +++ b/objects/obj_camera/Mouse_61.gml @@ -0,0 +1,5 @@ +/// @description +var zoom_amount = cam1.zoom_amount; +zoom_amount+=0.05 +zoom_amount = clamp(zoom_amount,0.1,2); +cam1.zoom(zoom_amount,0); \ No newline at end of file diff --git a/objects/obj_camera/obj_camera.yy b/objects/obj_camera/obj_camera.yy index 8b411e6..8b8999c 100644 --- a/objects/obj_camera/obj_camera.yy +++ b/objects/obj_camera/obj_camera.yy @@ -2,36 +2,38 @@ "resourceType": "GMObject", "resourceVersion": "1.0", "name": "obj_camera", - "spriteId": null, - "solid": false, - "visible": true, - "managed": true, - "spriteMaskId": null, - "persistent": true, - "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, - "physicsAngularDamping": 0.1, - "physicsFriction": 0.2, - "physicsStartAwake": true, - "physicsKinematic": false, - "physicsShapePoints": [], "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":77,"eventType":8,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, + {"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,}, ], - "properties": [], + "managed": true, "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, } \ No newline at end of file diff --git a/objects/obj_player/obj_player.yy b/objects/obj_player/obj_player.yy index 307b96e..48ee8cf 100644 --- a/objects/obj_player/obj_player.yy +++ b/objects/obj_player/obj_player.yy @@ -2,37 +2,37 @@ "resourceType": "GMObject", "resourceVersion": "1.0", "name": "obj_player", - "spriteId": { - "name": "spr_player_idle", - "path": "sprites/spr_player_idle/spr_player_idle.yy", - }, - "solid": false, - "visible": true, + "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,}, + ], "managed": true, - "spriteMaskId": null, - "persistent": false, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, + "persistent": false, "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, "physicsFriction": 0.2, - "physicsStartAwake": true, + "physicsGroup": 1, "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, "physicsShapePoints": [], - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, - ], + "physicsStartAwake": true, "properties": [], - "overriddenProperties": [], - "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "solid": false, + "spriteId": { + "name": "spr_player_idle", + "path": "sprites/spr_player_idle/spr_player_idle.yy", }, + "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 e248fe1..260af1e 100644 --- a/objects/obj_player2/obj_player2.yy +++ b/objects/obj_player2/obj_player2.yy @@ -2,38 +2,38 @@ "resourceType": "GMObject", "resourceVersion": "1.0", "name": "obj_player2", - "spriteId": { - "name": "spr_player2_idle", - "path": "sprites/spr_player2_idle/spr_player2_idle.yy", - }, - "solid": false, - "visible": true, + "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,}, + ], "managed": true, - "spriteMaskId": null, - "persistent": false, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, + "persistent": false, "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, "physicsFriction": 0.2, - "physicsStartAwake": true, + "physicsGroup": 1, "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, "physicsShapePoints": [], - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,}, - ], + "physicsStartAwake": true, "properties": [], - "overriddenProperties": [], - "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "solid": false, + "spriteId": { + "name": "spr_player2_idle", + "path": "sprites/spr_player2_idle/spr_player2_idle.yy", }, + "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 7e69da6..17dc750 100644 --- a/objects/obj_tv/obj_tv.yy +++ b/objects/obj_tv/obj_tv.yy @@ -2,36 +2,36 @@ "resourceType": "GMObject", "resourceVersion": "1.0", "name": "obj_tv", - "spriteId": { - "name": "spr_tv", - "path": "sprites/spr_tv/spr_tv.yy", - }, - "solid": false, - "visible": true, + "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,}, + ], "managed": true, - "spriteMaskId": null, - "persistent": false, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, + "persistent": false, "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, "physicsFriction": 0.2, - "physicsStartAwake": true, + "physicsGroup": 1, "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, "physicsShapePoints": [], - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,}, - ], + "physicsStartAwake": true, "properties": [], - "overriddenProperties": [], - "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "solid": false, + "spriteId": { + "name": "spr_tv", + "path": "sprites/spr_tv/spr_tv.yy", }, + "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 513b3c1..98c963d 100644 --- a/options/android/options_android.yy +++ b/options/android/options_android.yy @@ -2,75 +2,76 @@ "resourceType": "GMAndroidOptions", "resourceVersion": "1.0", "name": "Android", - "option_android_sync_amazon": false, - "option_android_display_name": "Created with GameMaker", - "option_android_version": "1.0.0.0", - "option_android_tools_from_version": false, - "option_android_build_tools": "", - "option_android_support_lib": "", - "option_android_target_sdk": "", - "option_android_minimum_sdk": "", - "option_android_compile_sdk": "", - "option_android_package_domain": "com", - "option_android_package_company": "company", - "option_android_package_product": "game", - "option_android_arch_armv7": false, + "option_android_application_tag_inject": "", "option_android_arch_arm64": true, + "option_android_arch_armv7": false, "option_android_arch_x86_64": false, - "option_android_orient_portrait": true, - "option_android_orient_portrait_flipped": true, - "option_android_orient_landscape": true, - "option_android_orient_landscape_flipped": true, - "option_android_gamepad_support": true, - "option_android_lint": false, - "option_android_install_location": 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_launchscreen_fill": 0, - "option_android_splashscreen_background_colour": 255, - "option_android_tv_banner": "${base_options_dir}/android/tv_banner.png", - "option_android_interpolate_pixels": false, - "option_android_screen_depth": 0, + "option_android_build_tools": "", + "option_android_compile_sdk": "", "option_android_device_support": 0, - "option_android_scale": 0, - "option_android_texture_page": "2048x2048", - "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_hdpi": "${base_options_dir}/android/icons/hdpi.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_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_hdpi": "${base_options_dir}/android/icons_adaptive/hdpi.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_hdpi": "${base_options_dir}/android/icons_adaptivebg/hdpi.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_use_facebook": false, - "option_android_facebook_id": "", - "option_android_facebook_app_display_name": "", - "option_android_google_cloud_saving": false, - "option_android_google_services_app_id": "", - "option_android_permission_write_external_storage": false, - "option_android_permission_read_phone_state": false, - "option_android_permission_network_state": false, - "option_android_permission_internet": true, + "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_application_tag_inject": "", - "option_android_google_apk_expansion": false, - "option_android_google_dynamic_asset_delivery": false, - "option_android_google_licensing_public_key": "", - "option_android_tv_isgame": true, + "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_use_facebook": false, + "option_android_version": "1.0.0.0", } \ No newline at end of file diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy index e9ba8bc..eda4049 100644 --- a/options/html5/options_html5.yy +++ b/options/html5/options_html5.yy @@ -2,32 +2,32 @@ "resourceType": "GMHtml5Options", "resourceVersion": "1.0", "name": "HTML5", - "option_html5_browser_title": "Created with GameMaker", - "option_html5_version": "1.0.0.0", - "option_html5_foldername": "html5game", - "option_html5_outputname": "index.html", - "option_html5_splash_png": "${base_options_dir}/html5/splash.png", - "option_html5_usesplash": false, - "option_html5_outputdebugtoconsole": true, - "option_html5_display_cursor": true, - "option_html5_localrunalert": true, - "option_html5_index": "", - "option_html5_loadingbar": "", - "option_html5_jsprepend": "", - "option_html5_icon": "${base_options_dir}/html5/fav.ico", "option_html5_allow_fullscreen": true, - "option_html5_interpolate_pixels": true, + "option_html5_browser_title": "Created with GameMaker", "option_html5_centregame": false, - "option_html5_usebuiltinparticles": true, - "option_html5_usebuiltinfont": true, - "option_html5_webgl": 2, - "option_html5_scale": 0, - "option_html5_texture_page": "2048x2048", - "option_html5_use_facebook": false, - "option_html5_facebook_id": "", + "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, } \ No newline at end of file diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy index c8ed85c..382c05f 100644 --- a/options/ios/options_ios.yy +++ b/options/ios/options_ios.yy @@ -2,43 +2,45 @@ "resourceType": "GMiOSOptions", "resourceVersion": "1.3", "name": "iOS", - "option_ios_display_name": "Created with GameMaker", "option_ios_bundle_name": "com.company.game", - "option_ios_version": "1.0.0.0", - "option_ios_output_dir": "~/gamemakerstudio2", - "option_ios_team_id": "", - "option_ios_orientation_portrait": true, - "option_ios_orientation_portrait_flipped": true, - "option_ios_orientation_landscape": true, - "option_ios_orientation_landscape_flipped": true, - "option_ios_devices": 2, + "option_ios_cocoapods_checkbox": true, "option_ios_defer_home_indicator": false, - "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_ipad_app_76": "${base_options_dir}/ios/icons/app/ipad_76.png", + "option_ios_devices": 2, + "option_ios_display_name": "Created with GameMaker", + "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_pro_app_167": "${base_options_dir}/ios/icons/app/ipad_pro_167.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_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_iphone_spotlight_80": "${base_options_dir}/ios/icons/spotlight/iphone_80.png", - "option_ios_icon_iphone_spotlight_120": "${base_options_dir}/ios/icons/spotlight/iphone_120.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_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_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_splashscreen_background_colour": 255, + "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_launchscreen_fill": 0, - "option_ios_interpolate_pixels": false, - "option_ios_half_ipad1_textures": false, + "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_podfile_path": "${options_dir}/ios/Podfile", - "option_ios_podfile_lock_path": "${options_dir}/ios/Podfile.lock", + "option_ios_version": "1.0.0.0", } \ No newline at end of file diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy index d3575b0..b6c5a50 100644 --- a/options/linux/options_linux.yy +++ b/options/linux/options_linux.yy @@ -2,23 +2,23 @@ "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_version": "1.0.0.0", - "option_linux_maintainer_email": "", - "option_linux_homepage": "http://www.yoyogames.com", - "option_linux_short_desc": "", - "option_linux_long_desc": "", - "option_linux_splash_screen": "${base_options_dir}/linux/splash/splash.png", "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_start_fullscreen": false, - "option_linux_allow_fullscreen": false, "option_linux_interpolate_pixels": true, - "option_linux_display_cursor": true, - "option_linux_sync": false, + "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_enable_steam": false, - "option_linux_disable_sandbox": false, + "option_linux_version": "1.0.0.0", } \ No newline at end of file diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index 4ac3ef9..3d2d171 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -2,33 +2,34 @@ "resourceType": "GMMacOptions", "resourceVersion": "1.0", "name": "macOS", - "option_mac_display_name": "Created with GameMaker", + "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_version": "1.0.0.0", - "option_mac_output_dir": "~/gamemakerstudio2", - "option_mac_team_id": "", - "option_mac_signing_identity": "Developer ID Application:", + "option_mac_apple_sign_in": false, + "option_mac_arm64": true, + "option_mac_build_app_store": false, "option_mac_copyright": "", - "option_mac_splash_png": "${base_options_dir}/mac/splash/splash.png", + "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_menu_dock": false, - "option_mac_display_cursor": true, - "option_mac_start_fullscreen": false, - "option_mac_allow_fullscreen": false, "option_mac_interpolate_pixels": true, - "option_mac_vsync": false, + "option_mac_menu_dock": false, + "option_mac_min_version": "10.10", + "option_mac_output_dir": "~/gamemakerstudio2", "option_mac_resize_window": false, - "option_mac_enable_retina": 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_build_app_store": false, - "option_mac_allow_incoming_network": false, - "option_mac_allow_outgoing_network": false, - "option_mac_app_category": "Games", - "option_mac_enable_steam": false, - "option_mac_disable_sandbox": false, + "option_mac_version": "1.0.0.0", + "option_mac_vsync": false, "option_mac_x86_64": true, - "option_mac_arm64": true, - "option_mac_apple_sign_in": false, } \ No newline at end of file diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 1c0c58b..ee43cbb 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -2,19 +2,19 @@ "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_game_speed": 60, "option_mips_for_3d_textures": false, - "option_draw_colour": 4294967295, - "option_window_colour": 255, - "option_steam_app_id": "0", "option_sci_usesci": false, - "option_author": "", - "option_collision_compatibility": false, - "option_copy_on_write_enabled": false, "option_spine_licence": false, - "option_template_image": "${base_options_dir}/main/template_image.png", - "option_template_icon": "${base_options_dir}/main/template_icon.png", + "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, } \ No newline at end of file diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy index 9571f96..411ce67 100644 --- a/options/operagx/options_operagx.yy +++ b/options/operagx/options_operagx.yy @@ -1,18 +1,27 @@ { "resourceType": "GMOperaGXOptions", - "resourceVersion": "1.0", + "resourceVersion": "1.1", "name": "operagx", - "option_operagx_version": "1.0.0.0", - "option_operagx_next_version": "1.0.0.0", - "option_operagx_game_name": "${project_name}", - "option_operagx_interpolate_pixels": true, - "option_operagx_scale": 0, - "option_operagx_texture_page": "2048x2048", "option_operagx_display_cursor": true, - "option_operagx_guid": "", - "option_operagx_team_name": "", - "option_operagx_team_id": "", "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", } \ No newline at end of file diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy index 3de05de..7e17b25 100644 --- a/options/tvos/options_tvos.yy +++ b/options/tvos/options_tvos.yy @@ -2,25 +2,27 @@ "resourceType": "GMtvOSOptions", "resourceVersion": "1.3", "name": "tvOS", - "option_tvos_display_name": "Made in GameMaker", "option_tvos_bundle_name": "com.company.game", - "option_tvos_version": "1.0.0.0", - "option_tvos_output_dir": "~/GameMakerStudio2/tvOS", - "option_tvos_team_id": "", + "option_tvos_cocoapods_checkbox": true, + "option_tvos_display_cursor": false, + "option_tvos_display_name": "Made in GameMaker", + "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_icon_1280": "${base_options_dir}/tvos/icons/1280.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_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_interpolate_pixels": true, - "option_tvos_scale": 0, - "option_tvos_texture_page": "2048x2048", - "option_tvos_display_cursor": false, - "option_tvos_podfile_path": "${options_dir}\\tvos\\Podfile", - "option_tvos_podfile_lock_path": "${options_dir}\\tvos\\Podfile.lock", + "option_tvos_version": "1.0.0.0", } \ No newline at end of file diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 83bb76a..0321be2 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -2,33 +2,33 @@ "resourceType": "GMWindowsOptions", "resourceVersion": "1.1", "name": "Windows", - "option_windows_display_name": "Created with GameMaker", - "option_windows_executable_name": "${project_name}.exe", - "option_windows_version": "1.0.0.0", + "option_windows_allow_fullscreen_switching": false, + "option_windows_borderless": false, "option_windows_company_info": "YoYo Games Ltd", - "option_windows_product_info": "Created with GameMaker", + "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": "Created with GameMaker", + "option_windows_enable_steam": false, + "option_windows_executable_name": "${project_name}.exe", "option_windows_icon": "${base_options_dir}/windows/icons/icon.ico", - "option_windows_save_location": 0, - "option_windows_splash_screen": "${base_options_dir}/windows/splash/splash.png", - "option_windows_use_splash": false, - "option_windows_start_fullscreen": false, - "option_windows_allow_fullscreen_switching": false, - "option_windows_interpolate_pixels": false, - "option_windows_vsync": false, - "option_windows_resize_window": false, - "option_windows_borderless": false, - "option_windows_scale": 0, - "option_windows_copy_exe_to_dest": false, - "option_windows_sleep_margin": 10, - "option_windows_texture_page": "2048x2048", "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_enable_steam": false, - "option_windows_disable_sandbox": false, + "option_windows_product_info": "Created with GameMaker", + "option_windows_resize_window": false, + "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": "1.0.0.0", + "option_windows_vsync": false, } \ No newline at end of file diff --git a/rooms/rm_test/rm_test.yy b/rooms/rm_test/rm_test.yy index 27ed23e..b03c8e1 100644 --- a/rooms/rm_test/rm_test.yy +++ b/rooms/rm_test/rm_test.yy @@ -2,34 +2,10 @@ "resourceType": "GMRoom", "resourceVersion": "1.0", "name": "rm_test", - "isDnd": false, - "volume": 1.0, - "parentRoom": null, - "views": [ - {"inherit":false,"visible":true,"xview":0,"yview":0,"wview":10,"hview":10,"xport":0,"yport":0,"wport":10,"hport":10,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - ], - "layers": [ - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","instances":[ - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_4BF294D5","properties":[],"isDnd":false,"objectId":{"name":"obj_ball","path":"objects/obj_ball/obj_ball.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":112.0,"y":80.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_BEB4411","properties":[],"isDnd":false,"objectId":{"name":"obj_player","path":"objects/obj_player/obj_player.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":160.0,"y":160.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_606FE50A","properties":[],"isDnd":false,"objectId":{"name":"obj_player2","path":"objects/obj_player2/obj_player2.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":272.0,"y":144.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_15296A95","properties":[],"isDnd":false,"objectId":{"name":"obj_tv","path":"objects/obj_tv/obj_tv.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":304.0,"y":48.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_6B735959","properties":[],"isDnd":false,"objectId":{"name":"obj_camera","path":"objects/obj_camera/obj_camera.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":208.0,"y":112.0,}, - ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, - {"resourceType":"GMRTileLayer","resourceVersion":"1.1","name":"Tiles_1","tilesetId":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"x":0,"y":0,"tiles":{"TileDataFormat":1,"SerialiseWidth":14,"SerialiseHeight":8,"TileCompressedData":[ --112,1,],},"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, - {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Backgrounds_1","spriteId":{"name":"spr_bg","path":"sprites/spr_bg/spr_bg.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":true,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":1.0,"animationSpeedType":1,"userdefinedAnimFPS":false,"visible":true,"depth":200,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, - ], - "inheritLayers": false, "creationCodeFile": "${project_dir}/rooms/Room1/RoomCreationCode.gml", "inheritCode": false, + "inheritCreationOrder": false, + "inheritLayers": false, "instanceCreationOrder": [ {"name":"inst_6B735959","path":"rooms/rm_test/rm_test.yy",}, {"name":"inst_4BF294D5","path":"rooms/rm_test/rm_test.yy",}, @@ -37,20 +13,24 @@ {"name":"inst_606FE50A","path":"rooms/rm_test/rm_test.yy",}, {"name":"inst_15296A95","path":"rooms/rm_test/rm_test.yy",}, ], - "inheritCreationOrder": false, - "sequenceId": null, - "roomSettings": { - "inheritRoomSettings": false, - "Width": 448, - "Height": 256, - "persistent": false, - }, - "viewSettings": { - "inheritViewSettings": false, - "enableViews": true, - "clearViewBackground": true, - "clearDisplayBuffer": true, + "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_6B735959","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":208.0,"y":112.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,}, + ], + "parent": { + "name": "Rooms", + "path": "folders/Rooms.yy", }, + "parentRoom": null, "physicsSettings": { "inheritPhysicsSettings": false, "PhysicsWorld": false, @@ -58,8 +38,28 @@ "PhysicsWorldGravityY": 10.0, "PhysicsWorldPixToMetres": 0.1, }, - "parent": { - "name": "Rooms", - "path": "folders/Rooms.yy", + "roomSettings": { + "Height": 256, + "inheritRoomSettings": false, + "persistent": false, + "Width": 448, + }, + "sequenceId": null, + "views": [ + {"hborder":32,"hport":10,"hspeed":-1,"hview":10,"inherit":false,"objectId":null,"vborder":32,"visible":true,"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,}, + {"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,}, + {"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": true, + "enableViews": true, + "inheritViewSettings": false, }, + "volume": 1.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 061022d..bf577ab 100644 --- a/scripts/draw_text_outline/draw_text_outline.yy +++ b/scripts/draw_text_outline/draw_text_outline.yy @@ -2,8 +2,8 @@ "resourceType": "GMScript", "resourceVersion": "1.0", "name": "draw_text_outline", - "isDnD": false, "isCompatibility": false, + "isDnD": false, "parent": { "name": "Scripts", "path": "folders/Scripts.yy", diff --git a/scripts/stanncam/stanncam.gml b/scripts/stanncam/stanncam.gml index 9a7f064..bb5a639 100644 --- a/scripts/stanncam/stanncam.gml +++ b/scripts/stanncam/stanncam.gml @@ -6,8 +6,9 @@ /// @param {Real} [height_=global.game_h] /// @param {Bool} [surface_extra_on_=false] - use surface_extra in regular draw events /// @param {Bool} [smooth_draw_=true] - use fractional camera position when drawing -function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, surface_extra_on_ = false, smooth_draw_ = true) constructor{ - #region init +/// @param {Bool} [smooth_zoom_=true] - zooming in and out isn't pixel perfect, but it will look smoother +function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, surface_extra_on_ = false, smooth_draw_ = true, smooth_zoom_ = true) constructor{ +#region init //whenever a new cam is created number_of_cams gets incremented cam_id = __obj_stanncam_manager.number_of_cams; @@ -22,8 +23,8 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, array_set(global.stanncams,cam_id,self); #endregion - - #region variables + +#region variables x = x_; y = y_; @@ -42,9 +43,13 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, //wether to use the fractional camera position when drawing the camera contents. Else it will be snapped to nearest integer smooth_draw = smooth_draw_; + smooth_zoom = smooth_zoom_; __x_frac = 0; __y_frac = 0; + //which animation curve to use for moving/zooming the camera + anim_curve = stanncam_ac_ease; + anim_curve_zoom = stanncam_ac_ease; surface = -1; @@ -65,7 +70,7 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, __t = 0; //zoom - __zoom_amount = 1; + zoom_amount = 1; __zoom_x = 0; __zoom_y = 0; __zooming = false; @@ -89,10 +94,9 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, #endregion - #endregion +#endregion - #region Step - /// @function __step +#region Step /// @description gets called every step /// @ignore static __step = function(){ @@ -120,18 +124,19 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, } else if(__moving){ //gradually moves camera into position based on duration - x = stanncam_ease_in_out(__t,__xStart,__xTo-__xStart,__duration); - y = stanncam_ease_in_out(__t,__yStart,__yTo-__yStart,__duration); + x = stanncam_animcurve(__t,__xStart,__xTo,__duration,anim_curve); + y = stanncam_animcurve(__t,__yStart,__yTo,__duration,anim_curve); __t++; if(x == __xTo && y == __yTo) __moving = false; } #region screen-shake - var stanncam_shake_x = stanncam_shake(__shake_time++,__shake_magnitude,__shake_length); - var stanncam_shake_y = stanncam_shake(__shake_time++,__shake_magnitude,__shake_length); + var stanncam_shake_x = stanncam_shake(__shake_time,__shake_magnitude,__shake_length); + var stanncam_shake_y = stanncam_shake(__shake_time,__shake_magnitude,__shake_length); __shake_x = stanncam_shake_x; __shake_y = stanncam_shake_y; + __shake_time++; #endregion #region constrains camera to room bounds @@ -144,18 +149,34 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, #region zooming if(__zooming){ //gradually zooms camera - __zoom_amount = stanncam_ease_in_out(__t_zoom,__zoomStart,__zoomTo-__zoomStart,__zoom_duration); + zoom_amount = stanncam_animcurve(__t_zoom,__zoomStart,__zoomTo,__zoom_duration,anim_curve_zoom); __t_zoom++; - if(__zoom_amount == __zoomTo) __zooming = false; - camera_set_view_size(view_camera[cam_id],width*__zoom_amount,height*__zoom_amount); - __zoom_x = ((width *__zoom_amount) - width)/2; - __zoom_y = ((height*__zoom_amount) - height)/2; + + // if smooth zoom is off maintains pixel perfection even when zooming in and out + // if on it is handled by the draw events + if(smooth_zoom){ + //When zooming in, the surface will be shrinked when the zooming is done + //When zooming out, the surface will be enlarged immedietly + if(__zoomTo >= zoom_amount){ + var ceiled_zoom = ceil(__zoomTo); //ensures the new surface size is a whole number + surface_resize(surface,width*ceiled_zoom,height*ceiled_zoom); + camera_set_view_size(view_camera[cam_id],width*ceiled_zoom,height*ceiled_zoom); + + __update_resolution(); + } + } + else camera_set_view_size(view_camera[cam_id],width*zoom_amount,height*zoom_amount); + + __zoom_x = ((width *zoom_amount) - width)/2; + __zoom_y = ((height*zoom_amount) - height)/2; + + if(zoom_amount == __zoomTo) __zooming = false; } #endregion //update camera view - var new_x = x - ((width / 2) + __shake_x + __zoom_x); - var new_y = y - ((height / 2) + __shake_y + __zoom_y); + var new_x = x - (width / 2) - __zoom_x + __shake_x; + var new_y = y - (height / 2) - __zoom_y + __shake_y; //seperates position into whole and fractional parts if(smooth_draw == true){ @@ -165,40 +186,42 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, __x_frac = 0; __y_frac = 0; } - - new_x = floor(new_x); - new_y = floor(new_y); + + new_x = floor(abs(new_x)) * sign(new_x); + new_y = floor(abs(new_y)) * sign(new_y); camera_set_view_pos(view_camera[cam_id], new_x, new_y); } - #endregion +#endregion - #region Drawing functions +#region Drawing functions - /// @function draw /// @param {Real} x_ /// @param {Real} y_ /// @param {Real} [scale_x_=1] /// @param {Real} [scale_y_=1] static draw = function(x_,y_,scale_x_ = 1, scale_y_ = 1){ __check_surface(); - var x_scale = __obj_stanncam_manager.display_res_w / global.game_w - var y_scale = __obj_stanncam_manager.display_res_h / global.game_h - x_ *= x_scale; - y_ *= y_scale; + //offsets position to match with display resoultion + x_ *= (__obj_stanncam_manager.display_res_w / global.game_w); + y_ *= (__obj_stanncam_manager.display_res_h / global.game_h); x_ += stanncam_fullscreen_ratio_compensate(); var w_ = surface_get_width(surface); var h_ = surface_get_height(surface); + if(smooth_zoom){ //if smooth zoom is on, it scales the entire surface when drawn + scale_x_/= zoom_amount; + scale_y_/= zoom_amount; + } + draw_surface_part_ext(surface,__x_frac,__y_frac,w_,h_,x_,y_,__display_scale_x*scale_x_,__display_scale_y*scale_y_,-1,1); } - #endregion +#endregion - #region Dynamic functions +#region Dynamic functions - /// @function clone /// @description returns a clone of the stanncam /// @returns {Struct.stanncam} static clone = function(){ @@ -209,11 +232,14 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, clone.bounds_w = bounds_w; clone.bounds_h = bounds_h; clone.follow = follow; + clone.smooth_draw = smooth_draw; + clone.smooth_zoom = smooth_zoom; + clone.anim_curve = anim_curve; + clone.anim_curve_zoom= anim_curve_zoom; return clone; } - /// @function set_size /// @description sets the camera size /// @param {Real} _width /// @param {Real} _height @@ -222,10 +248,9 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, height = _height; surface_resize(surface,width,height); __update_resolution(); - camera_set_view_size(view_camera[cam_id],width*__zoom_amount,height*__zoom_amount); + camera_set_view_size(view_camera[cam_id],width*zoom_amount,height*zoom_amount); } - /// @function shake_screen /// @description makes the camera shake /// @param {Real} magnitude /// @param {Real} duration - duration in frames @@ -235,7 +260,6 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, __shake_time = 0; } - /// @function move /// @description moves the camera to a position over a duration /// @param {Real} _x /// @param {Real} _y @@ -261,27 +285,17 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, } } - /// @function zoom /// @description zooms the camera over a duration /// @param {Real} _zoom /// @param {Real} _duration static zoom = function(_zoom, _duration){ - if(_duration == 0){ - __zoom_amount = _zoom; - camera_set_view_size(view_camera[cam_id],width*_zoom,height*_zoom); - __zoom_x = ((width *__zoom_amount) - width)/2; - __zoom_y = ((height*__zoom_amount) - height)/2; - - } else { - __zooming = true; - __t_zoom = 0; - __zoomStart = __zoom_amount; - } + __zooming = true; + __t_zoom = 0; + __zoomStart = zoom_amount; __zoomTo = _zoom; __zoom_duration = _duration; } - /// @function set_speed /// @description changes the speed of the camera /// @param {Real} _spd - how fast the camera can move /// @param {Real} threshold - minimum distance for the speed to have full effect @@ -290,14 +304,12 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, spd_threshold = threshold; } - /// @function get_x /// @description get camera corner x position. if need the middle of the camera use x /// @returns {Real} static get_x = function(){ return camera_get_view_x(view_camera[cam_id]); } - /// @function get_y /// @description get camera corner y position. if need the middle of the camera use y /// @returns {Real} static get_y = function(){ @@ -307,49 +319,43 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, /// @description gets the mouse x position within room relative to the camera /// @returns {Real} static get_mouse_x = function(){ - return (((display_mouse_get_x() - window_get_x() - stanncam_fullscreen_ratio_compensate()) / (__display_scale_x * width)) * width) + get_x(); + return (((display_mouse_get_x() - window_get_x() - stanncam_fullscreen_ratio_compensate()) / (__display_scale_x * width)) * width * zoom_amount) + get_x(); } - /// @function room_to_gui_x /// @description gets the mouse y position within room relative to the camera /// @returns {Real} static get_mouse_y = function(){ - return (((display_mouse_get_y() - window_get_y()) / (__display_scale_y * height)) * height) + get_y(); + return (((display_mouse_get_y() - window_get_y()) / (__display_scale_y * height)) * height * zoom_amount) + get_y(); } - /// @function room_to_gui_x /// @description returns the room x position as the position on the gui relative to camera /// @param {Real} x_ /// @returns {Real} static room_to_gui_x = function(x_){ - return (x_-get_x()-__x_frac)*stanncam_get_gui_scale_x()/__zoom_amount; + return (x_-get_x()-__x_frac)*stanncam_get_gui_scale_x()/zoom_amount; } - /// @function room_to_gui_y /// @description returns the room y position as the position on the gui relative to camera /// @param {Real} y_ /// @returns {Real} static room_to_gui_y = function(y_){ - return (y_-get_y()-__y_frac)*stanncam_get_gui_scale_y()/__zoom_amount; + return (y_-get_y()-__y_frac)*stanncam_get_gui_scale_y()/zoom_amount; } - /// @function room_to_display_x /// @description returns the room x position as the position on the display relative to camera /// @param {Real} x_ /// @returns {Real} // function room_to_display_x(x_){ - // return (x_-get_x())*stanncam_get_res_scale_x()/__zoom_amount; + // return (x_-get_x())*stanncam_get_res_scale_x()/zoom_amount; // } - /// @function room_to_display_y /// @description returns the room y position as the position on the display relative to camera /// @param {Real} y_ /// @returns {Real} //function room_to_display_y(y_){ - // return (y_-get_y())*stanncam_get_res_scale_y()/__zoom_amount; + // return (y_-get_y())*stanncam_get_res_scale_y()/zoom_amount; //} - /// @function out_of_bounds /// @description returns if the position is outside camera bounds /// @param {Real} x_ /// @param {Real} y_ @@ -360,14 +366,13 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, var col = ( //uses bounding box to see if it's within the camera view x_ < get_x() + margin || y_ < get_y() + margin || - x_ > (get_x() + (width * __zoom_amount)) - margin || - y_ > (get_y() + (height * __zoom_amount)) - margin + x_ > (get_x() + (width * zoom_amount)) - margin || + y_ > (get_y() + (height * zoom_amount)) - margin ); return col; } - /// @function destroy static destroy = function(){ follow = -1; array_set(global.stanncams,cam_id,-1); @@ -376,16 +381,14 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, __destroyed = true; } - /// @function is_destroyed /// @returns {Bool} static is_destroyed = function(){ return __destroyed; } - #endregion +#endregion - #region Internal functions +#region Internal functions - /// @function __check_viewports /// @description enables viewports and sets viewports size /// @ignore static __check_viewports = function(){ @@ -393,7 +396,6 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, set_size(width,height); } - /// @function __check_surface /// @descriptionchecks if surface_extra exists and else creates it and attaches it /// @ignore static __check_surface = function(){ @@ -406,7 +408,6 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, } } - /// @function __update_resolution /// @description updates cameras drawing resolution /// @ignore static __update_resolution = function(){ @@ -416,7 +417,6 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, view_set_camera(cam_id, view_camera[cam_id]); } - /// @function __predraw /// @description clears the surface /// @ignore static __predraw = function(){ @@ -429,5 +429,5 @@ function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, surface_reset_target(); view_set_surface_id(cam_id,surface); } - #endregion +#endregion } diff --git a/scripts/stanncam/stanncam.yy b/scripts/stanncam/stanncam.yy index 6aa6f93..1c91e48 100644 --- a/scripts/stanncam/stanncam.yy +++ b/scripts/stanncam/stanncam.yy @@ -2,8 +2,8 @@ "resourceType": "GMScript", "resourceVersion": "1.0", "name": "stanncam", - "isDnD": false, "isCompatibility": false, + "isDnD": false, "parent": { "name": "STANNcam", "path": "folders/STANNcam.yy", diff --git a/scripts/stanncam_animcurve/stanncam_animcurve.gml b/scripts/stanncam_animcurve/stanncam_animcurve.gml new file mode 100644 index 0000000..67338bf --- /dev/null +++ b/scripts/stanncam_animcurve/stanncam_animcurve.gml @@ -0,0 +1,17 @@ +/// @function stanncam_animcurve +/// @param {Real} _t - time +/// @param {Real} _start +/// @param {Real} _finish +/// @param {Real} _dur - duration in frames +/// @param {Real} _anim_curve - animation curve index +/// @returns {Real} +function stanncam_animcurve(_t,_start,_finish,_dur,_anim_curve = stanncam_ac_ease){ + + if(_dur == 0){ + return _finish; + } + + var _channel = animcurve_get_channel(_anim_curve, 0); + var _val = animcurve_channel_evaluate(_channel, (_t/_dur)); + return lerp(_start,_finish,_val); +} \ No newline at end of file diff --git a/scripts/stanncam_ease_in_out/stanncam_ease_in_out.yy b/scripts/stanncam_animcurve/stanncam_animcurve.yy similarity index 85% rename from scripts/stanncam_ease_in_out/stanncam_ease_in_out.yy rename to scripts/stanncam_animcurve/stanncam_animcurve.yy index 6e15eb5..29a910a 100644 --- a/scripts/stanncam_ease_in_out/stanncam_ease_in_out.yy +++ b/scripts/stanncam_animcurve/stanncam_animcurve.yy @@ -1,9 +1,9 @@ { "resourceType": "GMScript", "resourceVersion": "1.0", - "name": "stanncam_ease_in_out", - "isDnD": false, + "name": "stanncam_animcurve", "isCompatibility": false, + "isDnD": false, "parent": { "name": "Miscellaneous", "path": "folders/STANNcam/Miscellaneous.yy", diff --git a/scripts/stanncam_ease_in_out/stanncam_ease_in_out.gml b/scripts/stanncam_ease_in_out/stanncam_ease_in_out.gml deleted file mode 100644 index d050908..0000000 --- a/scripts/stanncam_ease_in_out/stanncam_ease_in_out.gml +++ /dev/null @@ -1,12 +0,0 @@ -/// @function stanncam_ease_in_out -/// @param {Real} t - time -/// @param {Real} b - start -/// @param {Real} c - change -/// @param {Real} d - duration -/// @returns {Real} -function stanncam_ease_in_out(t, b, c, d) { - t /= d/2; - if (t < 1) return c/2*t*t +b; - t--; - return -c/2 * (t * (t-2) -1) + b; -} diff --git a/scripts/stanncam_manager/stanncam_manager.yy b/scripts/stanncam_manager/stanncam_manager.yy index 7a5cb2e..3dfb95b 100644 --- a/scripts/stanncam_manager/stanncam_manager.yy +++ b/scripts/stanncam_manager/stanncam_manager.yy @@ -2,8 +2,8 @@ "resourceType": "GMScript", "resourceVersion": "1.0", "name": "stanncam_manager", - "isDnD": false, "isCompatibility": false, + "isDnD": false, "parent": { "name": "STANNcam", "path": "folders/STANNcam.yy", diff --git a/scripts/stanncam_shake/stanncam_shake.yy b/scripts/stanncam_shake/stanncam_shake.yy index be56eef..1b3dd78 100644 --- a/scripts/stanncam_shake/stanncam_shake.yy +++ b/scripts/stanncam_shake/stanncam_shake.yy @@ -2,8 +2,8 @@ "resourceType": "GMScript", "resourceVersion": "1.0", "name": "stanncam_shake", - "isDnD": false, "isCompatibility": false, + "isDnD": false, "parent": { "name": "Miscellaneous", "path": "folders/STANNcam/Miscellaneous.yy", diff --git a/sprites/spr_arrow/spr_arrow.yy b/sprites/spr_arrow/spr_arrow.yy index 8a630ee..1a65770 100644 --- a/sprites/spr_arrow/spr_arrow.yy +++ b/sprites/spr_arrow/spr_arrow.yy @@ -2,76 +2,76 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_arrow", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 1, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 45, "bbox_left": 0, "bbox_right": 69, "bbox_top": 0, - "bbox_bottom": 45, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 70, - "height": 46, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 51, - "gridY": 51, + "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",}, ], + "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,}, + ], + "nineSlice": null, + "origin": 1, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_arrow", - "timeUnits": 1, + "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, - "autoRecord": true, - "volume": 1.0, - "length": 2.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9fcbf0d7-aff9-4f58-a7b8-6d3e8488396c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"02009123-e026-494d-9c2c-e3d3248d6208","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"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,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 35, "yorigin": 0, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4a98bca5-875b-452d-9fec-1b80c036d5f2","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"79bf20b2-e262-4265-8a1a-d57f21af8b6a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"Layer 1",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "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 1747633..12d1890 100644 --- a/sprites/spr_arrow_small/spr_arrow_small.yy +++ b/sprites/spr_arrow_small/spr_arrow_small.yy @@ -2,75 +2,75 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_arrow_small", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 1, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 6, "bbox_left": 0, "bbox_right": 9, "bbox_top": 1, - "bbox_bottom": 6, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 10, - "height": 7, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 51, - "gridY": 51, + "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",}, ], + "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,}, + ], + "nineSlice": null, + "origin": 1, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_arrow_small", - "timeUnits": 1, + "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, - "autoRecord": true, - "volume": 1.0, - "length": 2.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"66b03764-d23e-4c1d-a2d2-f4be575eacc0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"5a961afb-4f00-43e9-a866-e8054f5bea6b","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"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,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 5, "yorigin": 0, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3210fd01-7382-4aa7-b86e-b2f4f7df87bd","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "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 e307b7f..f0ab786 100644 --- a/sprites/spr_ball/spr_ball.yy +++ b/sprites/spr_ball/spr_ball.yy @@ -2,73 +2,73 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_ball", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 4, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 63, "bbox_left": 0, "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 63, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 64, - "height": 64, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"89a15171-096d-4273-b5e1-bed216c67447",}, ], + "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,}, + ], + "nineSlice": null, + "origin": 4, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_ball", - "timeUnits": 1, + "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, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"08c475be-3a5e-499d-a363-9bc528f6eda7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"89a15171-096d-4273-b5e1-bed216c67447","path":"sprites/spr_ball/spr_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"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,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 32, "yorigin": 32, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a85f0884-bccb-4d64-91e7-91e920726f39","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "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 0022f8c..2136090 100644 --- a/sprites/spr_bg/spr_bg.yy +++ b/sprites/spr_bg/spr_bg.yy @@ -2,74 +2,74 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_bg", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 0, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 31, "bbox_left": 0, "bbox_right": 31, "bbox_top": 0, - "bbox_bottom": 31, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 32, - "height": 32, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3",}, ], + "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,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_bg", - "timeUnits": 1, + "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, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c6af7e4d-0598-4b4b-b35b-f9024321a62a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_bg/spr_bg.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"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,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 0, "yorigin": 0, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d797d937-1b8b-4f7e-aa6e-b01b3d661531","visible":true,"isLocked":false,"blendMode":0,"opacity":80.0,"displayName":"Layer 1",}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bed84a38-1422-4fe6-8871-3c553508ef23","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "type": 0, + "VTile": false, + "width": 32, } \ 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 ff2e111..01c4226 100644 --- a/sprites/spr_player2_idle/spr_player2_idle.yy +++ b/sprites/spr_player2_idle/spr_player2_idle.yy @@ -2,73 +2,73 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_player2_idle", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 7, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 10, "bbox_left": 3, "bbox_right": 8, "bbox_top": 1, - "bbox_bottom": 10, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 12, - "height": 11, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09",}, ], + "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,}, + ], + "nineSlice": null, + "origin": 7, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_player2_idle", - "timeUnits": 1, + "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, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f4086892-5bd8-4310-a65a-ca7ad42739c2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player2_idle/spr_player2_idle.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"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,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 6, "yorigin": 11, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "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 3d16522..93a1414 100644 --- a/sprites/spr_player2_moving/spr_player2_moving.yy +++ b/sprites/spr_player2_moving/spr_player2_moving.yy @@ -2,75 +2,75 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_player2_moving", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 7, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 10, "bbox_left": 1, "bbox_right": 10, "bbox_top": 1, - "bbox_bottom": 10, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 12, - "height": 11, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "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",}, ], + "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,}, + ], + "nineSlice": null, + "origin": 7, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_player2_moving", - "timeUnits": 1, + "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, - "autoRecord": true, - "volume": 1.0, - "length": 2.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"df5daded-5d7c-47cc-9099-87a5c13bffae","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player2_moving/spr_player2_moving.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"9807de71-eb91-48eb-ae37-abde603ed83a","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","path":"sprites/spr_player2_moving/spr_player2_moving.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"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,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 6, "yorigin": 11, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "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 9afe8f2..ad453e1 100644 --- a/sprites/spr_player_idle/spr_player_idle.yy +++ b/sprites/spr_player_idle/spr_player_idle.yy @@ -2,73 +2,73 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_player_idle", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 7, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 10, "bbox_left": 3, "bbox_right": 8, "bbox_top": 1, - "bbox_bottom": 10, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 12, - "height": 11, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09",}, ], + "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,}, + ], + "nineSlice": null, + "origin": 7, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_player_idle", - "timeUnits": 1, + "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, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a1a3f3b3-0702-4892-adaf-39099977cbc1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player_idle/spr_player_idle.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"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,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 6, "yorigin": 11, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "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 cc7fc98..8760ede 100644 --- a/sprites/spr_player_moving/spr_player_moving.yy +++ b/sprites/spr_player_moving/spr_player_moving.yy @@ -2,75 +2,75 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_player_moving", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 7, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 10, "bbox_left": 1, "bbox_right": 10, "bbox_top": 1, - "bbox_bottom": 10, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 12, - "height": 11, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "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",}, ], + "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,}, + ], + "nineSlice": null, + "origin": 7, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_player_moving", - "timeUnits": 1, + "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, - "autoRecord": true, - "volume": 1.0, - "length": 2.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"eac30cb0-0d0f-4d52-b911-fcb0e9caf624","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player_moving/spr_player_moving.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"088325c1-7772-4ba3-ac9e-62e51881a76c","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","path":"sprites/spr_player_moving/spr_player_moving.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"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,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 6, "yorigin": 11, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "type": 0, + "VTile": false, + "width": 12, } \ 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 b520114..3b010df 100644 --- a/sprites/spr_tile_bg/spr_tile_bg.yy +++ b/sprites/spr_tile_bg/spr_tile_bg.yy @@ -2,73 +2,73 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_tile_bg", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 0, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 31, "bbox_left": 32, "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 64, - "height": 32, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3",}, ], + "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,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_tile_bg", - "timeUnits": 1, + "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, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"309dd744-34d6-46cb-b4bd-9c86c59311e5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_tile_bg/spr_tile_bg.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"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,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 0, "yorigin": 0, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bed84a38-1422-4fe6-8871-3c553508ef23","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "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 8ed08c7..6d21bee 100644 --- a/sprites/spr_tv/spr_tv.yy +++ b/sprites/spr_tv/spr_tv.yy @@ -2,73 +2,73 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_tv", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 0, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 63, "bbox_left": 0, "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 63, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 64, - "height": 64, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ca68646b-1689-4d76-b7ab-b0c225cc8d31",}, ], + "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,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_tv", - "timeUnits": 1, + "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, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"d337b439-7ffc-4d02-973f-5a39b2dc1705","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ca68646b-1689-4d76-b7ab-b0c225cc8d31","path":"sprites/spr_tv/spr_tv.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"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,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 0, "yorigin": 0, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9bc939da-2fec-4e13-aa9c-105eb44921f3","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "type": 0, + "VTile": false, + "width": 64, } \ No newline at end of file diff --git a/stanncam.resource_order b/stanncam.resource_order new file mode 100644 index 0000000..f7cb374 --- /dev/null +++ b/stanncam.resource_order @@ -0,0 +1,28 @@ +{ + "FolderOrderSettings": [ + {"name":"Animation_curves - add more if needed","order":5,"path":"folders/STANNcam/Animation_curves - add more if needed.yy",}, + ], + "ResourceOrderSettings": [ + {"name":"f_pixel","order":1,"path":"fonts/f_pixel/f_pixel.yy",}, + {"name":"obj_player","order":2,"path":"objects/obj_player/obj_player.yy",}, + {"name":"spr_arrow_small","order":1,"path":"sprites/spr_arrow_small/spr_arrow_small.yy",}, + {"name":"spr_tv","order":9,"path":"sprites/spr_tv/spr_tv.yy",}, + {"name":"stanncam","order":3,"path":"scripts/stanncam/stanncam.yy",}, + {"name":"stanncam_animcurve","order":1,"path":"scripts/stanncam_animcurve/stanncam_animcurve.yy",}, + {"name":"obj_camera","order":1,"path":"objects/obj_camera/obj_camera.yy",}, + {"name":"obj_player2","order":3,"path":"objects/obj_player2/obj_player2.yy",}, + {"name":"stanncam_ac_ease","order":1,"path":"animcurves/stanncam_ac_ease/stanncam_ac_ease.yy",}, + {"name":"stanncam_manager","order":4,"path":"scripts/stanncam_manager/stanncam_manager.yy",}, + {"name":"spr_tile_bg","order":8,"path":"sprites/spr_tile_bg/spr_tile_bg.yy",}, + {"name":"obj_tv","order":4,"path":"objects/obj_tv/obj_tv.yy",}, + {"name":"spr_bg","order":3,"path":"sprites/spr_bg/spr_bg.yy",}, + {"name":"spr_player_idle","order":4,"path":"sprites/spr_player_idle/spr_player_idle.yy",}, + {"name":"spr_ball","order":2,"path":"sprites/spr_ball/spr_ball.yy",}, + {"name":"stanncam_shake","order":2,"path":"scripts/stanncam_shake/stanncam_shake.yy",}, + {"name":"TileSet1","order":10,"path":"tilesets/TileSet1/TileSet1.yy",}, + {"name":"spr_player2_moving","order":7,"path":"sprites/spr_player2_moving/spr_player2_moving.yy",}, + {"name":"spr_player_moving","order":5,"path":"sprites/spr_player_moving/spr_player_moving.yy",}, + {"name":"stanncam_ac_bouncy","order":2,"path":"animcurves/stanncam_ac_bouncy/stanncam_ac_bouncy.yy",}, + {"name":"spr_player2_idle","order":6,"path":"sprites/spr_player2_idle/spr_player2_idle.yy",}, + ], +} \ No newline at end of file diff --git a/stanncam.yymps b/stanncam.yymps index 3e71e81..2a2d17f 100644 Binary files a/stanncam.yymps and b/stanncam.yymps differ diff --git a/stanncam.yyp b/stanncam.yyp index c6fb44e..f18f308 100644 --- a/stanncam.yyp +++ b/stanncam.yyp @@ -1,72 +1,66 @@ { "resourceType": "GMProject", - "resourceVersion": "1.6", + "resourceVersion": "1.7", "name": "stanncam", - "resources": [ - {"id":{"name":"f_pixel","path":"fonts/f_pixel/f_pixel.yy",},"order":1,}, - {"id":{"name":"obj_player","path":"objects/obj_player/obj_player.yy",},"order":2,}, - {"id":{"name":"spr_arrow_small","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},"order":1,}, - {"id":{"name":"spr_tv","path":"sprites/spr_tv/spr_tv.yy",},"order":9,}, - {"id":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},"order":0,}, - {"id":{"name":"stanncam","path":"scripts/stanncam/stanncam.yy",},"order":3,}, - {"id":{"name":"stanncam_ease_in_out","path":"scripts/stanncam_ease_in_out/stanncam_ease_in_out.yy",},"order":1,}, - {"id":{"name":"draw_text_outline","path":"scripts/draw_text_outline/draw_text_outline.yy",},"order":0,}, - {"id":{"name":"obj_camera","path":"objects/obj_camera/obj_camera.yy",},"order":1,}, - {"id":{"name":"obj_ball","path":"objects/obj_ball/obj_ball.yy",},"order":0,}, - {"id":{"name":"spr_arrow","path":"sprites/spr_arrow/spr_arrow.yy",},"order":0,}, - {"id":{"name":"obj_player2","path":"objects/obj_player2/obj_player2.yy",},"order":3,}, - {"id":{"name":"stanncam_manager","path":"scripts/stanncam_manager/stanncam_manager.yy",},"order":4,}, - {"id":{"name":"spr_tile_bg","path":"sprites/spr_tile_bg/spr_tile_bg.yy",},"order":8,}, - {"id":{"name":"obj_tv","path":"objects/obj_tv/obj_tv.yy",},"order":4,}, - {"id":{"name":"spr_bg","path":"sprites/spr_bg/spr_bg.yy",},"order":3,}, - {"id":{"name":"spr_player_idle","path":"sprites/spr_player_idle/spr_player_idle.yy",},"order":4,}, - {"id":{"name":"spr_ball","path":"sprites/spr_ball/spr_ball.yy",},"order":2,}, - {"id":{"name":"stanncam_shake","path":"scripts/stanncam_shake/stanncam_shake.yy",},"order":2,}, - {"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"order":10,}, - {"id":{"name":"spr_player2_moving","path":"sprites/spr_player2_moving/spr_player2_moving.yy",},"order":7,}, - {"id":{"name":"spr_player_moving","path":"sprites/spr_player_moving/spr_player_moving.yy",},"order":5,}, - {"id":{"name":"__obj_stanncam_manager","path":"objects/__obj_stanncam_manager/__obj_stanncam_manager.yy",},"order":0,}, - {"id":{"name":"spr_player2_idle","path":"sprites/spr_player2_idle/spr_player2_idle.yy",},"order":6,}, - {"id":{"name":"f_hires","path":"fonts/f_hires/f_hires.yy",},"order":0,}, - ], - "Options": [ - {"name":"Android","path":"options/android/options_android.yy",}, - {"name":"HTML5","path":"options/html5/options_html5.yy",}, - {"name":"iOS","path":"options/ios/options_ios.yy",}, - {"name":"Linux","path":"options/linux/options_linux.yy",}, - {"name":"macOS","path":"options/mac/options_mac.yy",}, - {"name":"Main","path":"options/main/options_main.yy",}, - {"name":"tvOS","path":"options/tvos/options_tvos.yy",}, - {"name":"Windows","path":"options/windows/options_windows.yy",}, - {"name":"operagx","path":"options/operagx/options_operagx.yy",}, + "AudioGroups": [ + {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,}, ], - "defaultScriptType": 1, - "isEcma": false, "configs": { - "name": "Default", "children": [], + "name": "Default", }, - "RoomOrderNodes": [ - {"roomId":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},}, - ], + "defaultScriptType": 1, "Folders": [ - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Fonts","folderPath":"folders/Fonts.yy","order":7,}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Objects","folderPath":"folders/Objects.yy","order":9,}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Rooms","folderPath":"folders/Rooms.yy","order":10,}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Scripts","folderPath":"folders/Scripts.yy","order":5,}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Sprites","folderPath":"folders/Sprites.yy","order":1,}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"STANNcam","folderPath":"folders/STANNcam.yy","order":11,}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Miscellaneous","folderPath":"folders/STANNcam/Miscellaneous.yy","order":1,}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Tile Sets","folderPath":"folders/Tile Sets.yy","order":2,}, - ], - "AudioGroups": [ - {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,}, - ], - "TextureGroups": [ - {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","isScaled":true,"compressFormat":"bz2","loadType":"default","directory":"","autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,}, + {"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":"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":"STANNcam","folderPath":"folders/STANNcam.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Miscellaneous","folderPath":"folders/STANNcam/Miscellaneous.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Tile Sets","folderPath":"folders/Tile Sets.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Animation_curves - add more if needed","folderPath":"folders/STANNcam/Animation_curves - add more if needed.yy",}, ], "IncludedFiles": [], + "isEcma": false, + "LibraryEmitters": [], "MetaData": { - "IDEVersion": "2022.0.0.19", + "IDEVersion": "2023.6.0.92", }, + "resources": [ + {"id":{"name":"f_pixel","path":"fonts/f_pixel/f_pixel.yy",},}, + {"id":{"name":"obj_player","path":"objects/obj_player/obj_player.yy",},}, + {"id":{"name":"spr_arrow_small","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},}, + {"id":{"name":"spr_tv","path":"sprites/spr_tv/spr_tv.yy",},}, + {"id":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},}, + {"id":{"name":"stanncam","path":"scripts/stanncam/stanncam.yy",},}, + {"id":{"name":"stanncam_animcurve","path":"scripts/stanncam_animcurve/stanncam_animcurve.yy",},}, + {"id":{"name":"draw_text_outline","path":"scripts/draw_text_outline/draw_text_outline.yy",},}, + {"id":{"name":"obj_camera","path":"objects/obj_camera/obj_camera.yy",},}, + {"id":{"name":"obj_ball","path":"objects/obj_ball/obj_ball.yy",},}, + {"id":{"name":"spr_arrow","path":"sprites/spr_arrow/spr_arrow.yy",},}, + {"id":{"name":"obj_player2","path":"objects/obj_player2/obj_player2.yy",},}, + {"id":{"name":"stanncam_ac_ease","path":"animcurves/stanncam_ac_ease/stanncam_ac_ease.yy",},}, + {"id":{"name":"stanncam_manager","path":"scripts/stanncam_manager/stanncam_manager.yy",},}, + {"id":{"name":"spr_tile_bg","path":"sprites/spr_tile_bg/spr_tile_bg.yy",},}, + {"id":{"name":"stanncam_ac_linear","path":"animcurves/stanncam_ac_linear/stanncam_ac_linear.yy",},}, + {"id":{"name":"obj_tv","path":"objects/obj_tv/obj_tv.yy",},}, + {"id":{"name":"spr_bg","path":"sprites/spr_bg/spr_bg.yy",},}, + {"id":{"name":"spr_player_idle","path":"sprites/spr_player_idle/spr_player_idle.yy",},}, + {"id":{"name":"spr_ball","path":"sprites/spr_ball/spr_ball.yy",},}, + {"id":{"name":"stanncam_shake","path":"scripts/stanncam_shake/stanncam_shake.yy",},}, + {"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},}, + {"id":{"name":"spr_player2_moving","path":"sprites/spr_player2_moving/spr_player2_moving.yy",},}, + {"id":{"name":"spr_player_moving","path":"sprites/spr_player_moving/spr_player_moving.yy",},}, + {"id":{"name":"__obj_stanncam_manager","path":"objects/__obj_stanncam_manager/__obj_stanncam_manager.yy",},}, + {"id":{"name":"stanncam_ac_bouncy","path":"animcurves/stanncam_ac_bouncy/stanncam_ac_bouncy.yy",},}, + {"id":{"name":"spr_player2_idle","path":"sprites/spr_player2_idle/spr_player2_idle.yy",},}, + {"id":{"name":"f_hires","path":"fonts/f_hires/f_hires.yy",},}, + ], + "RoomOrderNodes": [ + {"roomId":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},}, + ], + "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,}, + ], } \ No newline at end of file diff --git a/tilesets/TileSet1/TileSet1.yy b/tilesets/TileSet1/TileSet1.yy index 53763d7..05e7ea3 100644 --- a/tilesets/TileSet1/TileSet1.yy +++ b/tilesets/TileSet1/TileSet1.yy @@ -2,28 +2,29 @@ "resourceType": "GMTileSet", "resourceVersion": "1.0", "name": "TileSet1", + "autoTileSets": [], + "macroPageTiles": { + "SerialiseHeight": 0, + "SerialiseWidth": 0, + "TileSerialiseData": [], + }, + "out_columns": 1, + "out_tilehborder": 2, + "out_tilevborder": 2, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, "spriteId": { "name": "spr_tile_bg", "path": "sprites/spr_tile_bg/spr_tile_bg.yy", }, - "tileWidth": 32, - "tileHeight": 32, - "tilexoff": 0, - "tileyoff": 0, - "tilehsep": 0, - "tilevsep": 0, "spriteNoExport": true, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", }, - "out_tilehborder": 2, - "out_tilevborder": 2, - "out_columns": 1, "tile_count": 2, - "autoTileSets": [], - "tileAnimationFrames": [], - "tileAnimationSpeed": 15.0, "tileAnimation": { "FrameData": [ 0, @@ -31,13 +32,12 @@ ], "SerialiseFrameCount": 1, }, - "macroPageTiles": { - "SerialiseWidth": 0, - "SerialiseHeight": 0, - "TileSerialiseData": [], - }, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", - }, + "tileAnimationFrames": [], + "tileAnimationSpeed": 15.0, + "tileHeight": 32, + "tilehsep": 0, + "tilevsep": 0, + "tileWidth": 32, + "tilexoff": 0, + "tileyoff": 0, } \ No newline at end of file