diff --git a/stanncam.yymps b/stanncam.yymps index fa9b877..3e71e81 100644 Binary files a/stanncam.yymps and b/stanncam.yymps differ diff --git a/stanncam.yyp b/stanncam.yyp index 0c61e22..c6fb44e 100644 --- a/stanncam.yyp +++ b/stanncam.yyp @@ -1,7 +1,7 @@ { "resourceType": "GMProject", "resourceVersion": "1.6", - "name": "stanncam_lts", + "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,}, @@ -69,4 +69,4 @@ "MetaData": { "IDEVersion": "2022.0.0.19", }, -} +} \ No newline at end of file diff --git a/stanncam_lts.yyp b/stanncam_lts.yyp deleted file mode 100644 index 59bff4f..0000000 --- a/stanncam_lts.yyp +++ /dev/null @@ -1,72 +0,0 @@ -{ - "resourceType": "GMProject", - "resourceVersion": "1.6", - "name": "stanncam_lts", - "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":"stanncam_ease_in_out","path":"scripts/stanncam_ease_in_out/stanncam_ease_in_out.yy",},"order":0,}, - {"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":"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":"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":"stanncam_shake","path":"scripts/stanncam_shake/stanncam_shake.yy",},"order":1,}, - {"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",}, - ], - "defaultScriptType": 1, - "isEcma": false, - "configs": { - "name": "Default", - "children": [], - }, - "RoomOrderNodes": [ - {"roomId":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},}, - ], - "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,}, - ], - "IncludedFiles": [], - "MetaData": { - "IDEVersion": "2022.0.0.19", - }, -} \ No newline at end of file diff --git a/tilesets/TileSet1/TileSet1.yy b/tilesets/TileSet1/TileSet1.yy index 2991ebf..53763d7 100644 --- a/tilesets/TileSet1/TileSet1.yy +++ b/tilesets/TileSet1/TileSet1.yy @@ -2,10 +2,6 @@ "resourceType": "GMTileSet", "resourceVersion": "1.0", "name": "TileSet1", - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, "spriteId": { "name": "spr_tile_bg", "path": "sprites/spr_tile_bg/spr_tile_bg.yy", @@ -16,9 +12,13 @@ "tileyoff": 0, "tilehsep": 0, "tilevsep": 0, + "spriteNoExport": true, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, "out_tilehborder": 2, "out_tilevborder": 2, - "spriteNoExport": true, "out_columns": 1, "tile_count": 2, "autoTileSets": [],