Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
This commit is contained in:
commit
9e7fdc05f4
2 changed files with 2 additions and 1 deletions
|
@ -2,6 +2,7 @@
|
||||||
"resources": [
|
"resources": [
|
||||||
{"id":{"name":"sFire","path":"sprites/sFire/sFire.yy",},"order":6,},
|
{"id":{"name":"sFire","path":"sprites/sFire/sFire.yy",},"order":6,},
|
||||||
{"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,},
|
{"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,},
|
||||||
|
{"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},"order":4,},
|
||||||
{"id":{"name":"r6","path":"rooms/r6/r6.yy",},"order":2,},
|
{"id":{"name":"r6","path":"rooms/r6/r6.yy",},"order":2,},
|
||||||
{"id":{"name":"r5","path":"rooms/r5/r5.yy",},"order":1,},
|
{"id":{"name":"r5","path":"rooms/r5/r5.yy",},"order":1,},
|
||||||
{"id":{"name":"r9","path":"rooms/r9/r9.yy",},"order":5,},
|
{"id":{"name":"r9","path":"rooms/r9/r9.yy",},"order":5,},
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"path": "sprites/sWall/sWall.yy",
|
"path": "sprites/sWall/sWall.yy",
|
||||||
},
|
},
|
||||||
"solid": false,
|
"solid": false,
|
||||||
"visible": true,
|
"visible": false,
|
||||||
"spriteMaskId": null,
|
"spriteMaskId": null,
|
||||||
"persistent": false,
|
"persistent": false,
|
||||||
"parentObjectId": null,
|
"parentObjectId": null,
|
||||||
|
|
Reference in a new issue