Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision

Browse Source
This commit is contained in:
jancoow
2016-06-21 17:07:59 +02:00
parent d14f045708 4437acb9f2
commit 0431e9c230
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
worlds/small.json
+7 -3
View File
@@ -12,7 +12,7 @@
"music": "WAVE/test1.wav" "music": "WAVE/test1.wav"
}, },
"player": { "player": {
"startposition": [ 20, 5, 20 ] "startposition": [ 20, 0, 20 ]
}, },
"objects": [ ], "objects": [ ],
"portal": { "portal": {
@@ -24,13 +24,17 @@
"file": "models/squid/Blooper.obj", "file": "models/squid/Blooper.obj",
"pos": [ 20, 5, 10 ], "pos": [ 20, 5, 10 ],
"scale": 0.01, "scale": 0.01,
"music": "WAVE/enemy.wav" "music": "WAVE/enemy.wav",
"health": 10,
"damage": 2
}, },
{ {
"file": "models/squid/Blooper.obj", "file": "models/squid/Blooper.obj",
"pos": [ 30, 10, 10 ], "pos": [ 30, 10, 10 ],
"scale": 0.01, "scale": 0.01,
"music": "WAVE/enemy.wav" "music": "WAVE/enemy.wav",
"health": 15,
"damage": 2
}], }],
"crystal": { "crystal": {
"full texture": "models/crystal/Crystal.obj", "full texture": "models/crystal/Crystal.obj",