Merge branch 'Tobias'

2015-10-21 14:48:33 +02:00
parent d0668effea cbaf300b03
commit e9942dad4a
8 changed files with 1819 additions and 498 deletions
@@ -50,6 +50,7 @@
 #include "Game/EHitLag.h"
 #include "Game/EScreenShake.h"
 #include "Game/EActionButton.h"
+#include "Rendering/CAnimation.h"

 #include "Game/EBrickGenerating.h"

@@ -103,6 +104,7 @@ private:
 	double m_KrakenStrength = 0;
 	double m_PlayerStrength = 0;
    float m_Edge = 2.8f;
+	EntityID m_KrakenArm;
    Components::Transform* m_Transform = nullptr;
    Components::Pad* m_Pad = nullptr;
 	std::shared_ptr<Components::Transform> m_StickTransform;