pogmommy/Blobledoodes
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test

Browse source
This commit is contained in:
Micah Gomez 2019-07-15 12:47:07 -06:00
parent 99406b712a
commit ed89f43bb3
33 changed files with 32 additions and 566 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Bloble/Bloble.yyp
View file

@ -111,6 +111,7 @@
}
},
{
<<<<<<< HEAD
"Key": "2a60349a-75dd-4f3c-999e-a48a7ba5597a",
"Value": {
"id": "0f6bf214-bcaf-4e0a-ad98-2c62847dd5f2",
@ -120,6 +121,9 @@
},
{
"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",
@ -135,6 +139,7 @@
}
},
{
<<<<<<< HEAD
"Key": "459fd507-8dd1-4a9a-ad84-99f965b5e2bb",
"Value": {
"id": "41ae8cc4-398f-4f6c-bb8f-8ad4cba4ce2a",
@ -151,6 +156,8 @@
}
},
{
=======
>>>>>>> parent of 2dc7a41... Updated Settings Menu
"Key": "59a5f902-0e99-4359-a707-bc10d39a5fc5",
"Value": {
"id": "4e8847c5-4702-4228-b61d-37e1ded37bf0",
@ -191,6 +198,7 @@
}
},
{
<<<<<<< HEAD
"Key": "85ee39f4-76e5-479a-9f09-7f2d098ab2f1",
"Value": {
"id": "e059091b-23b3-4f8f-a2bd-12f4d300a5e0",
@ -223,6 +231,8 @@
}
},
{
=======
>>>>>>> parent of 2dc7a41... Updated Settings Menu
"Key": "935738f8-eae9-4f04-92e3-8befaf10d58a",
"Value": {
"id": "bf728e91-a229-43bd-b3fe-9af14da06e3b",
@ -335,6 +345,7 @@
}
},
{
<<<<<<< HEAD
"Key": "cc98d028-7bdd-4680-85f3-c87a7baa481e",
"Value": {
"id": "162beb35-ef2b-45ae-85eb-f9925c371d92",
@ -359,6 +370,8 @@
}
},
{
=======
>>>>>>> parent of 2dc7a41... Updated Settings Menu
"Key": "de954864-d7c0-484a-aa93-678bc065b3f3",
"Value": {
"id": "85caaad7-c676-4099-bb9f-e9be118df57c",
@ -375,6 +388,7 @@
}
},
{
<<<<<<< HEAD
"Key": "e7a1ffd3-d5aa-4c90-ae95-ec61c49f0a94",
"Value": {
"id": "40d80261-9904-42ab-a53f-d88314b13119",
@ -383,6 +397,8 @@
}
},
{
=======
>>>>>>> parent of 2dc7a41... Updated Settings Menu
"Key": "e97866c9-798a-4e1b-b440-90ed4968a976",
"Value": {
"id": "559f0939-b8bc-4840-a759-597964c5e651",

4
Bloble/objects/obj_Back/Gesture_0.gml
View file

@ -1,4 +0,0 @@
/// @description Insert description here
// You can write your code in this editor
room_goto(rm_Menu);

38
Bloble/objects/obj_Back/obj_Back.yy
View file

@ -1,38 +0,0 @@
{
"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
}

4
Bloble/objects/obj_Settings/Gesture_0.gml
View file

@ -1,4 +0,0 @@
/// @description Insert description here
// You can write your code in this editor
room_goto(rm_Settings);

11
Bloble/objects/obj_Settings/obj_Settings.yy
View file

@ -4,16 +4,7 @@
"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,

12
Bloble/objects/obj_SettingsMusic/Gesture_0.gml
View file

@ -1,12 +0,0 @@
/// @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;
};
};

38
Bloble/objects/obj_SettingsMusic/obj_SettingsMusic.yy
View file

@ -1,38 +0,0 @@
{
"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
}

29
Bloble/objects/obj_SettingsReset/obj_SettingsReset.yy
View file

@ -1,29 +0,0 @@
{
"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
}

12
Bloble/objects/obj_SettingsSounds/Gesture_0.gml
View file

@ -1,12 +0,0 @@
/// @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;
};
};

38
Bloble/objects/obj_SettingsSounds/obj_SettingsSounds.yy
View file

@ -1,38 +0,0 @@
{
"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
}

29
Bloble/objects/obj_SettingsTitle/obj_SettingsTitle.yy
View file

@ -1,29 +0,0 @@
{
"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
}

4
Bloble/objects/obj_Start/Gesture_0.gml
View file

