BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance

Browse Source 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
Stiffly
2014-04-17 00:11:53 +02:00
parent 5e402af093 b1edefcf26
commit 2efb5405eb
10 changed files with 158 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameWorld.h
+1 -1
View File
@@ -8,7 +8,7 @@
//#include "Systems/CollisionSystem.h"
#include "Systems/InputSystem.h"
//#include "Systems/LevelGenerationSystem.h"
//#include "Systems/ParticleSystem.h"
#include "Systems/ParticleSystem.h"
//#include "Systems/PlayerSystem.h"
#include "Systems/FreeSteeringSystem.h"
#include "Systems/RenderSystem.h"