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

# Conflicts: # assets
2016-02-04 10:47:30 +01:00
parent 2e3e59a1e2
commit 0a8ee1623f
6 changed files with 36 additions and 2 deletions
@@ -4,6 +4,7 @@
 #include "Core/EPlayerSpawned.h"
 #include "Input/FirstPersonInputController.h"
 #include <imgui/imgui.h>
+#include "Events/EDoubleJump.h"

 class PlayerMovementSystem : public ImpureSystem, PureSystem
 {