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

2015-10-21 13:18:42 +02:00
parent c23c7e4d8e 2954e2cbb3
commit d0668effea
121 changed files with 11835 additions and 4246 deletions
@@ -6,6 +6,8 @@
 #include "Core/EventBroker.h"
 #include "Core/CTransform.h"
 #include "Core/CTemplate.h"
+#include "Core/ResourceManager.h"
+#include "Core/ConfigFile.h"
 #include "Physics/CPhysics.h"
 #include "Physics/CCircleShape.h"
 #include "Physics/CRectangleShape.h"
@@ -110,6 +112,7 @@ private:
 	bool m_InkBlockedWaiting = false;
 	bool m_Restarting = false;
 	int m_StickyCounter = 3;
+	bool m_GodMode = false;

 	bool m_StageBlockedWaiting = false;