diff --git a/Bloble/Bloble.yyp b/Bloble/Bloble.yyp index 21f09d4..2c1f822 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": { @@ -102,34 +110,6 @@ "resourceType": "GMObject" } }, - { - "Key": "22e5aecc-b790-45e2-9bad-33226e227975", - "Value": { - "id": "ecadad82-8706-4970-a71c-317c6f6f8bd3", - "resourcePath": "sprites\\spr_SelectTitle\\spr_SelectTitle.yy", - "resourceType": "GMSprite" - } - }, - { -<<<<<<< HEAD - "Key": "2a60349a-75dd-4f3c-999e-a48a7ba5597a", - "Value": { - "id": "0f6bf214-bcaf-4e0a-ad98-2c62847dd5f2", - "resourcePath": "objects\\obj_SelectTitle\\obj_SelectTitle.yy", - "resourceType": "GMObject" - } - }, - { - "Key": "2f3972f2-f753-44b0-b78f-63821933cdf4", -======= - "Key": "459fd507-8dd1-4a9a-ad84-99f965b5e2bb", ->>>>>>> parent of 2dc7a41... Updated Settings Menu - "Value": { - "id": "84386c30-f3db-41b4-acaf-619b01b27322", - "resourcePath": "objects\\obj_selectred\\obj_selectred.yy", - "resourceType": "GMObject" - } - }, { "Key": "31178adc-7f07-4035-bcf4-e67ba70c695e", "Value": { @@ -139,7 +119,14 @@ } }, { -<<<<<<< HEAD + "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": { "id": "41ae8cc4-398f-4f6c-bb8f-8ad4cba4ce2a", @@ -156,8 +143,22 @@ } }, { -======= ->>>>>>> parent of 2dc7a41... Updated Settings Menu + "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": { "id": "4e8847c5-4702-4228-b61d-37e1ded37bf0", @@ -173,14 +174,6 @@ "resourceType": "GMFolder" } }, - { - "Key": "6de4d386-0706-454c-ac05-e0a8eac9f3a5", - "Value": { - "id": "577199fc-6ed2-439e-b5d0-17bb7ccb3e03", - "resourcePath": "objects\\obj_selectpink\\obj_selectpink.yy", - "resourceType": "GMObject" - } - }, { "Key": "71e9d27f-3ccb-452d-b48e-6c778a10ca70", "Value": { @@ -198,41 +191,22 @@ } }, { -<<<<<<< HEAD - "Key": "85ee39f4-76e5-479a-9f09-7f2d098ab2f1", + "Key": "92f24b35-1e2c-4d91-9449-08a7355beaf1", "Value": { - "id": "e059091b-23b3-4f8f-a2bd-12f4d300a5e0", - "resourcePath": "sprites\\spr_pink_blob\\spr_pink_blob.yy", + "id": "608569f5-90a2-4c9d-ba6a-357823ab8130", + "resourcePath": "sprites\/spr_SettingsMusic\/spr_SettingsMusic.yy", "resourceType": "GMSprite" } }, { - "Key": "8aded94a-88d7-418f-9020-f5e6721a98fd", + "Key": "933dadd2-0f69-438b-aab2-769241e10022", "Value": { - "id": "a28afe47-3471-4d09-a6e0-e0ffb22f7550", - "resourcePath": "objects\\obj_playerblob\\obj_playerblob.yy", - "resourceType": "GMObject" + "id": "8f25b848-5927-402d-abeb-3dee1e22ede4", + "resourcePath": "sprites\/spr_SettingsSounds\/spr_SettingsSounds.yy", + "resourceType": "GMSprite" } }, { - "Key": "8b68a95c-7778-428d-a9c0-3cd3c2b245ca", - "Value": { - "id": "e391d0c7-9630-4326-9ece-6dca1c6c1af3", - "resourcePath": "objects\\obj_selectgreen\\obj_selectgreen.yy", - "resourceType": "GMObject" - } - }, - { - "Key": "8e9aad52-7e04-4d17-aa27-28bc094b5283", - "Value": { - "id": "5bb14860-9c68-4b3c-b9ea-de0c8648cd92", - "resourcePath": "objects\\obj_selectorange\\obj_selectorange.yy", - "resourceType": "GMObject" - } - }, - { -======= ->>>>>>> parent of 2dc7a41... Updated Settings Menu "Key": "935738f8-eae9-4f04-92e3-8befaf10d58a", "Value": { "id": "bf728e91-a229-43bd-b3fe-9af14da06e3b", @@ -240,14 +214,6 @@ "resourceType": "GMObject" } }, - { - "Key": "96b498fe-6685-431a-9fe4-8bc1ea6aaef1", - "Value": { - "id": "c4a92175-f1ce-4dca-a4df-503d3ca6e429", - "resourcePath": "rooms\\rm_PlayerRoom\\rm_PlayerRoom.yy", - "resourceType": "GMRoom" - } - }, { "Key": "96c3096d-469f-400d-afbe-272414346072", "Value": { @@ -264,14 +230,6 @@ "resourceType": "GMFolder" } }, - { - "Key": "a05a446d-e422-42a7-94b3-84d78fabb29b", - "Value": { - "id": "38478e04-6522-40a4-8cf9-824fc480dd63", - "resourcePath": "sprites\\spr_orange_blob\\spr_orange_blob.yy", - "resourceType": "GMSprite" - } - }, { "Key": "a45c54eb-9ab7-4d77-b66d-96848012e9fc", "Value": { @@ -288,22 +246,6 @@ "resourceType": "GMObject" } }, - { - "Key": "b20cffb2-fccb-4728-94e8-45c4b7287537", - "Value": { - "id": "c75ec11a-8aaa-439a-b38c-2c814990b1b1", - "resourcePath": "sprites\\spr_yellow_blob\\spr_yellow_blob.yy", - "resourceType": "GMSprite" - } - }, - { - "Key": "bed83d33-5157-44a0-a5c7-c4521895bf6f", - "Value": { - "id": "f6c8feac-e5d8-418e-8b9c-54a3dfde299c", - "resourcePath": "sprites\\spr_red_blob\\spr_red_blob.yy", - "resourceType": "GMSprite" - } - }, { "Key": "c328598b-331b-4d31-837c-0aa70b51ee3c", "Value": { @@ -336,31 +278,6 @@ "resourceType": "GMFolder" } }, - { - "Key": "c83d776e-7a0a-48b8-a72e-070906371d65", - "Value": { - "id": "fb3e5859-22d5-4887-a68e-c901e115a353", - "resourcePath": "sprites\\spr_green_blob\\spr_green_blob.yy", - "resourceType": "GMSprite" - } - }, - { -<<<<<<< HEAD - "Key": "cc98d028-7bdd-4680-85f3-c87a7baa481e", - "Value": { - "id": "162beb35-ef2b-45ae-85eb-f9925c371d92", - "resourcePath": "options\\windows\\options_windows.yy", - "resourceType": "GMWindowsOptions" - } - }, - { - "Key": "d2c5ecf6-5036-4867-a91e-b3c1a8ace21d", - "Value": { - "id": "e570a817-6339-4c7b-8f3e-038ca3e62115", - "resourcePath": "objects\\obj_selectblue\\obj_selectblue.yy", - "resourceType": "GMObject" - } - }, { "Key": "dd2fc978-0a6f-4331-91a6-12060298c4e0", "Value": { @@ -370,15 +287,29 @@ } }, { -======= ->>>>>>> parent of 2dc7a41... Updated Settings Menu + "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": { "id": "85caaad7-c676-4099-bb9f-e9be118df57c", - "resourcePath": "sprites\\spr_blue_blob\\spr_blue_blob.yy", + "resourcePath": "sprites\/img_blue_01\/img_blue_01.yy", "resourceType": "GMSprite" } }, + { + "Key": "def7666c-ef6c-4ef5-8d14-15e60a2506aa", + "Value": { + "id": "3ede5aed-08a3-4209-b33a-a355fffce7e8", + "resourcePath": "views\/def7666c-ef6c-4ef5-8d14-15e60a2506aa.yy", + "resourceType": "GMFolder" + } + }, { "Key": "e397fd61-3040-4d63-a320-7d2e697fa442", "Value": { @@ -388,17 +319,14 @@ } }, { -<<<<<<< HEAD - "Key": "e7a1ffd3-d5aa-4c90-ae95-ec61c49f0a94", + "Key": "e70af72a-9b4f-4b8e-8298-30597ded4f82", "Value": { - "id": "40d80261-9904-42ab-a53f-d88314b13119", - "resourcePath": "objects\\obj_selectyellow\\obj_selectyellow.yy", + "id": "a6984560-2cf0-4c54-bd22-f1d585c3ee3e", + "resourcePath": "objects\/obj_Back\/obj_Back.yy", "resourceType": "GMObject" } }, { -======= ->>>>>>> parent of 2dc7a41... Updated Settings Menu "Key": "e97866c9-798a-4e1b-b440-90ed4968a976", "Value": { "id": "559f0939-b8bc-4840-a759-597964c5e651", @@ -406,6 +334,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_selectblue/obj_selectblue.yy b/Bloble/objects/obj_Back/obj_Back.yy similarity index 57% rename from Bloble/objects/obj_selectblue/obj_selectblue.yy rename to Bloble/objects/obj_Back/obj_Back.yy index 902cf42..2149e77 100644 --- a/Bloble/objects/obj_selectblue/obj_selectblue.yy +++ b/Bloble/objects/obj_Back/obj_Back.yy @@ -1,10 +1,19 @@ { - "id": "d2c5ecf6-5036-4867-a91e-b3c1a8ace21d", + "id": "e70af72a-9b4f-4b8e-8298-30597ded4f82", "modelName": "GMObject", "mvc": "1.0", - "name": "obj_selectblue", + "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, @@ -24,6 +33,6 @@ "physicsStartAwake": true, "properties": null, "solid": false, - "spriteId": "de954864-d7c0-484a-aa93-678bc065b3f3", + "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_selectgreen/obj_selectgreen.yy b/Bloble/objects/obj_SettingsMusic/obj_SettingsMusic.yy similarity index 57% rename from Bloble/objects/obj_selectgreen/obj_selectgreen.yy rename to Bloble/objects/obj_SettingsMusic/obj_SettingsMusic.yy index 9398119..ed8e26c 100644 --- a/Bloble/objects/obj_selectgreen/obj_selectgreen.yy +++ b/Bloble/objects/obj_SettingsMusic/obj_SettingsMusic.yy @@ -1,10 +1,19 @@ { - "id": "8b68a95c-7778-428d-a9c0-3cd3c2b245ca", + "id": "ee46e014-5001-4550-bb4f-c6f6dc79dc00", "modelName": "GMObject", "mvc": "1.0", - "name": "obj_selectgreen", + "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, @@ -24,6 +33,6 @@ "physicsStartAwake": true, "properties": null, "solid": false, - "spriteId": "c83d776e-7a0a-48b8-a72e-070906371d65", + "spriteId": "92f24b35-1e2c-4d91-9449-08a7355beaf1", "visible": true } \ No newline at end of file diff --git a/Bloble/objects/obj_SelectTitle/obj_SelectTitle.yy b/Bloble/objects/obj_SettingsReset/obj_SettingsReset.yy similarity index 83% rename from Bloble/objects/obj_SelectTitle/obj_SelectTitle.yy rename to Bloble/objects/obj_SettingsReset/obj_SettingsReset.yy index c1160f0..2777fc7 100644 --- a/Bloble/objects/obj_SelectTitle/obj_SelectTitle.yy +++ b/Bloble/objects/obj_SettingsReset/obj_SettingsReset.yy @@ -1,8 +1,8 @@ { - "id": "2a60349a-75dd-4f3c-999e-a48a7ba5597a", + "id": "dde55b2d-cd00-4caa-af7b-6e6ce76b5b0b", "modelName": "GMObject", "mvc": "1.0", - "name": "obj_SelectTitle", + "name": "obj_SettingsReset", "eventList": [ ], @@ -24,6 +24,6 @@ "physicsStartAwake": true, "properties": null, "solid": false, - "spriteId": "22e5aecc-b790-45e2-9bad-33226e227975", + "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_playerblob/obj_playerblob.yy b/Bloble/objects/obj_SettingsTitle/obj_SettingsTitle.yy similarity index 83% rename from Bloble/objects/obj_playerblob/obj_playerblob.yy rename to Bloble/objects/obj_SettingsTitle/obj_SettingsTitle.yy index c50570c..7fa05c5 100644 --- a/Bloble/objects/obj_playerblob/obj_playerblob.yy +++ b/Bloble/objects/obj_SettingsTitle/obj_SettingsTitle.yy @@ -1,8 +1,8 @@ { - "id": "8aded94a-88d7-418f-9020-f5e6721a98fd", + "id": "58b602c0-8f98-4f17-a1c7-fa569efeb87f", "modelName": "GMObject", "mvc": "1.0", - "name": "obj_playerblob", + "name": "obj_SettingsTitle", "eventList": [ ], @@ -24,6 +24,6 @@ "physicsStartAwake": true, "properties": null, "solid": false, - "spriteId": "00000000-0000-0000-0000-000000000000", + "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/objects/obj_selectorange/obj_selectorange.yy b/Bloble/objects/obj_selectorange/obj_selectorange.yy deleted file mode 100644 index a2c5776..0000000 --- a/Bloble/objects/obj_selectorange/obj_selectorange.yy +++ /dev/null @@ -1,29 +0,0 @@ -{ - "id": "8e9aad52-7e04-4d17-aa27-28bc094b5283", - "modelName": "GMObject", - "mvc": "1.0", - "name": "obj_selectorange", - "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": "a05a446d-e422-42a7-94b3-84d78fabb29b", - "visible": true -} \ No newline at end of file diff --git a/Bloble/objects/obj_selectpink/obj_selectpink.yy b/Bloble/objects/obj_selectpink/obj_selectpink.yy deleted file mode 100644 index d150af0..0000000 --- a/Bloble/objects/obj_selectpink/obj_selectpink.yy +++ /dev/null @@ -1,29 +0,0 @@ -{ - "id": "6de4d386-0706-454c-ac05-e0a8eac9f3a5", - "modelName": "GMObject", - "mvc": "1.0", - "name": "obj_selectpink", - "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": "85ee39f4-76e5-479a-9f09-7f2d098ab2f1", - "visible": true -} \ No newline at end of file diff --git a/Bloble/objects/obj_selectred/obj_selectred.yy b/Bloble/objects/obj_selectred/obj_selectred.yy deleted file mode 100644 index 722ac2c..0000000 --- a/Bloble/objects/obj_selectred/obj_selectred.yy +++ /dev/null @@ -1,29 +0,0 @@ -{ - "id": "2f3972f2-f753-44b0-b78f-63821933cdf4", - "modelName": "GMObject", - "mvc": "1.0", - "name": "obj_selectred", - "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": "bed83d33-5157-44a0-a5c7-c4521895bf6f", - "visible": true -} \ No newline at end of file diff --git a/Bloble/objects/obj_selectyellow/obj_selectyellow.yy b/Bloble/objects/obj_selectyellow/obj_selectyellow.yy deleted file mode 100644 index 3d277b1..0000000 --- a/Bloble/objects/obj_selectyellow/obj_selectyellow.yy +++ /dev/null @@ -1,29 +0,0 @@ -{ - "id": "e7a1ffd3-d5aa-4c90-ae95-ec61c49f0a94", - "modelName": "GMObject", - "mvc": "1.0", - "name": "obj_selectyellow", - "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": "b20cffb2-fccb-4728-94e8-45c4b7287537", - "visible": true -} \ No newline at end of file diff --git a/Bloble/options/main/inherited/options_main.inherited.yy b/Bloble/options/main/inherited/options_main.inherited.yy index 4f41c1d..246d020 100644 --- a/Bloble/options/main/inherited/options_main.inherited.yy +++ b/Bloble/options/main/inherited/options_main.inherited.yy @@ -3,7 +3,9 @@ "Value": 4278190080 }, "option_gameguid": "01dcc542-ecfc-4264-acca-c1fb92ec80a4", - "option_game_speed": 60 + "option_game_speed": 60, + "option_lastchanged": "15 July 2019 13:08:40", + "option_sci_usesci": true }←1225f6b0-ac20-43bd-a82e-be73fa0b6f4f|{ "targets": 461609314234257646 }←7b2c4976-1e09-44e5-8256-c527145e03bb|{ diff --git a/Bloble/options/windows/options_windows.yy b/Bloble/options/windows/options_windows.yy deleted file mode 100644 index a9bf9df..0000000 --- a/Bloble/options/windows/options_windows.yy +++ /dev/null @@ -1,40 +0,0 @@ -{ - "id": "cc98d028-7bdd-4680-85f3-c87a7baa481e", - "modelName": "GMWindowsOptions", - "mvc": "1.0", - "name": "Windows", - "option_windows_allow_fullscreen_switching": false, - "option_windows_borderless": false, - "option_windows_company_info": "YoYo Games Ltd", - "option_windows_copy_exe_to_dest": false, - "option_windows_copyright_info": "(c) 2018 CompanyName", - "option_windows_description_info": "A GameMaker Studio 2 Game", - "option_windows_disable_sandbox": false, - "option_windows_display_cursor": true, - "option_windows_display_name": "Made in GameMaker Studio 2", - "option_windows_enable_steam": false, - "option_windows_executable_name": "${project_name}", - "option_windows_icon": "${base_options_dir}\\windows\\icons\\icon.ico", - "option_windows_installer_finished": "${base_options_dir}\\windows\\installer\\finished.bmp", - "option_windows_installer_header": "${base_options_dir}\\windows\\installer\\header.bmp", - "option_windows_interpolate_pixels": false, - "option_windows_license": "${base_options_dir}\\windows\\installer\\license.txt", - "option_windows_nsis_file": "${base_options_dir}\\windows\\installer\\nsis_script.nsi", - "option_windows_product_info": "Made in GameMaker Studio 2", - "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": true, - "option_windows_texture_page": "2048x2048", - "option_windows_use_splash": false, - "option_windows_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - }, - "option_windows_vsync": false -} \ No newline at end of file diff --git a/Bloble/rooms/rm_PlayerRoom/rm_PlayerRoom.yy b/Bloble/rooms/rm_PlayerRoom/rm_PlayerRoom.yy deleted file mode 100644 index c590703..0000000 --- a/Bloble/rooms/rm_PlayerRoom/rm_PlayerRoom.yy +++ /dev/null @@ -1,117 +0,0 @@ - -{ - "name": "rm_PlayerRoom", - "id": "96b498fe-6685-431a-9fe4-8bc1ea6aaef1", - "creationCodeFile": "", - "inheritCode": false, - "inheritCreationOrder": false, - "inheritLayers": false, - "instanceCreationOrderIDs": [ - - ], - "IsDnD": false, - "layers": [ - { - "__type": "GMRInstanceLayer_Model:#YoYoStudio.MVCFormat", - "name": "Instances", - "id": "6011f209-02ff-4f1b-b1df-da31b4f8f580", - "depth": 0, - "grid_x": 32, - "grid_y": 32, - "hierarchyFrozen": false, - "hierarchyVisible": true, - "inheritLayerDepth": false, - "inheritLayerSettings": false, - "inheritSubLayers": false, - "inheritVisibility": false, - "instances": [ - - ], - "layers": [ - - ], - "m_parentID": "00000000-0000-0000-0000-000000000000", - "m_serialiseFrozen": false, - "modelName": "GMRInstanceLayer", - "mvc": "1.0", - "userdefined_depth": false, - "visible": true - }, - { - "__type": "GMRBackgroundLayer_Model:#YoYoStudio.MVCFormat", - "name": "Background", - "id": "da5fa3c1-32ae-4d42-b0a2-8f6f04b9abff", - "animationFPS": 15, - "animationSpeedType": "0", - "colour": { "Value": 4294967295 }, - "depth": 100, - "grid_x": 32, - "grid_y": 32, - "hierarchyFrozen": false, - "hierarchyVisible": true, - "hspeed": 0, - "htiled": false, - "inheritLayerDepth": false, - "inheritLayerSettings": false, - "inheritSubLayers": false, - "inheritVisibility": false, - "layers": [ - - ], - "m_parentID": "00000000-0000-0000-0000-000000000000", - "m_serialiseFrozen": false, - "modelName": "GMRBackgroundLayer", - "mvc": "1.0", - "spriteId": "00000000-0000-0000-0000-000000000000", - "stretch": false, - "userdefined_animFPS": false, - "userdefined_depth": false, - "visible": true, - "vspeed": 0, - "vtiled": false, - "x": 0, - "y": 0 - } - ], - "modelName": "GMRoom", - "parentId": "00000000-0000-0000-0000-000000000000", - "physicsSettings": { - "id": "debe9061-00a3-44e3-9eae-8f08635de50c", - "inheritPhysicsSettings": false, - "modelName": "GMRoomPhysicsSettings", - "PhysicsWorld": false, - "PhysicsWorldGravityX": 0, - "PhysicsWorldGravityY": 10, - "PhysicsWorldPixToMeters": 0.1, - "mvc": "1.0" - }, - "roomSettings": { - "id": "d3fec443-7ef3-49e5-aa2c-d82780c412d9", - "Height": 1920, - "inheritRoomSettings": false, - "modelName": "GMRoomSettings", - "persistent": false, - "mvc": "1.0", - "Width": 1080 - }, - "mvc": "1.0", - "views": [ -{"id": "c52c6370-d1b4-41cd-af33-097582fa8897","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "cc8e22bd-71b1-40a6-9896-c2cabaa8624a","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "9956f553-7ed9-48fc-9e0a-07f4fd0a7f71","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "488e6e77-7295-4ec7-b45d-75deeb9f1524","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "13c8aaab-b030-4ef6-8d3b-98b46b3cdc8f","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "26eb46de-ea57-4f90-b666-161d73591039","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "a602b088-e928-47c0-915c-fb029ff35e2d","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, -{"id": "2958db10-d2f3-47ad-89eb-123847f5d2f3","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0} - ], - "viewSettings": { - "id": "b52ff28e-46be-4b97-83f3-ddadbac9f1f5", - "clearDisplayBuffer": true, - "clearViewBackground": false, - "enableViews": false, - "inheritViewSettings": false, - "modelName": "GMRoomViewSettings", - "mvc": "1.0" - } -} \ No newline at end of file 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/rooms/rm_Start/rm_Start.yy b/Bloble/rooms/rm_Start/rm_Start.yy index d1e735c..7cad4d6 100644 --- a/Bloble/rooms/rm_Start/rm_Start.yy +++ b/Bloble/rooms/rm_Start/rm_Start.yy @@ -7,13 +7,7 @@ "inheritCreationOrder": false, "inheritLayers": false, "instanceCreationOrderIDs": [ - "de3fa082-915e-4c1c-9211-e6474490154b", - "65502b24-258d-42f7-8671-7a4900ab72f4", - "4c186888-061c-49dc-87ce-a004d040bdaa", - "af5e1d10-9afa-43d2-b089-6da0265d3770", - "96002c2e-e305-443f-929c-40b41109041b", - "be7521f5-d964-485c-9564-b06c158d9881", - "c4a36480-b476-494c-b195-25b5365e2979" + ], "IsDnD": false, "layers": [ @@ -31,13 +25,7 @@ "inheritSubLayers": false, "inheritVisibility": false, "instances": [ -{"name": "inst_26BA1775","id": "de3fa082-915e-4c1c-9211-e6474490154b","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_26BA1775","objId": "2f3972f2-f753-44b0-b78f-63821933cdf4","properties": null,"rotation": 0,"scaleX": 6,"scaleY": 6,"mvc": "1.1","x": 32,"y": 384}, -{"name": "inst_7BA18DFD","id": "65502b24-258d-42f7-8671-7a4900ab72f4","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_7BA18DFD","objId": "8e9aad52-7e04-4d17-aa27-28bc094b5283","properties": null,"rotation": 0,"scaleX": 6,"scaleY": 6,"mvc": "1.1","x": 384,"y": 384}, -{"name": "inst_56C05D0B","id": "4c186888-061c-49dc-87ce-a004d040bdaa","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_56C05D0B","objId": "6de4d386-0706-454c-ac05-e0a8eac9f3a5","properties": null,"rotation": 0,"scaleX": 6,"scaleY": 6,"mvc": "1.1","x": 32,"y": 736}, -{"name": "inst_74B89040","id": "af5e1d10-9afa-43d2-b089-6da0265d3770","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_74B89040","objId": "e7a1ffd3-d5aa-4c90-ae95-ec61c49f0a94","properties": null,"rotation": 0,"scaleX": 6,"scaleY": 6,"mvc": "1.1","x": 736,"y": 384}, -{"name": "inst_7E47C430","id": "96002c2e-e305-443f-929c-40b41109041b","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_7E47C430","objId": "d2c5ecf6-5036-4867-a91e-b3c1a8ace21d","properties": null,"rotation": 0,"scaleX": 6,"scaleY": 6,"mvc": "1.1","x": 352,"y": 928}, -{"name": "inst_6BA5CC16","id": "be7521f5-d964-485c-9564-b06c158d9881","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_6BA5CC16","objId": "2a60349a-75dd-4f3c-999e-a48a7ba5597a","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 224,"y": 96}, -{"name": "inst_171C6FB7","id": "c4a36480-b476-494c-b195-25b5365e2979","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_171C6FB7","objId": "8b68a95c-7778-428d-a9c0-3cd3c2b245ca","properties": null,"rotation": 0,"scaleX": 6,"scaleY": 6,"mvc": "1.1","x": 736,"y": 736} + ], "layers": [ @@ -55,7 +43,7 @@ "id": "00a0e759-0163-4059-b316-94f69ffb7fd4", "animationFPS": 15, "animationSpeedType": "0", - "colour": { "Value": 4294967295 }, + "colour": { "Value": 4278190080 }, "depth": 100, "grid_x": 32, "grid_y": 32, @@ -99,12 +87,12 @@ }, "roomSettings": { "id": "4f8f7c06-8106-44ce-aef0-498f881c19e7", - "Height": 1920, + "Height": 768, "inheritRoomSettings": false, "modelName": "GMRoomSettings", "persistent": false, "mvc": "1.0", - "Width": 1080 + "Width": 1024 }, "mvc": "1.0", "views": [ diff --git a/Bloble/sprites/spr_blue_blob/4f074779-97a7-471e-81a9-7f564fc0efec.png b/Bloble/sprites/img_blue_01/4f074779-97a7-471e-81a9-7f564fc0efec.png similarity index 100% rename from Bloble/sprites/spr_blue_blob/4f074779-97a7-471e-81a9-7f564fc0efec.png rename to Bloble/sprites/img_blue_01/4f074779-97a7-471e-81a9-7f564fc0efec.png diff --git a/Bloble/sprites/spr_blue_blob/66520b63-fad2-4686-a98e-4e0ce22f411d.png b/Bloble/sprites/img_blue_01/66520b63-fad2-4686-a98e-4e0ce22f411d.png similarity index 100% rename from Bloble/sprites/spr_blue_blob/66520b63-fad2-4686-a98e-4e0ce22f411d.png rename to Bloble/sprites/img_blue_01/66520b63-fad2-4686-a98e-4e0ce22f411d.png diff --git a/Bloble/sprites/spr_blue_blob/6c2b305d-e03e-424e-acfb-913ee2b3f782.png b/Bloble/sprites/img_blue_01/6c2b305d-e03e-424e-acfb-913ee2b3f782.png similarity index 100% rename from Bloble/sprites/spr_blue_blob/6c2b305d-e03e-424e-acfb-913ee2b3f782.png rename to Bloble/sprites/img_blue_01/6c2b305d-e03e-424e-acfb-913ee2b3f782.png diff --git a/Bloble/sprites/spr_blue_blob/7d95663b-175c-4258-b364-25e0d8fdbffe.png b/Bloble/sprites/img_blue_01/7d95663b-175c-4258-b364-25e0d8fdbffe.png similarity index 100% rename from Bloble/sprites/spr_blue_blob/7d95663b-175c-4258-b364-25e0d8fdbffe.png rename to Bloble/sprites/img_blue_01/7d95663b-175c-4258-b364-25e0d8fdbffe.png diff --git a/Bloble/sprites/spr_blue_blob/spr_blue_blob.yy b/Bloble/sprites/img_blue_01/img_blue_01.yy similarity index 99% rename from Bloble/sprites/spr_blue_blob/spr_blue_blob.yy rename to Bloble/sprites/img_blue_01/img_blue_01.yy index 5e77cd1..eaff88d 100644 --- a/Bloble/sprites/spr_blue_blob/spr_blue_blob.yy +++ b/Bloble/sprites/img_blue_01/img_blue_01.yy @@ -2,7 +2,7 @@ "id": "de954864-d7c0-484a-aa93-678bc065b3f3", "modelName": "GMSprite", "mvc": "1.12", - "name": "spr_blue_blob", + "name": "img_blue_01", "For3D": false, "HTile": false, "VTile": false, diff --git a/Bloble/sprites/spr_blue_blob/layers/4f074779-97a7-471e-81a9-7f564fc0efec/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png b/Bloble/sprites/img_blue_01/layers/4f074779-97a7-471e-81a9-7f564fc0efec/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png similarity index 100% rename from Bloble/sprites/spr_blue_blob/layers/4f074779-97a7-471e-81a9-7f564fc0efec/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png rename to Bloble/sprites/img_blue_01/layers/4f074779-97a7-471e-81a9-7f564fc0efec/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png diff --git a/Bloble/sprites/spr_blue_blob/layers/66520b63-fad2-4686-a98e-4e0ce22f411d/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png b/Bloble/sprites/img_blue_01/layers/66520b63-fad2-4686-a98e-4e0ce22f411d/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png similarity index 100% rename from Bloble/sprites/spr_blue_blob/layers/66520b63-fad2-4686-a98e-4e0ce22f411d/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png rename to Bloble/sprites/img_blue_01/layers/66520b63-fad2-4686-a98e-4e0ce22f411d/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png diff --git a/Bloble/sprites/spr_blue_blob/layers/6c2b305d-e03e-424e-acfb-913ee2b3f782/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png b/Bloble/sprites/img_blue_01/layers/6c2b305d-e03e-424e-acfb-913ee2b3f782/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png similarity index 100% rename from Bloble/sprites/spr_blue_blob/layers/6c2b305d-e03e-424e-acfb-913ee2b3f782/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png rename to Bloble/sprites/img_blue_01/layers/6c2b305d-e03e-424e-acfb-913ee2b3f782/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png diff --git a/Bloble/sprites/spr_blue_blob/layers/7d95663b-175c-4258-b364-25e0d8fdbffe/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png b/Bloble/sprites/img_blue_01/layers/7d95663b-175c-4258-b364-25e0d8fdbffe/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png similarity index 100% rename from Bloble/sprites/spr_blue_blob/layers/7d95663b-175c-4258-b364-25e0d8fdbffe/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png rename to Bloble/sprites/img_blue_01/layers/7d95663b-175c-4258-b364-25e0d8fdbffe/23ad4d32-b7f6-408a-bcf8-bc3f9b330ab1.png 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_SelectTitle/spr_SelectTitle.yy b/Bloble/sprites/spr_Back/spr_Back.yy similarity index 62% rename from Bloble/sprites/spr_SelectTitle/spr_SelectTitle.yy rename to Bloble/sprites/spr_Back/spr_Back.yy index 3d736c3..f60357d 100644 --- a/Bloble/sprites/spr_SelectTitle/spr_SelectTitle.yy +++ b/Bloble/sprites/spr_Back/spr_Back.yy @@ -1,52 +1,52 @@ { - "id": "22e5aecc-b790-45e2-9bad-33226e227975", + "id": "31e69599-86a9-4641-8f9a-e984d4c8f29b", "modelName": "GMSprite", "mvc": "1.12", - "name": "spr_SelectTitle", + "name": "spr_Back", "For3D": false, "HTile": false, "VTile": false, - "bbox_bottom": 193, + "bbox_bottom": 90, "bbox_left": 4, - "bbox_right": 608, - "bbox_top": 4, + "bbox_right": 291, + "bbox_top": 3, "bboxmode": 0, "colkind": 1, "coltolerance": 0, "edgeFiltering": false, "frames": [ { - "id": "97f48968-498a-4939-ac9c-3e23eb1acde0", + "id": "2e408e95-895d-4683-996a-0b250b3c28ad", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "22e5aecc-b790-45e2-9bad-33226e227975", + "SpriteId": "31e69599-86a9-4641-8f9a-e984d4c8f29b", "compositeImage": { - "id": "7e6f1175-c5c2-487e-85b9-6d100eef45bd", + "id": "7329f78b-f618-4613-87c2-5ab9252ec67b", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "97f48968-498a-4939-ac9c-3e23eb1acde0", + "FrameId": "2e408e95-895d-4683-996a-0b250b3c28ad", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "ffc2796f-17da-4267-bcc1-6929072c8d16", + "id": "0d1e8c77-ebc4-4607-90c1-3e3f5d11bfe6", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "97f48968-498a-4939-ac9c-3e23eb1acde0", - "LayerId": "2f5f3a66-e4c1-4495-a15d-81a8ce4fd2b4" + "FrameId": "2e408e95-895d-4683-996a-0b250b3c28ad", + "LayerId": "3c990f07-3e68-459f-bdcb-282d13ae653d" } ] } ], "gridX": 0, "gridY": 0, - "height": 198, + "height": 94, "layers": [ { - "id": "2f5f3a66-e4c1-4495-a15d-81a8ce4fd2b4", + "id": "3c990f07-3e68-459f-bdcb-282d13ae653d", "modelName": "GMImageLayer", "mvc": "1.0", - "SpriteId": "22e5aecc-b790-45e2-9bad-33226e227975", + "SpriteId": "31e69599-86a9-4641-8f9a-e984d4c8f29b", "blendMode": 0, "isLocked": false, "name": "default", @@ -64,7 +64,7 @@ "swfPrecision": 2.525, "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", "type": 0, - "width": 613, + "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_red_blob/spr_red_blob.yy b/Bloble/sprites/spr_Reset/spr_Reset.yy similarity index 62% rename from Bloble/sprites/spr_red_blob/spr_red_blob.yy rename to Bloble/sprites/spr_Reset/spr_Reset.yy index a66cfa4..441e43b 100644 --- a/Bloble/sprites/spr_red_blob/spr_red_blob.yy +++ b/Bloble/sprites/spr_Reset/spr_Reset.yy @@ -1,52 +1,52 @@ { - "id": "bed83d33-5157-44a0-a5c7-c4521895bf6f", + "id": "16040f1b-d4ec-4a3c-9417-65876de703f9", "modelName": "GMSprite", "mvc": "1.12", - "name": "spr_red_blob", + "name": "spr_Reset", "For3D": false, "HTile": false, "VTile": false, - "bbox_bottom": 43, - "bbox_left": 7, - "bbox_right": 42, - "bbox_top": 7, + "bbox_bottom": 91, + "bbox_left": 4, + "bbox_right": 356, + "bbox_top": 3, "bboxmode": 0, "colkind": 1, "coltolerance": 0, "edgeFiltering": false, "frames": [ { - "id": "f8422f64-bd05-4e59-ba80-324cc1ca1c1d", + "id": "9c39da9c-8256-4655-b2b3-b5873f64b000", "modelName": "GMSpriteFrame", "mvc": "1.0", - "SpriteId": "bed83d33-5157-44a0-a5c7-c4521895bf6f", + "SpriteId": "16040f1b-d4ec-4a3c-9417-65876de703f9", "compositeImage": { - "id": "5aebdbc8-884b-4c61-a408-9a9a8c0111d0", + "id": "6a31cf78-01cf-4721-ad48-a7c87a71cf78", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "f8422f64-bd05-4e59-ba80-324cc1ca1c1d", + "FrameId": "9c39da9c-8256-4655-b2b3-b5873f64b000", "LayerId": "00000000-0000-0000-0000-000000000000" }, "images": [ { - "id": "079bb046-c786-48ac-9b95-bb6767d5474e", + "id": "61df7495-2907-4b8e-840b-a8d9e0b6ef01", "modelName": "GMSpriteImage", "mvc": "1.0", - "FrameId": "f8422f64-bd05-4e59-ba80-324cc1ca1c1d", - "LayerId": "075d5b05-8060-42d3-a2cb-dedc6239c0b9" + "FrameId": "9c39da9c-8256-4655-b2b3-b5873f64b000", + "LayerId": "28c4ad81-16c0-4c72-a5fd-fefabd2cf04d" } ] } ], "gridX": 0, "gridY": 0, - "height": 50, + "height": 95, "layers": [ { - "id": "075d5b05-8060-42d3-a2cb-dedc6239c0b9", + "id": "28c4ad81-16c0-4c72-a5fd-fefabd2cf04d", "modelName": "GMImageLayer", "mvc": "1.0", - "SpriteId": "bed83d33-5157-44a0-a5c7-c4521895bf6f", + "SpriteId": "16040f1b-d4ec-4a3c-9417-65876de703f9", "blendMode": 0, "isLocked": false, "name": "default", @@ -64,7 +64,7 @@ "swfPrecision": 2.525, "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", "type": 0, - "width": 50, + "width": 361, "xorig": 0, "yorig": 0 } \ No newline at end of file diff --git a/Bloble/sprites/spr_SelectTitle/97f48968-498a-4939-ac9c-3e23eb1acde0.png b/Bloble/sprites/spr_SelectTitle/97f48968-498a-4939-ac9c-3e23eb1acde0.png deleted file mode 100644 index 5e04fc8..0000000 Binary files a/Bloble/sprites/spr_SelectTitle/97f48968-498a-4939-ac9c-3e23eb1acde0.png and /dev/null differ diff --git a/Bloble/sprites/spr_SelectTitle/layers/97f48968-498a-4939-ac9c-3e23eb1acde0/2f5f3a66-e4c1-4495-a15d-81a8ce4fd2b4.png b/Bloble/sprites/spr_SelectTitle/layers/97f48968-498a-4939-ac9c-3e23eb1acde0/2f5f3a66-e4c1-4495-a15d-81a8ce4fd2b4.png deleted file mode 100644 index 26b7546..0000000 Binary files a/Bloble/sprites/spr_SelectTitle/layers/97f48968-498a-4939-ac9c-3e23eb1acde0/2f5f3a66-e4c1-4495-a15d-81a8ce4fd2b4.png and /dev/null differ 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/sprites/spr_green_blob/23d3c1c1-a97e-4d51-bd72-78321b22adfb.png b/Bloble/sprites/spr_green_blob/23d3c1c1-a97e-4d51-bd72-78321b22adfb.png deleted file mode 100644 index d4ea3e0..0000000 Binary files a/Bloble/sprites/spr_green_blob/23d3c1c1-a97e-4d51-bd72-78321b22adfb.png and /dev/null differ diff --git a/Bloble/sprites/spr_green_blob/layers/23d3c1c1-a97e-4d51-bd72-78321b22adfb/54057c4e-9504-4bf6-8b00-d6553953de4e.png b/Bloble/sprites/spr_green_blob/layers/23d3c1c1-a97e-4d51-bd72-78321b22adfb/54057c4e-9504-4bf6-8b00-d6553953de4e.png deleted file mode 100644 index b92f901..0000000 Binary files a/Bloble/sprites/spr_green_blob/layers/23d3c1c1-a97e-4d51-bd72-78321b22adfb/54057c4e-9504-4bf6-8b00-d6553953de4e.png and /dev/null differ diff --git a/Bloble/sprites/spr_green_blob/spr_green_blob.yy b/Bloble/sprites/spr_green_blob/spr_green_blob.yy deleted file mode 100644 index d700c0b..0000000 --- a/Bloble/sprites/spr_green_blob/spr_green_blob.yy +++ /dev/null @@ -1,70 +0,0 @@ -{ - "id": "c83d776e-7a0a-48b8-a72e-070906371d65", - "modelName": "GMSprite", - "mvc": "1.12", - "name": "spr_green_blob", - "For3D": false, - "HTile": false, - "VTile": false, - "bbox_bottom": 43, - "bbox_left": 7, - "bbox_right": 42, - "bbox_top": 7, - "bboxmode": 0, - "colkind": 1, - "coltolerance": 0, - "edgeFiltering": false, - "frames": [ - { - "id": "23d3c1c1-a97e-4d51-bd72-78321b22adfb", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "c83d776e-7a0a-48b8-a72e-070906371d65", - "compositeImage": { - "id": "73605a66-111e-4427-8642-3b1be2b3932b", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "23d3c1c1-a97e-4d51-bd72-78321b22adfb", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "8024a123-6fa9-4242-a6f1-937a73560717", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "23d3c1c1-a97e-4d51-bd72-78321b22adfb", - "LayerId": "54057c4e-9504-4bf6-8b00-d6553953de4e" - } - ] - } - ], - "gridX": 0, - "gridY": 0, - "height": 50, - "layers": [ - { - "id": "54057c4e-9504-4bf6-8b00-d6553953de4e", - "modelName": "GMImageLayer", - "mvc": "1.0", - "SpriteId": "c83d776e-7a0a-48b8-a72e-070906371d65", - "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": 50, - "xorig": 0, - "yorig": 0 -} \ No newline at end of file diff --git a/Bloble/sprites/spr_orange_blob/f5ed401d-0651-4d57-8796-0b1440008257.png b/Bloble/sprites/spr_orange_blob/f5ed401d-0651-4d57-8796-0b1440008257.png deleted file mode 100644 index a941a3c..0000000 Binary files a/Bloble/sprites/spr_orange_blob/f5ed401d-0651-4d57-8796-0b1440008257.png and /dev/null differ diff --git a/Bloble/sprites/spr_orange_blob/layers/f5ed401d-0651-4d57-8796-0b1440008257/f9f04750-79b4-417d-8016-ae473edf35db.png b/Bloble/sprites/spr_orange_blob/layers/f5ed401d-0651-4d57-8796-0b1440008257/f9f04750-79b4-417d-8016-ae473edf35db.png deleted file mode 100644 index af96e5b..0000000 Binary files a/Bloble/sprites/spr_orange_blob/layers/f5ed401d-0651-4d57-8796-0b1440008257/f9f04750-79b4-417d-8016-ae473edf35db.png and /dev/null differ diff --git a/Bloble/sprites/spr_orange_blob/spr_orange_blob.yy b/Bloble/sprites/spr_orange_blob/spr_orange_blob.yy deleted file mode 100644 index 83f02d9..0000000 --- a/Bloble/sprites/spr_orange_blob/spr_orange_blob.yy +++ /dev/null @@ -1,70 +0,0 @@ -{ - "id": "a05a446d-e422-42a7-94b3-84d78fabb29b", - "modelName": "GMSprite", - "mvc": "1.12", - "name": "spr_orange_blob", - "For3D": false, - "HTile": false, - "VTile": false, - "bbox_bottom": 43, - "bbox_left": 7, - "bbox_right": 42, - "bbox_top": 7, - "bboxmode": 0, - "colkind": 1, - "coltolerance": 0, - "edgeFiltering": false, - "frames": [ - { - "id": "f5ed401d-0651-4d57-8796-0b1440008257", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "a05a446d-e422-42a7-94b3-84d78fabb29b", - "compositeImage": { - "id": "31edf9cb-e5df-4a21-8883-b4c6d9c8e782", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "f5ed401d-0651-4d57-8796-0b1440008257", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "7250195f-af49-4e77-b05d-b0a668300e92", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "f5ed401d-0651-4d57-8796-0b1440008257", - "LayerId": "f9f04750-79b4-417d-8016-ae473edf35db" - } - ] - } - ], - "gridX": 0, - "gridY": 0, - "height": 50, - "layers": [ - { - "id": "f9f04750-79b4-417d-8016-ae473edf35db", - "modelName": "GMImageLayer", - "mvc": "1.0", - "SpriteId": "a05a446d-e422-42a7-94b3-84d78fabb29b", - "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": 50, - "xorig": 0, - "yorig": 0 -} \ No newline at end of file diff --git a/Bloble/sprites/spr_pink_blob/bfed2340-25ee-46b9-ad12-0c108467ff49.png b/Bloble/sprites/spr_pink_blob/bfed2340-25ee-46b9-ad12-0c108467ff49.png deleted file mode 100644 index 77b4bde..0000000 Binary files a/Bloble/sprites/spr_pink_blob/bfed2340-25ee-46b9-ad12-0c108467ff49.png and /dev/null differ diff --git a/Bloble/sprites/spr_pink_blob/layers/bfed2340-25ee-46b9-ad12-0c108467ff49/0ddcfd38-2481-480a-98e1-e611ae5e67c3.png b/Bloble/sprites/spr_pink_blob/layers/bfed2340-25ee-46b9-ad12-0c108467ff49/0ddcfd38-2481-480a-98e1-e611ae5e67c3.png deleted file mode 100644 index 8068250..0000000 Binary files a/Bloble/sprites/spr_pink_blob/layers/bfed2340-25ee-46b9-ad12-0c108467ff49/0ddcfd38-2481-480a-98e1-e611ae5e67c3.png and /dev/null differ diff --git a/Bloble/sprites/spr_pink_blob/spr_pink_blob.yy b/Bloble/sprites/spr_pink_blob/spr_pink_blob.yy deleted file mode 100644 index 429f3f9..0000000 --- a/Bloble/sprites/spr_pink_blob/spr_pink_blob.yy +++ /dev/null @@ -1,70 +0,0 @@ -{ - "id": "85ee39f4-76e5-479a-9f09-7f2d098ab2f1", - "modelName": "GMSprite", - "mvc": "1.12", - "name": "spr_pink_blob", - "For3D": false, - "HTile": false, - "VTile": false, - "bbox_bottom": 43, - "bbox_left": 7, - "bbox_right": 42, - "bbox_top": 7, - "bboxmode": 0, - "colkind": 1, - "coltolerance": 0, - "edgeFiltering": false, - "frames": [ - { - "id": "bfed2340-25ee-46b9-ad12-0c108467ff49", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "85ee39f4-76e5-479a-9f09-7f2d098ab2f1", - "compositeImage": { - "id": "1ae8a250-7be8-4fa9-a270-03ab5bd6bde8", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "bfed2340-25ee-46b9-ad12-0c108467ff49", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "9189981f-53d5-4e14-a0f5-75cb2fda4b68", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "bfed2340-25ee-46b9-ad12-0c108467ff49", - "LayerId": "0ddcfd38-2481-480a-98e1-e611ae5e67c3" - } - ] - } - ], - "gridX": 0, - "gridY": 0, - "height": 50, - "layers": [ - { - "id": "0ddcfd38-2481-480a-98e1-e611ae5e67c3", - "modelName": "GMImageLayer", - "mvc": "1.0", - "SpriteId": "85ee39f4-76e5-479a-9f09-7f2d098ab2f1", - "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": 50, - "xorig": 0, - "yorig": 0 -} \ No newline at end of file diff --git a/Bloble/sprites/spr_red_blob/f8422f64-bd05-4e59-ba80-324cc1ca1c1d.png b/Bloble/sprites/spr_red_blob/f8422f64-bd05-4e59-ba80-324cc1ca1c1d.png deleted file mode 100644 index 63d5ad9..0000000 Binary files a/Bloble/sprites/spr_red_blob/f8422f64-bd05-4e59-ba80-324cc1ca1c1d.png and /dev/null differ diff --git a/Bloble/sprites/spr_red_blob/layers/f8422f64-bd05-4e59-ba80-324cc1ca1c1d/075d5b05-8060-42d3-a2cb-dedc6239c0b9.png b/Bloble/sprites/spr_red_blob/layers/f8422f64-bd05-4e59-ba80-324cc1ca1c1d/075d5b05-8060-42d3-a2cb-dedc6239c0b9.png deleted file mode 100644 index 49d4b2a..0000000 Binary files a/Bloble/sprites/spr_red_blob/layers/f8422f64-bd05-4e59-ba80-324cc1ca1c1d/075d5b05-8060-42d3-a2cb-dedc6239c0b9.png and /dev/null differ diff --git a/Bloble/sprites/spr_yellow_blob/1b545bc7-e0b7-4361-b229-5867313324ea.png b/Bloble/sprites/spr_yellow_blob/1b545bc7-e0b7-4361-b229-5867313324ea.png deleted file mode 100644 index d1bb68f..0000000 Binary files a/Bloble/sprites/spr_yellow_blob/1b545bc7-e0b7-4361-b229-5867313324ea.png and /dev/null differ diff --git a/Bloble/sprites/spr_yellow_blob/layers/1b545bc7-e0b7-4361-b229-5867313324ea/d7454729-2eb2-4572-9768-16a48d69f234.png b/Bloble/sprites/spr_yellow_blob/layers/1b545bc7-e0b7-4361-b229-5867313324ea/d7454729-2eb2-4572-9768-16a48d69f234.png deleted file mode 100644 index ce60ff0..0000000 Binary files a/Bloble/sprites/spr_yellow_blob/layers/1b545bc7-e0b7-4361-b229-5867313324ea/d7454729-2eb2-4572-9768-16a48d69f234.png and /dev/null differ diff --git a/Bloble/sprites/spr_yellow_blob/spr_yellow_blob.yy b/Bloble/sprites/spr_yellow_blob/spr_yellow_blob.yy deleted file mode 100644 index b61e8ed..0000000 --- a/Bloble/sprites/spr_yellow_blob/spr_yellow_blob.yy +++ /dev/null @@ -1,70 +0,0 @@ -{ - "id": "b20cffb2-fccb-4728-94e8-45c4b7287537", - "modelName": "GMSprite", - "mvc": "1.12", - "name": "spr_yellow_blob", - "For3D": false, - "HTile": false, - "VTile": false, - "bbox_bottom": 43, - "bbox_left": 7, - "bbox_right": 42, - "bbox_top": 7, - "bboxmode": 0, - "colkind": 1, - "coltolerance": 0, - "edgeFiltering": false, - "frames": [ - { - "id": "1b545bc7-e0b7-4361-b229-5867313324ea", - "modelName": "GMSpriteFrame", - "mvc": "1.0", - "SpriteId": "b20cffb2-fccb-4728-94e8-45c4b7287537", - "compositeImage": { - "id": "527cae8f-34d5-453c-b596-d1be8dad87a4", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "1b545bc7-e0b7-4361-b229-5867313324ea", - "LayerId": "00000000-0000-0000-0000-000000000000" - }, - "images": [ - { - "id": "25e5183f-2ee1-49dd-a499-a0ba6f215104", - "modelName": "GMSpriteImage", - "mvc": "1.0", - "FrameId": "1b545bc7-e0b7-4361-b229-5867313324ea", - "LayerId": "d7454729-2eb2-4572-9768-16a48d69f234" - } - ] - } - ], - "gridX": 0, - "gridY": 0, - "height": 50, - "layers": [ - { - "id": "d7454729-2eb2-4572-9768-16a48d69f234", - "modelName": "GMImageLayer", - "mvc": "1.0", - "SpriteId": "b20cffb2-fccb-4728-94e8-45c4b7287537", - "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": 50, - "xorig": 0, - "yorig": 0 -} \ No newline at end of file diff --git a/Bloble/test/dfansldknf.txt b/Bloble/test/dfansldknf.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Bloble/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy b/Bloble/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy index 866a459..127651f 100644 --- a/Bloble/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy +++ b/Bloble/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy @@ -8,17 +8,11 @@ "71e9d27f-3ccb-452d-b48e-6c778a10ca70", "31178adc-7f07-4035-bcf4-e67ba70c695e", "100571dd-a072-498d-85b3-f2c233ffa920", -<<<<<<< HEAD "de954864-d7c0-484a-aa93-678bc065b3f3", - "bed83d33-5157-44a0-a5c7-c4521895bf6f", - "a05a446d-e422-42a7-94b3-84d78fabb29b", - "c83d776e-7a0a-48b8-a72e-070906371d65", - "85ee39f4-76e5-479a-9f09-7f2d098ab2f1", - "b20cffb2-fccb-4728-94e8-45c4b7287537", - "22e5aecc-b790-45e2-9bad-33226e227975" -======= - "de954864-d7c0-484a-aa93-678bc065b3f3" ->>>>>>> parent of 2dc7a41... Updated Settings Menu + "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 4d7660f..09273ea 100644 --- a/Bloble/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy +++ b/Bloble/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy @@ -8,19 +8,12 @@ "935738f8-eae9-4f04-92e3-8befaf10d58a", "158c5696-455f-4087-8e55-a3002c52d760", "05d20e71-992a-46a3-beac-15c2c8240e3d", -<<<<<<< HEAD "1b2b931d-4277-45e3-8636-1647f9927755", - "d2c5ecf6-5036-4867-a91e-b3c1a8ace21d", - "2f3972f2-f753-44b0-b78f-63821933cdf4", - "8e9aad52-7e04-4d17-aa27-28bc094b5283", - "8b68a95c-7778-428d-a9c0-3cd3c2b245ca", - "6de4d386-0706-454c-ac05-e0a8eac9f3a5", - "e7a1ffd3-d5aa-4c90-ae95-ec61c49f0a94", - "8aded94a-88d7-418f-9020-f5e6721a98fd", - "2a60349a-75dd-4f3c-999e-a48a7ba5597a" -======= - "1b2b931d-4277-45e3-8636-1647f9927755" ->>>>>>> parent of 2dc7a41... Updated Settings Menu + "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", diff --git a/Bloble/views/def7666c-ef6c-4ef5-8d14-15e60a2506aa.yy b/Bloble/views/def7666c-ef6c-4ef5-8d14-15e60a2506aa.yy new file mode 100644 index 0000000..aa443ec --- /dev/null +++ b/Bloble/views/def7666c-ef6c-4ef5-8d14-15e60a2506aa.yy @@ -0,0 +1,13 @@ +{ + "id": "def7666c-ef6c-4ef5-8d14-15e60a2506aa", + "modelName": "GMFolder", + "mvc": "1.1", + "name": "def7666c-ef6c-4ef5-8d14-15e60a2506aa", + "children": [ + + ], + "filterType": "user", + "folderName": "Default2", + "isDefaultView": false, + "localisedFolderName": "" +} \ No newline at end of file diff --git a/Bloble/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy b/Bloble/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy index e23e8ca..466757a 100644 --- a/Bloble/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy +++ b/Bloble/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy @@ -6,8 +6,7 @@ "children": [ "fd613f09-8df2-4dd4-84ff-22313f8fc3b2", "1a58794f-af6e-43bd-ad13-85dfa879bf65", - "96c3096d-469f-400d-afbe-272414346072", - "96b498fe-6685-431a-9fe4-8bc1ea6aaef1" + "96c3096d-469f-400d-afbe-272414346072" ], "filterType": "GMRoom", "folderName": "rooms",