Merge branch 'developer' into johan

# Conflicts: # World.cpp # worlds/world1.json
2016-05-23 10:34:21 +02:00
parent d01efecb0e 47c228205a
commit 9d3cfa7e2a
13 changed files with 776 additions and 801 deletions
@@ -25,7 +25,7 @@ Vec3f::Vec3f()
 	this->y = 0;
 	this->z = 0;
 }
-Vec3f::Vec3f(Vec3f &other)
+Vec3f::Vec3f(const Vec3f &other)
 {
 	this->x = other.x;
 	this->y = other.y;
@@ -75,7 +75,7 @@ Vec2f::Vec2f()
 	this->x = 0;
 	this->y = 0;
 }
-Vec2f::Vec2f(Vec2f &other)
+Vec2f::Vec2f(const Vec2f &other)
 {
 	this->x = other.x;
 	this->y = other.y;