conflit transition
This commit is contained in:
parent
5d2fc4f7f0
commit
6ecd407aef
4 changed files with 118 additions and 22 deletions
|
@ -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;
|
||||
}
|
39
objects/oTransition/oTransition.yy.base
Normal file
39
objects/oTransition/oTransition.yy.base
Normal file
|
@ -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",
|
||||
}
|
39
objects/oTransition/oTransition.yy.ours
Normal file
39
objects/oTransition/oTransition.yy.ours
Normal file
|
@ -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",
|
||||
}
|
40
objects/oTransition/oTransition.yy.theirs
Normal file
40
objects/oTransition/oTransition.yy.theirs
Normal file
|
@ -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",
|
||||
}
|
Reference in a new issue