Merge branch 'developer' into heightmapTrees

# Conflicts: # CrystalPoint.cpp # HeightMap.cpp
2016-06-03 11:39:19 +02:00
parent e2f13cd311 95febc136f
commit c43718f8fa
22 changed files with 315 additions and 90 deletions
@@ -2,7 +2,6 @@
   "world": {
    "heightmap": "worlds/hell.png",
    "texture": "worlds/helltexture.png",
-    "scale": 1,
 	    "object-templates": [
 			  {
 				  "color": 25,
@@ -2,7 +2,13 @@
   "world": {
    "heightmap": "worlds/hmcs.png",
    "texture": "worlds/hmcstexture.png",
-    "scale": 2
+    "object-templates": [
+		{
+			"color":100,
+			"file": "models/boom/Boom.obj",
+			"collision": false
+		}
+	]
   },
  "player": {
    "startposition": [ 100, 20, 100 ]
@@ -1,11 +1,11 @@
 {
   "world": {
    "heightmap": "worlds/small.png",
-    "scale": 1,
 	"object-templates": [
 		{
 			"color":100,
-			"file": "models/boom/Boom.obj"
+			"file": "models/boom/Boom.obj",
+			"collision": false
 		}
 	]
   },