From 3701c1ec0c0d2c985e56be8637b7ed43cb021024 Mon Sep 17 00:00:00 2001 From: RetroFriends Date: Sat, 7 May 2022 00:52:12 -0400 Subject: [PATCH] Fix to keyboard only crash bugs when no device settings are available --- InputCandy.yyp | 9 ++- objects/o_LevelController/Draw_73.gml | 4 +- .../o_LevelController/o_LevelController.yy | 4 +- options/main/options_main.yy | 8 ++- scripts/ICUI/ICUI.gml | 63 ++++++++++--------- scripts/InputCandy/InputCandy.gml | 2 + sprites/s_FPSClock30/s_FPSClock30.yy | 4 +- .../s_InputCandy_ICUI_icons.yy | 5 +- .../s_InputCandy_ICUI_mouse_cursor.yy | 5 +- .../s_InputCandy_Logo/s_InputCandy_Logo.yy | 5 +- .../s_InputCandy_Logo2/s_InputCandy_Logo2.yy | 5 +- .../s_InputCandy_Logo3/s_InputCandy_Logo3.yy | 5 +- .../s_InputCandy_TeetherTeaser.yy | 5 +- .../s_InputCandy_TestGameSprites.yy | 5 +- .../s_InputCandy_device_icons.yy | 5 +- .../s_InputCandy_gamepad_photos.yy | 5 +- .../s_LostAstronaut_Logo.yy | 5 +- .../s_SDLDB_Loading_Disc.yy | 5 +- 18 files changed, 88 insertions(+), 61 deletions(-) diff --git a/InputCandy.yyp b/InputCandy.yyp index 41c340f..b1186e3 100644 --- a/InputCandy.yyp +++ b/InputCandy.yyp @@ -49,9 +49,8 @@ {"name":"Windows","path":"options/windows/options_windows.yy",}, {"name":"operagx","path":"options/operagx/options_operagx.yy",}, ], - "isDnDProject": false, + "defaultScriptType": 1, "isEcma": false, - "tutorialPath": "", "configs": { "name": "Default", "children": [], @@ -91,15 +90,15 @@ {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",}, ], "TextureGroups": [ - {"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, + {"isScaled":true,"compressFormat":"bz2","autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, ], "IncludedFiles": [ {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"SDLDB.txt","resourceType":"GMIncludedFile",}, ], "MetaData": { - "IDEVersion": "2.3.6.595", + "IDEVersion": "2022.3.0.625", }, - "resourceVersion": "1.4", + "resourceVersion": "1.5", "name": "InputCandy", "tags": [], "resourceType": "GMProject", diff --git a/objects/o_LevelController/Draw_73.gml b/objects/o_LevelController/Draw_73.gml index a02ab92..197c3b1 100644 --- a/objects/o_LevelController/Draw_73.gml +++ b/objects/o_LevelController/Draw_73.gml @@ -1,7 +1,9 @@ for ( var i=0; i<__INPUTCANDY.max_players; i++ ) { if ( __INPUTCANDY.players[i].active ) { - var str="Player "+int(i+1)+": "+int(__INPUTCANDY.players[i].data.scored) + var str="Player "+int(i+1)+": " + +int(__INPUTCANDY.players[i].data.scored) + +" " + __IC.PlayerDiagnosticString(i+1); draw_text( 16, (i+1)*64, str ); } else if ( i == 0 or __INPUTCANDY.players[i].device != none ) { diff --git a/objects/o_LevelController/o_LevelController.yy b/objects/o_LevelController/o_LevelController.yy index e430196..af40995 100644 --- a/objects/o_LevelController/o_LevelController.yy +++ b/objects/o_LevelController/o_LevelController.yy @@ -18,8 +18,8 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"o_LevelController","path":"objects/o_LevelController/o_LevelController.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":73,"eventType":8,"collisionObjectId":null,"parent":{"name":"o_LevelController","path":"objects/o_LevelController/o_LevelController.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":73,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 61edea3..63c9635 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -1,5 +1,6 @@ { "option_gameguid": "41541d97-6ca8-4bf2-b1d8-275c0e9cdefd", + "option_gameid": "0", "option_game_speed": 60, "option_mips_for_3d_textures": false, "option_draw_colour": 4294967295, @@ -7,9 +8,14 @@ "option_steam_app_id": "0", "option_sci_usesci": false, "option_author": "", + "option_collision_compatibility": true, + "option_copy_on_write_enabled": true, "option_lastchanged": "", "option_spine_licence": false, - "resourceVersion": "1.2", + "option_template_image": "${base_options_dir}/main/template_image.png", + "option_template_icon": "${base_options_dir}/main/template_icon.png", + "option_template_description": null, + "resourceVersion": "1.4", "name": "Main", "tags": [], "resourceType": "GMMainOptions", diff --git a/scripts/ICUI/ICUI.gml b/scripts/ICUI/ICUI.gml index b037533..bef8dbd 100644 --- a/scripts/ICUI/ICUI.gml +++ b/scripts/ICUI/ICUI.gml @@ -689,8 +689,12 @@ function ICUI_Draw_device_select( exit_to ) { r.x,r.y,r.w,r.h ); } if ( k==__INPUTCANDY.player_using_keyboard_mouse ) { - draw_sprite_ext( s_InputCandy_device_icons, __ICI.GuessBestDeviceIcon(__INPUTCANDY.devices[__INPUTCANDY.players[k].device]),ox+cw/2,oy+rh/2, 1.0/sprite_get_width(s_InputCandy_device_icons)*swh*0.75, 1.0/sprite_get_height(s_InputCandy_device_icons)*swh*0.75, 0, c_white, 1.0 ); - draw_sprite_ext( s_InputCandy_device_icons, 0,ox+cw/2+cw/4,oy+rh/2+rh/4, 1.0/sprite_get_width(s_InputCandy_device_icons)*swh*0.25, 1.0/sprite_get_height(s_InputCandy_device_icons)*swh*0.25, 0, c_white, 1.0 ); + if ( __INPUTCANDY.players[k].device >= 0 ) { + draw_sprite_ext( s_InputCandy_device_icons, __ICI.GuessBestDeviceIcon(__INPUTCANDY.devices[__INPUTCANDY.players[k].device]),ox+cw/2,oy+rh/2, 1.0/sprite_get_width(s_InputCandy_device_icons)*swh*0.75, 1.0/sprite_get_height(s_InputCandy_device_icons)*swh*0.75, 0, c_white, 1.0 ); + draw_sprite_ext( s_InputCandy_device_icons, 0,ox+cw/2+cw/4,oy+rh/2+rh/4, 1.0/sprite_get_width(s_InputCandy_device_icons)*swh*0.25, 1.0/sprite_get_height(s_InputCandy_device_icons)*swh*0.25, 0, c_white, 1.0 ); + } else { // K3yb0@rd 0nly + draw_sprite_ext( s_InputCandy_device_icons, 0,ox+cw/2,oy+rh/2, 1.0/sprite_get_width(s_InputCandy_device_icons)*swh*0.75, 1.0/sprite_get_height(s_InputCandy_device_icons)*swh*0.75, 0, c_white, 1.0 ); + } } else draw_sprite_ext( s_InputCandy_device_icons, __ICI.GuessBestDeviceIcon(__INPUTCANDY.players[k].device==none?none:__INPUTCANDY.devices[__INPUTCANDY.players[k].device]),ox+cw/2,oy+rh/2, 1.0/sprite_get_width(s_InputCandy_device_icons)*swh*0.75, 1.0/sprite_get_height(s_InputCandy_device_icons)*swh*0.75, 0, c_white, 1.0 ); if ( __INPUTCANDY.players[k].device != none ) @@ -785,7 +789,8 @@ function ICUI_Draw_device_select( exit_to ) { if ( player_index == __INPUTCANDY.player_using_keyboard_mouse ) { var kms="Keyboard and Mouse Settings"; - if ( device.type == ICDeviceType_keyboard ) kms="Keyboard Settings"; + if ( device == none ) {} + else if ( device.type == ICDeviceType_keyboard ) kms="Keyboard Settings"; else if ( device.type == ICDeviceType_mouse ) kms="Mouse Settings"; max_menuitem=mi; sy += btn_height+btn_height/5; @@ -1085,7 +1090,7 @@ function ICUI_assure_settings_exist() { // Create new settings if none exist, otherwise let the player choose existing settings or create new. if ( __INPUTCANDY.players[player_index].settings == none ) { if ( __INPUTCANDY.players[player_index].device == none ) { - if ( player_index != __INPUTCANDY.player_using_keyboard_mouse or !__INPUTCANDY.ui.input_binding.keyboard_mouse ) { // Return to previous screen + if ( player_index != __INPUTCANDY.player_using_keyboard_mouse or !__INPUTCANDY.ui.input_binding.keyboard_and_mouse ) { // Return to previous screen return false; } else if (array_length(__INPUTCANDY.settings) == 0 and __INPUTCANDY.ui.input_binding.keyboard_mouse) { __INPUTCANDY.settings[0]=__ICI.New_ICSettings(); @@ -1281,32 +1286,34 @@ function ICUI_Draw_input_binding() { ICUI_tinted_box(__INPUTCANDY.ui.style.knob1,__INPUTCANDY.ui.style.knob2, sb_mid.x+smidge, sb_mid.y+smidge + total_size*first_perc, sb_mid.w-smidge*2, (total_size*last_perc)-(total_size*first_perc) ); } - if ( __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone1 != none ) { - if ( cwithin(mouse_x,mouse_y,dz1) ) __INPUTCANDY.ui.input_binding.influencing=mi_dz1; - ICUI_surround_button( __INPUTCANDY.ui.input_binding.influencing == mi_dz1, dz1.x, dz1.y, dz1.w, dz1.h ); - } - if ( __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone2 != none ) { - if ( cwithin(mouse_x,mouse_y,dz2) ) __INPUTCANDY.ui.input_binding.influencing=mi_dz2; - ICUI_surround_button( __INPUTCANDY.ui.input_binding.influencing == mi_dz2, dz2.x, dz2.y, dz2.w, dz2.h ); - } + if ( __INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings != none ) { + if ( __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone1 != none ) { + if ( cwithin(mouse_x,mouse_y,dz1) ) __INPUTCANDY.ui.input_binding.influencing=mi_dz1; + ICUI_surround_button( __INPUTCANDY.ui.input_binding.influencing == mi_dz1, dz1.x, dz1.y, dz1.w, dz1.h ); + } + if ( __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone2 != none ) { + if ( cwithin(mouse_x,mouse_y,dz2) ) __INPUTCANDY.ui.input_binding.influencing=mi_dz2; + ICUI_surround_button( __INPUTCANDY.ui.input_binding.influencing == mi_dz2, dz2.x, dz2.y, dz2.w, dz2.h ); + } - // Draw this part second (that's why the ifs are identical) - if ( __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone1 != none ) { - ICUI_text( false, - "Axis DeadZone: "+string_format(__INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone1,1,2), - dz1.x+dz1.w/4, dz1.y+dz1.h/2 ); - ICUI_slider( __INPUTCANDY.ui.input_binding.influencing == mi_dz1, - __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone1, - 0.05, dz1.x+dz1.w/2,dz1.y,dz1.w/2,dz1.h ); + // Draw this part second (that's why the ifs are identical) + if ( __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone1 != none ) { + ICUI_text( false, + "Axis DeadZone: "+string_format(__INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone1,1,2), + dz1.x+dz1.w/4, dz1.y+dz1.h/2 ); + ICUI_slider( __INPUTCANDY.ui.input_binding.influencing == mi_dz1, + __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone1, + 0.05, dz1.x+dz1.w/2,dz1.y,dz1.w/2,dz1.h ); + } + if ( __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone2 != none ) { + ICUI_text( false, + "Btn Threshold: "+string_format(__INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone2,1,2), + dz2.x+dz2.w/4, dz2.y+dz2.h/2 ); + ICUI_slider( __INPUTCANDY.ui.input_binding.influencing == mi_dz2, + __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone2, + 0.05, dz2.x+dz2.w/2,dz2.y,dz2.w/2,dz2.h ); + } } - if ( __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone2 != none ) { - ICUI_text( false, - "Btn Threshold: "+string_format(__INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone2,1,2), - dz2.x+dz2.w/4, dz2.y+dz2.h/2 ); - ICUI_slider( __INPUTCANDY.ui.input_binding.influencing == mi_dz2, - __INPUTCANDY.settings[__INPUTCANDY.players[__INPUTCANDY.ui.device_select.influencing].settings].deadzone2, - 0.05, dz2.x+dz2.w/2,dz2.y,dz2.w/2,dz2.h ); - } if ( __INPUTCANDY.ui.input(ICUI_right) or __INPUTCANDY.ui.input(ICUI_down) ) { audio_play_sound(a_ICUI_click,100,0); diff --git a/scripts/InputCandy/InputCandy.gml b/scripts/InputCandy/InputCandy.gml index e125c8f..fa15eeb 100644 --- a/scripts/InputCandy/InputCandy.gml +++ b/scripts/InputCandy/InputCandy.gml @@ -2545,6 +2545,8 @@ function New_InputCandy_Private() { }, GetBindingData: function ( settings_index, action_index ) { + if ( settings_index == none ) return none; + if ( action_index == none ) return none; var bindings=array_length(__INPUTCANDY.settings[settings_index].bindings); for ( var i=0; i",}, {"id":"e4fcccbb-f611-4d07-854b-ec8b94084911","Key":28.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"89a7fabb-aa4a-4145-a17b-5c7dbdd04f51","path":"sprites/s_FPSClock30/s_FPSClock30.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"e21559a6-33c0-476c-ab85-49eae07295fa","Key":29.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6751b5b4-4d2e-4807-a7d2-5645e30a8f37","path":"sprites/s_FPSClock30/s_FPSClock30.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -175,7 +175,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_FPSClock30","path":"sprites/s_FPSClock30/s_FPSClock30.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_FPSClock30", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/s_InputCandy_ICUI_icons/s_InputCandy_ICUI_icons.yy b/sprites/s_InputCandy_ICUI_icons/s_InputCandy_ICUI_icons.yy index 0f0fc4f..5bc5ebb 100644 --- a/sprites/s_InputCandy_ICUI_icons/s_InputCandy_ICUI_icons.yy +++ b/sprites/s_InputCandy_ICUI_icons/s_InputCandy_ICUI_icons.yy @@ -426,7 +426,7 @@ {"id":"8e7d5a30-9323-4c81-a25a-4f8dbe8b7709","Key":94.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"41d76d5d-651c-4a86-86ad-6e2908658798","path":"sprites/s_InputCandy_ICUI_icons/s_InputCandy_ICUI_icons.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"72e738ce-8f20-4b81-b835-9abdbcb3a74c","Key":95.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a25d2581-dffc-4b8c-84ae-8e8c64d45fb1","path":"sprites/s_InputCandy_ICUI_icons/s_InputCandy_ICUI_icons.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"e0404804-38ef-407a-a55c-a4e6edcd46fe","Key":96.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c3b8c8ef-2040-4234-9daf-1c817ea4d6a3","path":"sprites/s_InputCandy_ICUI_icons/s_InputCandy_ICUI_icons.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -443,7 +443,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_InputCandy_ICUI_icons","path":"sprites/s_InputCandy_ICUI_icons/s_InputCandy_ICUI_icons.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_InputCandy_ICUI_icons", "tags": [], "resourceType": "GMSequence", @@ -451,6 +451,7 @@ "layers": [ {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"842861c1-7b3a-4cde-a1bf-e958014f3c30","tags":[],"resourceType":"GMImageLayer",}, ], + "nineSlice": null, "parent": { "name": "InputCandy", "path": "folders/Sprites/InputCandy.yy", diff --git a/sprites/s_InputCandy_ICUI_mouse_cursor/s_InputCandy_ICUI_mouse_cursor.yy b/sprites/s_InputCandy_ICUI_mouse_cursor/s_InputCandy_ICUI_mouse_cursor.yy index 4fa88e9..69d1811 100644 --- a/sprites/s_InputCandy_ICUI_mouse_cursor/s_InputCandy_ICUI_mouse_cursor.yy +++ b/sprites/s_InputCandy_ICUI_mouse_cursor/s_InputCandy_ICUI_mouse_cursor.yy @@ -42,7 +42,7 @@ "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ {"id":"1db17a81-5d48-48ce-b710-21962b221f43","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"db92fa8a-85be-45c1-85c1-7c282e06890d","path":"sprites/s_InputCandy_ICUI_mouse_cursor/s_InputCandy_ICUI_mouse_cursor.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_InputCandy_ICUI_mouse_cursor","path":"sprites/s_InputCandy_ICUI_mouse_cursor/s_InputCandy_ICUI_mouse_cursor.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_InputCandy_ICUI_mouse_cursor", "tags": [], "resourceType": "GMSequence", @@ -67,6 +67,7 @@ "layers": [ {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"5e391ecf-51d4-463f-b94c-b45aba0017b4","tags":[],"resourceType":"GMImageLayer",}, ], + "nineSlice": null, "parent": { "name": "InputCandy", "path": "folders/Sprites/InputCandy.yy", diff --git a/sprites/s_InputCandy_Logo/s_InputCandy_Logo.yy b/sprites/s_InputCandy_Logo/s_InputCandy_Logo.yy index 90bdaa7..fabd18e 100644 --- a/sprites/s_InputCandy_Logo/s_InputCandy_Logo.yy +++ b/sprites/s_InputCandy_Logo/s_InputCandy_Logo.yy @@ -42,7 +42,7 @@ "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ {"id":"cf522aac-b132-43eb-906b-bba805456f2f","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"068b5577-580c-4f14-b760-e534766e44f4","path":"sprites/s_InputCandy_Logo/s_InputCandy_Logo.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_InputCandy_Logo","path":"sprites/s_InputCandy_Logo/s_InputCandy_Logo.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_InputCandy_Logo", "tags": [], "resourceType": "GMSequence", @@ -67,6 +67,7 @@ "layers": [ {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"88badc1b-41dc-43b3-b5f1-222666205ce5","tags":[],"resourceType":"GMImageLayer",}, ], + "nineSlice": null, "parent": { "name": "InputCandy", "path": "folders/Sprites/InputCandy.yy", diff --git a/sprites/s_InputCandy_Logo2/s_InputCandy_Logo2.yy b/sprites/s_InputCandy_Logo2/s_InputCandy_Logo2.yy index 6394d43..9074154 100644 --- a/sprites/s_InputCandy_Logo2/s_InputCandy_Logo2.yy +++ b/sprites/s_InputCandy_Logo2/s_InputCandy_Logo2.yy @@ -42,7 +42,7 @@ "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ {"id":"83aef47a-73f4-4463-ac24-1584366a7dc0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"861b778e-dd8d-4b6a-8a95-740b84de330e","path":"sprites/s_InputCandy_Logo2/s_InputCandy_Logo2.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_InputCandy_Logo2","path":"sprites/s_InputCandy_Logo2/s_InputCandy_Logo2.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_InputCandy_Logo2", "tags": [], "resourceType": "GMSequence", @@ -67,6 +67,7 @@ "layers": [ {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"dfda7637-3a80-4201-bd84-24f6d85f73b7","tags":[],"resourceType":"GMImageLayer",}, ], + "nineSlice": null, "parent": { "name": "InputCandy", "path": "folders/Sprites/InputCandy.yy", diff --git a/sprites/s_InputCandy_Logo3/s_InputCandy_Logo3.yy b/sprites/s_InputCandy_Logo3/s_InputCandy_Logo3.yy index 28cd26f..33c1fea 100644 --- a/sprites/s_InputCandy_Logo3/s_InputCandy_Logo3.yy +++ b/sprites/s_InputCandy_Logo3/s_InputCandy_Logo3.yy @@ -42,7 +42,7 @@ "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ {"id":"df40d983-3bd7-462c-980d-8029930a2274","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"214da5bc-9266-46d8-b774-75e99f478cb9","path":"sprites/s_InputCandy_Logo3/s_InputCandy_Logo3.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_InputCandy_Logo3","path":"sprites/s_InputCandy_Logo3/s_InputCandy_Logo3.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_InputCandy_Logo3", "tags": [], "resourceType": "GMSequence", @@ -67,6 +67,7 @@ "layers": [ {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c60d3616-64f8-431e-bb90-1c0e773784aa","tags":[],"resourceType":"GMImageLayer",}, ], + "nineSlice": null, "parent": { "name": "InputCandy", "path": "folders/Sprites/InputCandy.yy", diff --git a/sprites/s_InputCandy_TeetherTeaser/s_InputCandy_TeetherTeaser.yy b/sprites/s_InputCandy_TeetherTeaser/s_InputCandy_TeetherTeaser.yy index b8210a7..dde0977 100644 --- a/sprites/s_InputCandy_TeetherTeaser/s_InputCandy_TeetherTeaser.yy +++ b/sprites/s_InputCandy_TeetherTeaser/s_InputCandy_TeetherTeaser.yy @@ -42,7 +42,7 @@ "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ {"id":"ea32f105-30f3-499a-a673-00d90a92b9a4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5b17e009-82ba-4335-b18e-4078b9aab4a8","path":"sprites/s_InputCandy_TeetherTeaser/s_InputCandy_TeetherTeaser.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_InputCandy_TeetherTeaser","path":"sprites/s_InputCandy_TeetherTeaser/s_InputCandy_TeetherTeaser.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_InputCandy_TeetherTeaser", "tags": [], "resourceType": "GMSequence", @@ -67,6 +67,7 @@ "layers": [ {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"861397d0-a3ff-4ea1-b301-9c5270c62b38","tags":[],"resourceType":"GMImageLayer",}, ], + "nineSlice": null, "parent": { "name": "InputCandy", "path": "folders/Sprites/InputCandy.yy", diff --git a/sprites/s_InputCandy_TestGameSprites/s_InputCandy_TestGameSprites.yy b/sprites/s_InputCandy_TestGameSprites/s_InputCandy_TestGameSprites.yy index 12fa1e3..a0c8942 100644 --- a/sprites/s_InputCandy_TestGameSprites/s_InputCandy_TestGameSprites.yy +++ b/sprites/s_InputCandy_TestGameSprites/s_InputCandy_TestGameSprites.yy @@ -46,7 +46,7 @@ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ {"id":"80d40d0b-09c4-4f1b-9ab9-448d964198c0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"25804690-dc43-4105-a0be-e72e5074a58a","path":"sprites/s_InputCandy_TestGameSprites/s_InputCandy_TestGameSprites.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"d605708d-8772-40ad-84ed-b4a738d3fbd8","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5fb95ad5-70da-4047-8287-b3abfee22faf","path":"sprites/s_InputCandy_TestGameSprites/s_InputCandy_TestGameSprites.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -63,7 +63,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_InputCandy_TestGameSprites","path":"sprites/s_InputCandy_TestGameSprites/s_InputCandy_TestGameSprites.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_InputCandy_TestGameSprites", "tags": [], "resourceType": "GMSequence", @@ -71,6 +71,7 @@ "layers": [ {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"4f925339-070c-4e31-92d4-ba686f4ace36","tags":[],"resourceType":"GMImageLayer",}, ], + "nineSlice": null, "parent": { "name": "InputCandy", "path": "folders/Sprites/InputCandy.yy", diff --git a/sprites/s_InputCandy_device_icons/s_InputCandy_device_icons.yy b/sprites/s_InputCandy_device_icons/s_InputCandy_device_icons.yy index 5644a09..cf2c6e0 100644 --- a/sprites/s_InputCandy_device_icons/s_InputCandy_device_icons.yy +++ b/sprites/s_InputCandy_device_icons/s_InputCandy_device_icons.yy @@ -86,7 +86,7 @@ {"id":"f9e64cad-b98b-4409-8f85-c22ff7d05afe","Key":9.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9c64c8d3-9d06-41d7-8ad9-42ab429d68e2","path":"sprites/s_InputCandy_device_icons/s_InputCandy_device_icons.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"bb35869c-308b-4264-b3d9-da8ee646575f","Key":10.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"628624e6-18be-4032-8abb-34a5bb5c4a04","path":"sprites/s_InputCandy_device_icons/s_InputCandy_device_icons.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"cd516dd8-bb13-4a32-8788-8eb4bbe41563","Key":11.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cea65ed9-4867-4e81-99b6-87b1187245fe","path":"sprites/s_InputCandy_device_icons/s_InputCandy_device_icons.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -103,7 +103,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_InputCandy_device_icons","path":"sprites/s_InputCandy_device_icons/s_InputCandy_device_icons.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_InputCandy_device_icons", "tags": [], "resourceType": "GMSequence", @@ -111,6 +111,7 @@ "layers": [ {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"68a9f1e6-c0b7-448e-84bf-009a88baa28d","tags":[],"resourceType":"GMImageLayer",}, ], + "nineSlice": null, "parent": { "name": "InputCandy", "path": "folders/Sprites/InputCandy.yy", diff --git a/sprites/s_InputCandy_gamepad_photos/s_InputCandy_gamepad_photos.yy b/sprites/s_InputCandy_gamepad_photos/s_InputCandy_gamepad_photos.yy index 39f2ac5..f3130b5 100644 --- a/sprites/s_InputCandy_gamepad_photos/s_InputCandy_gamepad_photos.yy +++ b/sprites/s_InputCandy_gamepad_photos/s_InputCandy_gamepad_photos.yy @@ -66,7 +66,7 @@ {"id":"83ac5da4-fbc3-4f06-80c8-2d825c4eedcd","Key":4.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"5d830fde-3d03-49dd-b1a6-2775441c8a5b","path":"sprites/s_InputCandy_gamepad_photos/s_InputCandy_gamepad_photos.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"a5d47530-b226-4804-a647-4cfecf3d00b3","Key":5.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"58c2f85e-7e31-4183-a4ba-9b789ed21072","path":"sprites/s_InputCandy_gamepad_photos/s_InputCandy_gamepad_photos.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"97819868-7a01-4e89-bd9f-f47967f6329b","Key":6.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0e0c20b7-d607-4183-a790-39c06836857f","path":"sprites/s_InputCandy_gamepad_photos/s_InputCandy_gamepad_photos.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -83,7 +83,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_InputCandy_gamepad_photos","path":"sprites/s_InputCandy_gamepad_photos/s_InputCandy_gamepad_photos.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_InputCandy_gamepad_photos", "tags": [], "resourceType": "GMSequence", @@ -91,6 +91,7 @@ "layers": [ {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f15d144c-a2d1-4990-966c-266002b8ae80","tags":[],"resourceType":"GMImageLayer",}, ], + "nineSlice": null, "parent": { "name": "InputCandy", "path": "folders/Sprites/InputCandy.yy", diff --git a/sprites/s_LostAstronaut_Logo/s_LostAstronaut_Logo.yy b/sprites/s_LostAstronaut_Logo/s_LostAstronaut_Logo.yy index b2acc30..8173a59 100644 --- a/sprites/s_LostAstronaut_Logo/s_LostAstronaut_Logo.yy +++ b/sprites/s_LostAstronaut_Logo/s_LostAstronaut_Logo.yy @@ -42,7 +42,7 @@ "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ {"id":"2b1819c9-1624-495c-ac60-fcb272a70654","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bab64cbc-c6e5-418e-99e3-a04e525d9236","path":"sprites/s_LostAstronaut_Logo/s_LostAstronaut_Logo.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_LostAstronaut_Logo","path":"sprites/s_LostAstronaut_Logo/s_LostAstronaut_Logo.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_LostAstronaut_Logo", "tags": [], "resourceType": "GMSequence", @@ -67,6 +67,7 @@ "layers": [ {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"bd97d5b6-a297-4909-8ad6-116b5c4d007c","tags":[],"resourceType":"GMImageLayer",}, ], + "nineSlice": null, "parent": { "name": "InputCandy", "path": "folders/Sprites/InputCandy.yy", diff --git a/sprites/s_SDLDB_Loading_Disc/s_SDLDB_Loading_Disc.yy b/sprites/s_SDLDB_Loading_Disc/s_SDLDB_Loading_Disc.yy index 70e3cb2..2cd911b 100644 --- a/sprites/s_SDLDB_Loading_Disc/s_SDLDB_Loading_Disc.yy +++ b/sprites/s_SDLDB_Loading_Disc/s_SDLDB_Loading_Disc.yy @@ -50,7 +50,7 @@ {"id":"c4536ecf-bdfb-429c-9dc9-ec24650feadd","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c01b54b7-9b7a-4f17-a154-6d7b1865020d","path":"sprites/s_SDLDB_Loading_Disc/s_SDLDB_Loading_Disc.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"47d46d26-1380-45fd-a6bd-33f7887d569c","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"72359bab-44b5-4509-bc8b-6addc7b9feae","path":"sprites/s_SDLDB_Loading_Disc/s_SDLDB_Loading_Disc.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"89a5f61b-bcdd-4212-8b31-e1e372d224bc","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"127a4efe-983b-4603-8107-8ebb841cae77","path":"sprites/s_SDLDB_Loading_Disc/s_SDLDB_Loading_Disc.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":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -67,7 +67,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"s_SDLDB_Loading_Disc","path":"sprites/s_SDLDB_Loading_Disc/s_SDLDB_Loading_Disc.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "s_SDLDB_Loading_Disc", "tags": [], "resourceType": "GMSequence", @@ -75,6 +75,7 @@ "layers": [ {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"2ab2867f-5944-442d-8818-5027f7b0fcb4","tags":[],"resourceType":"GMImageLayer",}, ], + "nineSlice": null, "parent": { "name": "InputCandy", "path": "folders/Sprites/InputCandy.yy",