From 6ecd407aeff27a07bd1ebaf0bcb703e0035cac9d Mon Sep 17 00:00:00 2001 From: sOlaris38 Date: Sun, 6 Dec 2020 17:57:27 +0100 Subject: [PATCH] conflit transition --- objects/oPlayer/Other_4.gml | 22 ------------- objects/oTransition/oTransition.yy.base | 39 ++++++++++++++++++++++ objects/oTransition/oTransition.yy.ours | 39 ++++++++++++++++++++++ objects/oTransition/oTransition.yy.theirs | 40 +++++++++++++++++++++++ 4 files changed, 118 insertions(+), 22 deletions(-) delete mode 100644 objects/oPlayer/Other_4.gml create mode 100644 objects/oTransition/oTransition.yy.base create mode 100644 objects/oTransition/oTransition.yy.ours create mode 100644 objects/oTransition/oTransition.yy.theirs diff --git a/objects/oPlayer/Other_4.gml b/objects/oPlayer/Other_4.gml deleted file mode 100644 index 15391fc..0000000 --- a/objects/oPlayer/Other_4.gml +++ /dev/null @@ -1,22 +0,0 @@ -switch (global.spawn) { - case -1 : - x = 48; - y = room_height / 2; - break; - case 2 : - x = room_width / 2; - y = 48; - break; - case 3 : - x = room_width - 48; - y = room_height / 2; - break; - case 0 : - x = room_width / 2; - y = room_height - 48; - break; - case 1 : - x = 48; - y = room_height / 2; - break; -} \ No newline at end of file diff --git a/objects/oTransition/oTransition.yy.base b/objects/oTransition/oTransition.yy.base new file mode 100644 index 0000000..7a3432b --- /dev/null +++ b/objects/oTransition/oTransition.yy.base @@ -0,0 +1,39 @@ +{ + "spriteId": { + "name": "sTransition", + "path": "sprites/sTransition/sTransition.yy", + }, + "solid": false, + "visible": false, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [ + {"varType":1,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"next","tags":[],"resourceType":"GMObjectProperty",}, + ], + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "resourceVersion": "1.0", + "name": "oTransition", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/objects/oTransition/oTransition.yy.ours b/objects/oTransition/oTransition.yy.ours new file mode 100644 index 0000000..ec73d30 --- /dev/null +++ b/objects/oTransition/oTransition.yy.ours @@ -0,0 +1,39 @@ +{ + "spriteId": { + "name": "sTransition", + "path": "sprites/sTransition/sTransition.yy", + }, + "solid": false, + "visible": false, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [ + {"varType":1,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"next","tags":[],"resourceType":"GMObjectProperty",}, + ], + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "resourceVersion": "1.0", + "name": "oTransition", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/objects/oTransition/oTransition.yy.theirs b/objects/oTransition/oTransition.yy.theirs new file mode 100644 index 0000000..3004895 --- /dev/null +++ b/objects/oTransition/oTransition.yy.theirs @@ -0,0 +1,40 @@ +{ + "spriteId": { + "name": "sTransition", + "path": "sprites/sTransition/sTransition.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"parent":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [ + {"varType":1,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"next","tags":[],"resourceType":"GMObjectProperty",}, + ], + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "resourceVersion": "1.0", + "name": "oTransition", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file