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

Merge remote-tracking branch 'origin/havok' into particles

Browse Source 
Conflicts:
	src/Components/Vehicle.h
This commit is contained in:
Stiffly
2014-05-12 15:43:41 +02:00
parent e0b5b72454 2aa51c3e90
commit 457ee84903
34 changed files with 1243 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Systems/ParticleSystem.h
-2
View File
@@ -6,8 +6,6 @@
#include "Components/ParticleEmitter.h"
#include "Components/Particle.h"
#include "Components/Model.h"
#include "Components/Physics.h"
#include "Components/Box.h"
#include "Components/PointLight.h"
#include "Color.h"
#include <GLFW/glfw3.h>