Merge pull request #31 from CrystalPointA4/feature/loadingscreen

Feature/loadingscreen (reverted from commit 316d6c9e14)
2016-06-22 03:09:28 +02:00
parent 9a31e09bff
commit 92460b8ca4
25 changed files with 180 additions and 194 deletions
@@ -1,7 +1,6 @@
 {
  "world": {
    "heightmap": "worlds/small.png",
-    "loadingscreen": "worlds/loadingScreen_picture.png",
    "skybox": "skyboxes/water/",
    "object-templates": [
      {
@@ -13,7 +12,7 @@
 	"music": "WAVE/world1.wav"
  },
  "player": {
-    "startposition": [ 20, 0, 20 ]
+    "startposition": [ -10, -10, -10 ]
  },
  "objects": [ ],
  "portal": {