Merge branch 'developer' into enemy

# Conflicts: # World.h # worlds/world1.json
2016-05-25 13:42:02 +02:00
parent cf124b3f38 0b6096d3e8
commit b2fa0bc028
16 changed files with 257 additions and 53 deletions
@@ -1,6 +1,10 @@
 {
+   "world": {
+      "heightmap": "worlds/hmcs.png",
+	  "texture": "worlds/hmcstexture.png"
+   },
  "player": {
-    "startposition": [ 0, 1.7, 0 ]
+    "startposition": [ -100, 1.7, -100 ]
  },
  "objects": [
    {