diff --git a/Bloble/Bloble.yyp b/Bloble/Bloble.yyp index 29b92c0..476434c 100644 --- a/Bloble/Bloble.yyp +++ b/Bloble/Bloble.yyp @@ -86,6 +86,14 @@ "resourceType": "GMObject" } }, + { + "Key": "16040f1b-d4ec-4a3c-9417-65876de703f9", + "Value": { + "id": "76e081bc-7a7e-47d7-991d-4beff2127a4d", + "resourcePath": "sprites\/spr_Reset\/spr_Reset.yy", + "resourceType": "GMSprite" + } + }, { "Key": "1a58794f-af6e-43bd-ad13-85dfa879bf65", "Value": { @@ -110,6 +118,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "31e69599-86a9-4641-8f9a-e984d4c8f29b", + "Value": { + "id": "3fbee1cb-4d57-453e-9297-901cdf3a8e63", + "resourcePath": "sprites\/spr_Back\/spr_Back.yy", + "resourceType": "GMSprite" + } + }, { "Key": "459fd507-8dd1-4a9a-ad84-99f965b5e2bb", "Value": { @@ -126,6 +142,22 @@ "resourceType": "GMSprite" } }, + { + "Key": "5275a5d8-3cbc-4243-b700-d7d84a5810cf", + "Value": { + "id": "bbc6e6fa-c46a-4503-a1ad-18c67cab6e56", + "resourcePath": "objects\/obj_SettingsSounds\/obj_SettingsSounds.yy", + "resourceType": "GMObject" + } + }, + { + "Key": "58b602c0-8f98-4f17-a1c7-fa569efeb87f", + "Value": { + "id": "a8a20eea-0678-487a-8887-3a693f7f9726", + "resourcePath": "objects\/obj_SettingsTitle\/obj_SettingsTitle.yy", + "resourceType": "GMObject" + } + }, { "Key": "59a5f902-0e99-4359-a707-bc10d39a5fc5", "Value": { @@ -158,6 +190,22 @@ "resourceType": "GMFont" } }, + { + "Key": "92f24b35-1e2c-4d91-9449-08a7355beaf1", + "Value": { + "id": "608569f5-90a2-4c9d-ba6a-357823ab8130", + "resourcePath": "sprites\/spr_SettingsMusic\/spr_SettingsMusic.yy", + "resourceType": "GMSprite" + } + }, + { + "Key": "933dadd2-0f69-438b-aab2-769241e10022", + "Value": { + "id": "8f25b848-5927-402d-abeb-3dee1e22ede4", + "resourcePath": "sprites\/spr_SettingsSounds\/spr_SettingsSounds.yy", + "resourceType": "GMSprite" + } + }, { "Key": "935738f8-eae9-4f04-92e3-8befaf10d58a", "Value": { @@ -238,6 +286,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "dde55b2d-cd00-4caa-af7b-6e6ce76b5b0b", + "Value": { + "id": "2b9b10b0-2f0a-4f6e-8549-0aee00f1b49d", + "resourcePath": "objects\/obj_SettingsReset\/obj_SettingsReset.yy", + "resourceType": "GMObject" + } + }, { "Key": "de954864-d7c0-484a-aa93-678bc065b3f3", "Value": { @@ -254,6 +310,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "e70af72a-9b4f-4b8e-8298-30597ded4f82", + "Value": { + "id": "a6984560-2cf0-4c54-bd22-f1d585c3ee3e", + "resourcePath": "objects\/obj_Back\/obj_Back.yy", + "resourceType": "GMObject" + } + }, { "Key": "e97866c9-798a-4e1b-b440-90ed4968a976", "Value": { @@ -262,6 +326,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "ee46e014-5001-4550-bb4f-c6f6dc79dc00", + "Value": { + "id": "97ef4742-82c5-4d9f-8d12-74eb4768ce5d", + "resourcePath": "objects\/obj_SettingsMusic\/obj_SettingsMusic.yy", + "resourceType": "GMObject" + } + }, { "Key": "f418569b-3bdd-4706-a0e4-364317f54032", "Value": { diff --git a/Bloble/objects/obj_Back/Gesture_0.gml b/Bloble/objects/obj_Back/Gesture_0.gml new file mode 100644 index 0000000..78e5cb7 --- /dev/null +++ b/Bloble/objects/obj_Back/Gesture_0.gml @@ -0,0 +1,4 @@ +/// @description Insert description here +// You can write your code in this editor + +room_goto(rm_Menu); \ No newline at end of file diff --git a/Bloble/objects/obj_Back/obj_Back.yy b/Bloble/objects/obj_Back/obj_Back.yy new file mode 100644 index 0000000..2149e77 --- /dev/null +++ b/Bloble/objects/obj_Back/obj_Back.yy @@ -0,0 +1,38 @@ +{ + "id": "e70af72a-9b4f-4b8e-8298-30597ded4f82", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_Back", + "eventList": [ + { + "id": "80f62ec9-24f9-4585-afa3-2d7d7d1e76ed", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 13, + "m_owner": "e70af72a-9b4f-4b8e-8298-30597ded4f82" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "31e69599-86a9-4641-8f9a-e984d4c8f29b", + "visible": true +} \ No newline at end of file diff --git a/Bloble/objects/obj_Settings/Gesture_0.gml b/Bloble/objects/obj_Settings/Gesture_0.gml new file mode 100644 index 0000000..cd10dbf --- /dev/null +++ b/Bloble/objects/obj_Settings/Gesture_0.gml @@ -0,0 +1,4 @@ +/// @description Insert description here +// You can write your code in this editor + +room_goto(rm_Settings); \ No newline at end of file diff --git a/Bloble/objects/obj_Settings/obj_Settings.yy b/Bloble/objects/obj_Settings/obj_Settings.yy index 597c8f1..447b955 100644 --- a/Bloble/objects/obj_Settings/obj_Settings.yy +++ b/Bloble/objects/obj_Settings/obj_Settings.yy @@ -4,7 +4,16 @@ "mvc": "1.0", "name": "obj_Settings", "eventList": [ - + { + "id": "cb4d8452-e01a-433a-9d01-9ef14fd573cc", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 13, + "m_owner": "05d20e71-992a-46a3-beac-15c2c8240e3d" + } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", "overriddenProperties": null, diff --git a/Bloble/objects/obj_SettingsMusic/Gesture_0.gml b/Bloble/objects/obj_SettingsMusic/Gesture_0.gml new file mode 100644 index 0000000..ff9e254 --- /dev/null +++ b/Bloble/objects/obj_SettingsMusic/Gesture_0.gml @@ -0,0 +1,12 @@ +/// @description Insert description here +// You can write your code in this editor + +if (image_index == 0){ + image_index = 1; +}; +else{ + if (image_index == 1){ + image_index = 0; + }; +}; + \ No newline at end of file diff --git a/Bloble/objects/obj_SettingsMusic/obj_SettingsMusic.yy b/Bloble/objects/obj_SettingsMusic/obj_SettingsMusic.yy new file mode 100644 index 0000000..ed8e26c --- /dev/null +++ b/Bloble/objects/obj_SettingsMusic/obj_SettingsMusic.yy @@ -0,0 +1,38 @@ +{ + "id": "ee46e014-5001-4550-bb4f-c6f6dc79dc00", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_SettingsMusic", + "eventList": [ + { + "id": "2123e6df-b53d-475b-82af-2460c1e310a5", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 13, + "m_owner": "ee46e014-5001-4550-bb4f-c6f6dc79dc00" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "92f24b35-1e2c-4d91-9449-08a7355beaf1", + "visible": true +} \ No newline at end of file diff --git a/Bloble/objects/obj_SettingsReset/obj_SettingsReset.yy b/Bloble/objects/obj_SettingsReset/obj_SettingsReset.yy new file mode 100644 index 0000000..2777fc7 --- /dev/null +++ b/Bloble/objects/obj_SettingsReset/obj_SettingsReset.yy @@ -0,0 +1,29 @@ +{ + "id": "dde55b2d-cd00-4caa-af7b-6e6ce76b5b0b", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_SettingsReset", + "eventList": [ + + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "16040f1b-d4ec-4a3c-9417-65876de703f9", + "visible": true +} \ No newline at end of file diff --git a/Bloble/objects/obj_SettingsSounds/Gesture_0.gml b/Bloble/objects/obj_SettingsSounds/Gesture_0.gml new file mode 100644 index 0000000..ff9e254 --- /dev/null +++ b/Bloble/objects/obj_SettingsSounds/Gesture_0.gml @@ -0,0 +1,12 @@ +/// @description Insert description here +// You can write your code in this editor + +if (image_index == 0){ + image_index = 1; +}; +else{ + if (image_index == 1){ + image_index = 0; + }; +}; + \ No newline at end of file diff --git a/Bloble/objects/obj_SettingsSounds/obj_SettingsSounds.yy b/Bloble/objects/obj_SettingsSounds/obj_SettingsSounds.yy new file mode 100644 index 0000000..6e2301a --- /dev/null +++ b/Bloble/objects/obj_SettingsSounds/obj_SettingsSounds.yy @@ -0,0 +1,38 @@ +{ + "id": "5275a5d8-3cbc-4243-b700-d7d84a5810cf", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_SettingsSounds", + "eventList": [ + { + "id": "7c9ddebc-6a54-44f4-9651-5e4033571663", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 13, + "m_owner": "5275a5d8-3cbc-4243-b700-d7d84a5810cf" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "933dadd2-0f69-438b-aab2-769241e10022", + "visible": true +} \ No newline at end of file diff --git a/Bloble/objects/obj_SettingsTitle/obj_SettingsTitle.yy b/Bloble/objects/obj_SettingsTitle/obj_SettingsTitle.yy new file mode 100644 index 0000000..7fa05c5 --- /dev/null +++ b/Bloble/objects/obj_SettingsTitle/obj_SettingsTitle.yy @@ -0,0 +1,29 @@ +{ + "id": "58b602c0-8f98-4f17-a1c7-fa569efeb87f", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_SettingsTitle", + "eventList": [ + + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "100571dd-a072-498d-85b3-f2c233ffa920", + "visible": true +} \ No newline at end of file diff --git a/Bloble/objects/obj_Start/Gesture_0.gml b/Bloble/objects/obj_Start/Gesture_0.gml new file mode 100644 index 0000000..4d7b638 --- /dev/null +++ b/Bloble/objects/obj_Start/Gesture_0.gml @@ -0,0 +1,4 @@ +/// @description Insert description here +// You can write your code in this editor + +room_goto(rm_Start); \ No newline at end of file diff --git a/Bloble/objects/obj_Start/obj_Start.yy b/Bloble/objects/obj_Start/obj_Start.yy index 9f0dd14..05a5419 100644 --- a/Bloble/objects/obj_Start/obj_Start.yy +++ b/Bloble/objects/obj_Start/obj_Start.yy @@ -4,7 +4,16 @@ "mvc": "1.0", "name": "obj_Start", "eventList": [ - + { + "id": "459cb838-7b2b-4258-b374-57dfcba6778c", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 13, + "m_owner": "158c5696-455f-4087-8e55-a3002c52d760" + } ], "maskSpriteId": "00000000-0000-0000-0000-000000000000", "overriddenProperties": null, diff --git a/Bloble/rooms/rm_Settings/rm_Settings.yy b/Bloble/rooms/rm_Settings/rm_Settings.yy index 69277ef..855e431 100644 --- a/Bloble/rooms/rm_Settings/rm_Settings.yy +++ b/Bloble/rooms/rm_Settings/rm_Settings.yy @@ -7,7 +7,11 @@ "inheritCreationOrder": false, "inheritLayers": false, "instanceCreationOrderIDs": [ - + "600ea352-f410-4c2d-893e-161d7f8e1708", + "406af539-29bd-43a8-b78b-6431e43b2ed4", + "e2071103-760b-4d96-b2bc-3f44ef5641ac", + "5eca9b42-1cf0-4eff-bcde-840572d9427a", + "3bc18d38-88bf-4ece-b0af-fb4f4dbf0e1d" ], "IsDnD": false, "layers": [ @@ -25,7 +29,11 @@ "inheritSubLayers": false, "inheritVisibility": false, "instances": [ - +{"name": "inst_9A7B3B4","id": "600ea352-f410-4c2d-893e-161d7f8e1708","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_9A7B3B4","objId": "ee46e014-5001-4550-bb4f-c6f6dc79dc00","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 352,"y": 864}, +{"name": "inst_5DB0C292","id": "406af539-29bd-43a8-b78b-6431e43b2ed4","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_5DB0C292","objId": "e70af72a-9b4f-4b8e-8298-30597ded4f82","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 384,"y": 1728}, +{"name": "inst_696997A2","id": "e2071103-760b-4d96-b2bc-3f44ef5641ac","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_696997A2","objId": "58b602c0-8f98-4f17-a1c7-fa569efeb87f","properties": null,"rotation": 0,"scaleX": 1.7,"scaleY": 1.7,"mvc": "1.1","x": 64,"y": 160}, +{"name": "inst_58B0A246","id": "5eca9b42-1cf0-4eff-bcde-840572d9427a","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_58B0A246","objId": "5275a5d8-3cbc-4243-b700-d7d84a5810cf","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 320,"y": 1024}, +{"name": "inst_798BC3E2","id": "3bc18d38-88bf-4ece-b0af-fb4f4dbf0e1d","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_798BC3E2","objId": "dde55b2d-cd00-4caa-af7b-6e6ce76b5b0b","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 352,"y": 1568} ], "layers": [ @@ -43,7 +51,7 @@ "id": "342d509b-ef55-46a2-8ab1-f832f53c4343", "animationFPS": 15, "animationSpeedType": "0", - "colour": { "Value": 4278190080 }, + "colour": { "Value": 4294967295 }, "depth": 100, "grid_x": 32, "grid_y": 32, @@ -87,12 +95,12 @@ }, "roomSettings": { "id": "ea864155-67dc-4d3e-9543-aff0c05ed7b6", - "Height": 768, + "Height": 1920, "inheritRoomSettings": false, "modelName": "GMRoomSettings", "persistent": false, "mvc": "1.0", - "Width": 1024 + "Width": 1080 }, "mvc": "1.0", "views": [ diff --git a/Bloble/sprites/spr_Back/2e408e95-895d-4683-996a-0b250b3c28ad.png b/Bloble/sprites/spr_Back/2e408e95-895d-4683-996a-0b250b3c28ad.png new file mode 100644 index 0000000..f94516d Binary files /dev/null and b/Bloble/sprites/spr_Back/2e408e95-895d-4683-996a-0b250b3c28ad.png differ diff --git a/Bloble/sprites/spr_Back/layers/2e408e95-895d-4683-996a-0b250b3c28ad/3c990f07-3e68-459f-bdcb-282d13ae653d.png b/Bloble/sprites/spr_Back/layers/2e408e95-895d-4683-996a-0b250b3c28ad/3c990f07-3e68-459f-bdcb-282d13ae653d.png new file mode 100644 index 0000000..769baa9 Binary files /dev/null and b/Bloble/sprites/spr_Back/layers/2e408e95-895d-4683-996a-0b250b3c28ad/3c990f07-3e68-459f-bdcb-282d13ae653d.png differ diff --git a/Bloble/sprites/spr_Back/spr_Back.yy b/Bloble/sprites/spr_Back/spr_Back.yy new file mode 100644 index 0000000..f60357d --- /dev/null +++ b/Bloble/sprites/spr_Back/spr_Back.yy @@ -0,0 +1,70 @@ +{ + "id": "31e69599-86a9-4641-8f9a-e984d4c8f29b", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_Back", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 90, + "bbox_left": 4, + "bbox_right": 291, + "bbox_top": 3, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "2e408e95-895d-4683-996a-0b250b3c28ad", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "31e69599-86a9-4641-8f9a-e984d4c8f29b", + "compositeImage": { + "id": "7329f78b-f618-4613-87c2-5ab9252ec67b", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "2e408e95-895d-4683-996a-0b250b3c28ad", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0d1e8c77-ebc4-4607-90c1-3e3f5d11bfe6", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "2e408e95-895d-4683-996a-0b250b3c28ad", + "LayerId": "3c990f07-3e68-459f-bdcb-282d13ae653d" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 94, + "layers": [ + { + "id": "3c990f07-3e68-459f-bdcb-282d13ae653d", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "31e69599-86a9-4641-8f9a-e984d4c8f29b", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 0, + "originLocked": false, + "playbackSpeed": 15, + "playbackSpeedType": 0, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 296, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/Bloble/sprites/spr_Reset/9c39da9c-8256-4655-b2b3-b5873f64b000.png b/Bloble/sprites/spr_Reset/9c39da9c-8256-4655-b2b3-b5873f64b000.png new file mode 100644 index 0000000..753ba77 Binary files /dev/null and b/Bloble/sprites/spr_Reset/9c39da9c-8256-4655-b2b3-b5873f64b000.png differ diff --git a/Bloble/sprites/spr_Reset/layers/9c39da9c-8256-4655-b2b3-b5873f64b000/28c4ad81-16c0-4c72-a5fd-fefabd2cf04d.png b/Bloble/sprites/spr_Reset/layers/9c39da9c-8256-4655-b2b3-b5873f64b000/28c4ad81-16c0-4c72-a5fd-fefabd2cf04d.png new file mode 100644 index 0000000..97a9165 Binary files /dev/null and b/Bloble/sprites/spr_Reset/layers/9c39da9c-8256-4655-b2b3-b5873f64b000/28c4ad81-16c0-4c72-a5fd-fefabd2cf04d.png differ diff --git a/Bloble/sprites/spr_Reset/spr_Reset.yy b/Bloble/sprites/spr_Reset/spr_Reset.yy new file mode 100644 index 0000000..441e43b --- /dev/null +++ b/Bloble/sprites/spr_Reset/spr_Reset.yy @@ -0,0 +1,70 @@ +{ + "id": "16040f1b-d4ec-4a3c-9417-65876de703f9", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_Reset", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 91, + "bbox_left": 4, + "bbox_right": 356, + "bbox_top": 3, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "9c39da9c-8256-4655-b2b3-b5873f64b000", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "16040f1b-d4ec-4a3c-9417-65876de703f9", + "compositeImage": { + "id": "6a31cf78-01cf-4721-ad48-a7c87a71cf78", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "9c39da9c-8256-4655-b2b3-b5873f64b000", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "61df7495-2907-4b8e-840b-a8d9e0b6ef01", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "9c39da9c-8256-4655-b2b3-b5873f64b000", + "LayerId": "28c4ad81-16c0-4c72-a5fd-fefabd2cf04d" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 95, + "layers": [ + { + "id": "28c4ad81-16c0-4c72-a5fd-fefabd2cf04d", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "16040f1b-d4ec-4a3c-9417-65876de703f9", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 0, + "originLocked": false, + "playbackSpeed": 15, + "playbackSpeedType": 0, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 361, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/Bloble/sprites/spr_SettingsMusic/b0b530af-5999-4f0f-9d74-a1db64fcf176.png b/Bloble/sprites/spr_SettingsMusic/b0b530af-5999-4f0f-9d74-a1db64fcf176.png new file mode 100644 index 0000000..74a6459 Binary files /dev/null and b/Bloble/sprites/spr_SettingsMusic/b0b530af-5999-4f0f-9d74-a1db64fcf176.png differ diff --git a/Bloble/sprites/spr_SettingsMusic/d4f5ab53-4b88-48c0-90fb-e89f9c6fc6a0.png b/Bloble/sprites/spr_SettingsMusic/d4f5ab53-4b88-48c0-90fb-e89f9c6fc6a0.png new file mode 100644 index 0000000..93f0e22 Binary files /dev/null and b/Bloble/sprites/spr_SettingsMusic/d4f5ab53-4b88-48c0-90fb-e89f9c6fc6a0.png differ diff --git a/Bloble/sprites/spr_SettingsMusic/layers/b0b530af-5999-4f0f-9d74-a1db64fcf176/98d0bcf7-807c-473a-abde-7424af1d68a1.png b/Bloble/sprites/spr_SettingsMusic/layers/b0b530af-5999-4f0f-9d74-a1db64fcf176/98d0bcf7-807c-473a-abde-7424af1d68a1.png new file mode 100644 index 0000000..9afe8a5 Binary files /dev/null and b/Bloble/sprites/spr_SettingsMusic/layers/b0b530af-5999-4f0f-9d74-a1db64fcf176/98d0bcf7-807c-473a-abde-7424af1d68a1.png differ diff --git a/Bloble/sprites/spr_SettingsMusic/layers/d4f5ab53-4b88-48c0-90fb-e89f9c6fc6a0/98d0bcf7-807c-473a-abde-7424af1d68a1.png b/Bloble/sprites/spr_SettingsMusic/layers/d4f5ab53-4b88-48c0-90fb-e89f9c6fc6a0/98d0bcf7-807c-473a-abde-7424af1d68a1.png new file mode 100644 index 0000000..ada0886 Binary files /dev/null and b/Bloble/sprites/spr_SettingsMusic/layers/d4f5ab53-4b88-48c0-90fb-e89f9c6fc6a0/98d0bcf7-807c-473a-abde-7424af1d68a1.png differ diff --git a/Bloble/sprites/spr_SettingsMusic/spr_SettingsMusic.yy b/Bloble/sprites/spr_SettingsMusic/spr_SettingsMusic.yy new file mode 100644 index 0000000..d907b51 --- /dev/null +++ b/Bloble/sprites/spr_SettingsMusic/spr_SettingsMusic.yy @@ -0,0 +1,92 @@ +{ + "id": "92f24b35-1e2c-4d91-9449-08a7355beaf1", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_SettingsMusic", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 90, + "bbox_left": 4, + "bbox_right": 344, + "bbox_top": 3, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "d4f5ab53-4b88-48c0-90fb-e89f9c6fc6a0", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "92f24b35-1e2c-4d91-9449-08a7355beaf1", + "compositeImage": { + "id": "3cd7d0d6-1d5d-4c2f-b784-4a241f79bd10", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d4f5ab53-4b88-48c0-90fb-e89f9c6fc6a0", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "ea34e55e-fef5-4ea4-a38b-635daa2fc1e5", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "d4f5ab53-4b88-48c0-90fb-e89f9c6fc6a0", + "LayerId": "98d0bcf7-807c-473a-abde-7424af1d68a1" + } + ] + }, + { + "id": "b0b530af-5999-4f0f-9d74-a1db64fcf176", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "92f24b35-1e2c-4d91-9449-08a7355beaf1", + "compositeImage": { + "id": "7ce11cd6-05a5-41a9-be91-b989c737cd49", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b0b530af-5999-4f0f-9d74-a1db64fcf176", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "785b84d2-d420-4512-9e06-9a95cd0449b8", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "b0b530af-5999-4f0f-9d74-a1db64fcf176", + "LayerId": "98d0bcf7-807c-473a-abde-7424af1d68a1" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 94, + "layers": [ + { + "id": "98d0bcf7-807c-473a-abde-7424af1d68a1", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "92f24b35-1e2c-4d91-9449-08a7355beaf1", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 0, + "originLocked": false, + "playbackSpeed": 0, + "playbackSpeedType": 0, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 349, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/Bloble/sprites/spr_SettingsSounds/991b1baa-693c-4a2d-9106-fadc632082cc.png b/Bloble/sprites/spr_SettingsSounds/991b1baa-693c-4a2d-9106-fadc632082cc.png new file mode 100644 index 0000000..d91b10a Binary files /dev/null and b/Bloble/sprites/spr_SettingsSounds/991b1baa-693c-4a2d-9106-fadc632082cc.png differ diff --git a/Bloble/sprites/spr_SettingsSounds/f6c6184e-780b-47b7-a293-f5953d1d6f47.png b/Bloble/sprites/spr_SettingsSounds/f6c6184e-780b-47b7-a293-f5953d1d6f47.png new file mode 100644 index 0000000..5bfd6b9 Binary files /dev/null and b/Bloble/sprites/spr_SettingsSounds/f6c6184e-780b-47b7-a293-f5953d1d6f47.png differ diff --git a/Bloble/sprites/spr_SettingsSounds/layers/991b1baa-693c-4a2d-9106-fadc632082cc/34eddc48-c340-47c8-9d94-51e9684f0f83.png b/Bloble/sprites/spr_SettingsSounds/layers/991b1baa-693c-4a2d-9106-fadc632082cc/34eddc48-c340-47c8-9d94-51e9684f0f83.png new file mode 100644 index 0000000..8091b49 Binary files /dev/null and b/Bloble/sprites/spr_SettingsSounds/layers/991b1baa-693c-4a2d-9106-fadc632082cc/34eddc48-c340-47c8-9d94-51e9684f0f83.png differ diff --git a/Bloble/sprites/spr_SettingsSounds/layers/f6c6184e-780b-47b7-a293-f5953d1d6f47/34eddc48-c340-47c8-9d94-51e9684f0f83.png b/Bloble/sprites/spr_SettingsSounds/layers/f6c6184e-780b-47b7-a293-f5953d1d6f47/34eddc48-c340-47c8-9d94-51e9684f0f83.png new file mode 100644 index 0000000..cb33857 Binary files /dev/null and b/Bloble/sprites/spr_SettingsSounds/layers/f6c6184e-780b-47b7-a293-f5953d1d6f47/34eddc48-c340-47c8-9d94-51e9684f0f83.png differ diff --git a/Bloble/sprites/spr_SettingsSounds/spr_SettingsSounds.yy b/Bloble/sprites/spr_SettingsSounds/spr_SettingsSounds.yy new file mode 100644 index 0000000..6db9933 --- /dev/null +++ b/Bloble/sprites/spr_SettingsSounds/spr_SettingsSounds.yy @@ -0,0 +1,92 @@ +{ + "id": "933dadd2-0f69-438b-aab2-769241e10022", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_SettingsSounds", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 90, + "bbox_left": 4, + "bbox_right": 439, + "bbox_top": 3, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "991b1baa-693c-4a2d-9106-fadc632082cc", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "933dadd2-0f69-438b-aab2-769241e10022", + "compositeImage": { + "id": "6e1bf973-64d8-4762-8f49-7b05d04d9ad4", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "991b1baa-693c-4a2d-9106-fadc632082cc", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "47315671-0486-4eac-a27b-e0d51871c702", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "991b1baa-693c-4a2d-9106-fadc632082cc", + "LayerId": "34eddc48-c340-47c8-9d94-51e9684f0f83" + } + ] + }, + { + "id": "f6c6184e-780b-47b7-a293-f5953d1d6f47", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "933dadd2-0f69-438b-aab2-769241e10022", + "compositeImage": { + "id": "e7088f06-b7a7-42f3-848f-bcdc55b7766c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "f6c6184e-780b-47b7-a293-f5953d1d6f47", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "be7b18ff-e7cd-4701-a489-8ebda7814df6", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "f6c6184e-780b-47b7-a293-f5953d1d6f47", + "LayerId": "34eddc48-c340-47c8-9d94-51e9684f0f83" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 94, + "layers": [ + { + "id": "34eddc48-c340-47c8-9d94-51e9684f0f83", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "933dadd2-0f69-438b-aab2-769241e10022", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 0, + "originLocked": false, + "playbackSpeed": 0, + "playbackSpeedType": 0, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 444, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/Bloble/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy b/Bloble/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy index 0c356d1..127651f 100644 --- a/Bloble/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy +++ b/Bloble/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy @@ -8,7 +8,11 @@ "71e9d27f-3ccb-452d-b48e-6c778a10ca70", "31178adc-7f07-4035-bcf4-e67ba70c695e", "100571dd-a072-498d-85b3-f2c233ffa920", - "de954864-d7c0-484a-aa93-678bc065b3f3" + "de954864-d7c0-484a-aa93-678bc065b3f3", + "92f24b35-1e2c-4d91-9449-08a7355beaf1", + "31e69599-86a9-4641-8f9a-e984d4c8f29b", + "933dadd2-0f69-438b-aab2-769241e10022", + "16040f1b-d4ec-4a3c-9417-65876de703f9" ], "filterType": "GMSprite", "folderName": "sprites", diff --git a/Bloble/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy b/Bloble/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy index a133eda..09273ea 100644 --- a/Bloble/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy +++ b/Bloble/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy @@ -8,7 +8,12 @@ "935738f8-eae9-4f04-92e3-8befaf10d58a", "158c5696-455f-4087-8e55-a3002c52d760", "05d20e71-992a-46a3-beac-15c2c8240e3d", - "1b2b931d-4277-45e3-8636-1647f9927755" + "1b2b931d-4277-45e3-8636-1647f9927755", + "e70af72a-9b4f-4b8e-8298-30597ded4f82", + "ee46e014-5001-4550-bb4f-c6f6dc79dc00", + "58b602c0-8f98-4f17-a1c7-fa569efeb87f", + "5275a5d8-3cbc-4243-b700-d7d84a5810cf", + "dde55b2d-cd00-4caa-af7b-6e6ce76b5b0b" ], "filterType": "GMObject", "folderName": "objects",