Merge branch 'developer' into feature/loadingscreen

# Conflicts: # worlds/rock.json
2016-06-22 02:17:44 +02:00
parent 9f455be8d6 5ad61e525f
commit 80f0c33b91
62 changed files with 11886 additions and 13221 deletions
@@ -1,6 +1,7 @@
 {
  "world": {
    "heightmap": "worlds/small.png",
+    "loadingscreen": "worlds/loadingScreen_picture.png",
    "skybox": "skyboxes/water/",
    "object-templates": [
      {