@ -1,4 +0,0 @@
/// @description Insert description here
// You can write your code in this editor
room_goto(rm_Start);

11
Bloble/objects/obj_Start/obj_Start.yy
View file

@ -4,16 +4,7 @@
"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,

18
Bloble/rooms/rm_Settings/rm_Settings.yy
View file

@ -7,11 +7,7 @@
"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": [
@ -29,11 +25,7 @@
"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": [
@ -51,7 +43,7 @@
"id": "342d509b-ef55-46a2-8ab1-f832f53c4343",
"animationFPS": 15,
"animationSpeedType": "0",
"colour": { "Value": 4294967295 },
"colour": { "Value": 4278190080 },
"depth": 100,
"grid_x": 32,
"grid_y": 32,
@ -95,12 +87,12 @@
},
"roomSettings": {
"id": "ea864155-67dc-4d3e-9543-aff0c05ed7b6",
"Height": 1920,
"Height": 768,
"inheritRoomSettings": false,
"modelName": "GMRoomSettings",
"persistent": false,
"mvc": "1.0",
"Width": 1080
"Width": 1024
},
"mvc": "1.0",
"views": [

BIN
Bloble/sprites/spr_Back/2e408e95-895d-4683-996a-0b250b3c28ad.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
Bloble/sprites/spr_Back/layers/2e408e95-895d-4683-996a-0b250b3c28ad/3c990f07-3e68-459f-bdcb-282d13ae653d.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 10 KiB

70
Bloble/sprites/spr_Back/spr_Back.yy
View file

@ -1,70 +0,0 @@
{
"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
}

BIN
Bloble/sprites/spr_Reset/9c39da9c-8256-4655-b2b3-b5873f64b000.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
Bloble/sprites/spr_Reset/layers/9c39da9c-8256-4655-b2b3-b5873f64b000/28c4ad81-16c0-4c72-a5fd-fefabd2cf04d.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

70
Bloble/sprites/spr_Reset/spr_Reset.yy
View file

@ -1,70 +0,0 @@
{
"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
}

BIN
Bloble/sprites/spr_SettingsMusic/b0b530af-5999-4f0f-9d74-a1db64fcf176.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.8 KiB

BIN
Bloble/sprites/spr_SettingsMusic/d4f5ab53-4b88-48c0-90fb-e89f9c6fc6a0.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.5 KiB

BIN
Bloble/sprites/spr_SettingsMusic/layers/b0b530af-5999-4f0f-9d74-a1db64fcf176/98d0bcf7-807c-473a-abde-7424af1d68a1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.9 KiB

BIN
Bloble/sprites/spr_SettingsMusic/layers/d4f5ab53-4b88-48c0-90fb-e89f9c6fc6a0/98d0bcf7-807c-473a-abde-7424af1d68a1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.6 KiB

92
Bloble/sprites/spr_SettingsMusic/spr_SettingsMusic.yy
View file

@ -1,92 +0,0 @@
{
"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
}

BIN
Bloble/sprites/spr_SettingsSounds/991b1baa-693c-4a2d-9106-fadc632082cc.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
Bloble/sprites/spr_SettingsSounds/f6c6184e-780b-47b7-a293-f5953d1d6f47.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
Bloble/sprites/spr_SettingsSounds/layers/991b1baa-693c-4a2d-9106-fadc632082cc/34eddc48-c340-47c8-9d94-51e9684f0f83.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
Bloble/sprites/spr_SettingsSounds/layers/f6c6184e-780b-47b7-a293-f5953d1d6f47/34eddc48-c340-47c8-9d94-51e9684f0f83.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

92
Bloble/sprites/spr_SettingsSounds/spr_SettingsSounds.yy
View file

@ -1,92 +0,0 @@
{
"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
}

2
Bloble/views/64786372-1543-43eb-956b-f5d3a8a94cdf.yy
View file

@ -5,7 +5,7 @@
"name": "64786372-1543-43eb-956b-f5d3a8a94cdf",
"children": [
"ed6a955d-5826-4f98-a450-10b414266c27",
"cc98d028-7bdd-4680-85f3-c87a7baa481e"
"f418569b-3bdd-4706-a0e4-364317f54032"
],
"filterType": "GMOptions",
"folderName": "options",

4
Bloble/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy
View file

@ -8,6 +8,7 @@
"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",
@ -15,6 +16,9 @@
"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
],
"filterType": "GMSprite",
"folderName": "sprites",

4
Bloble/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy
View file

@ -8,6 +8,7 @@
"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",
@ -17,6 +18,9 @@
"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
],
"filterType": "GMObject",
"folderName": "objects",