Merge branch 'developer' into feature/refactor_crystals

2016-06-09 12:41:53 +02:00
parent 9cfaf07eba 0aad7262d6
commit 3ed5331437
29 changed files with 2761 additions and 12 deletions
@@ -7,7 +7,8 @@
        "file": "models/boom/Boom.obj",
        "collision": true
      }
-    ]
+    ],
+	"music": "WAVE/bond.wav"
  },
  "player": {
    "startposition": [ 20, 5, 20 ]