Merge branch 'developer' into musicInclude

# Conflicts: # worlds/small.json
2016-06-21 19:16:12 +02:00
parent b09311d810 d42ae6ccd3
commit 579a04a9b4
18 changed files with 796 additions and 19 deletions
@@ -83,7 +83,7 @@
    ]
  },
  "player": {
-    "startposition": [ 1, 5, 20 ]
+    "startposition": [ 20, 5, 20 ]
  },
  "objects": [ ],
  "portal": {