Merge remote-tracking branch 'origin/master' into havok

2014-06-04 15:43:51 +02:00
parent 70960c9eba 7b90e54899
commit c06c436cd1
16 changed files with 296 additions and 157 deletions
@@ -82,7 +82,7 @@ private:
 	void CreateGate(EntityID parent, glm::vec3 position, glm::quat orientation);
 	void AddTankWheelPair(EntityID tankEntity, glm::vec3 position, int axleID, bool steering);
 	EntityID CreateJeep(int playerID);
-	EntityID CreateWall(glm::vec3 pos, glm::quat orientation);
+	EntityID CreateWall(EntityID parent, glm::vec3 pos, glm::quat orientation);
 	EntityID CreateGarage(EntityID parent, glm::vec3 Position, glm::quat orientation, int playerID);
 	void CreateTerrain();
 	void CreateBase(glm::quat orientation, int playerID);