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
@@ -1,6 +1,8 @@

 #include "CrystalJohan.h"
 #include <GL/freeglut.h>
+#include <cmath>
+#include <cstring>
 #include "World.h"

 void CrystalJohan::init()