Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
This commit is contained in:
commit
0029b6f6d1
2 changed files with 13 additions and 13 deletions
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"bboxMode": 2,
|
||||
"bboxMode": 0,
|
||||
"collisionKind": 1,
|
||||
"type": 0,
|
||||
"origin": 4,
|
||||
|
@ -7,11 +7,11 @@
|
|||
"edgeFiltering": false,
|
||||
"collisionTolerance": 0,
|
||||
"swfPrecision": 2.525,
|
||||
"bbox_left": 3,
|
||||
"bbox_right": 13,
|
||||
"bbox_top": 11,
|
||||
"bbox_left": 1,
|
||||
"bbox_right": 15,
|
||||
"bbox_top": 3,
|
||||
"bbox_bottom": 23,
|
||||
"HTile": false,
|
||||
"HTile": true,
|
||||
"VTile": false,
|
||||
"For3D": false,
|
||||
"width": 17,
|
||||
|
@ -80,8 +80,8 @@
|
|||
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ca7e216e-5f3b-47d3-a70c-1fc69d3f3535","tags":[],"resourceType":"GMImageLayer",},
|
||||
],
|
||||
"parent": {
|
||||
"name": "Player",
|
||||
"path": "folders/Sprites/Player.yy",
|
||||
"name": "Sprites",
|
||||
"path": "folders/Sprites.yy",
|
||||
},
|
||||
"resourceVersion": "1.0",
|
||||
"name": "sPlayer",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"bboxMode": 2,
|
||||
"bboxMode": 0,
|
||||
"collisionKind": 1,
|
||||
"type": 0,
|
||||
"origin": 4,
|
||||
|
@ -7,9 +7,9 @@
|
|||
"edgeFiltering": false,
|
||||
"collisionTolerance": 0,
|
||||
"swfPrecision": 2.525,
|
||||
"bbox_left": 3,
|
||||
"bbox_right": 13,
|
||||
"bbox_top": 11,
|
||||
"bbox_left": 0,
|
||||
"bbox_right": 16,
|
||||
"bbox_top": 1,
|
||||
"bbox_bottom": 23,
|
||||
"HTile": false,
|
||||
"VTile": false,
|
||||
|
@ -192,8 +192,8 @@
|
|||
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"387193d8-b1ff-4efd-9bcf-494281aae83a","tags":[],"resourceType":"GMImageLayer",},
|
||||
],
|
||||
"parent": {
|
||||
"name": "Player",
|
||||
"path": "folders/Sprites/Player.yy",
|
||||
"name": "Sprites",
|
||||
"path": "folders/Sprites.yy",
|
||||
},
|
||||
"resourceVersion": "1.0",
|
||||
"name": "sPlayerRun",
|
||||
|
|
Reference in a new issue