Merge branch 'developer' into crystal_capturing

# Conflicts: # World.cpp # worlds/small.json
2016-06-09 10:34:33 +02:00
parent 881b58138c 2c624ac4c7
commit 1a4339b49d
4 changed files with 24 additions and 11 deletions
@@ -13,7 +13,12 @@
    "startposition": [ 20, 5, 20 ]
  },
  "objects": [ ],
-  "enemies": [ ],
+  "enemies": [
+  {
+      "file": "models/squid/Blooper.obj",
+      "pos": [ 20, 5, 10 ],
+      "scale": 0.01
+  }],
  "crystals": [
    {
      "file": "models/sphere/sphere.obj",
@@ -21,7 +26,7 @@
    },
    {
      "file": "models/sphere/sphere.obj",
-      "pos": [ 45, 2, 31 ]      
+      "pos": [ 45, 2, 31 ]
    }
  ]
 }