BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Browse Source 
Conflicts:
	Escape-the-Dawn/Renderer.cpp
	Escape-the-Dawn/Systems/PlayerSystem.cpp
This commit is contained in:
Tobias Dahl
2014-03-13 03:56:39 +01:00
parent 461a039d87 ad082e89d8
commit c38cd38aae
16 changed files with 196 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Systems/PlayerSystem.h
+3
View File
@@ -6,8 +6,11 @@
#include "System.h"
#include "Components/Transform.h"
#include "Components/Input.h"
#include "Components/Collision.h"
#include "logging.h"
namespace Systems
{