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

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

Browse Source 
Conflicts:
	src/Components/Physics.h
	src/GameWorld.cpp
	src/World.cpp
	src/World.h
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
Stiffly
2014-05-12 13:55:48 +02:00
parent 1a365bf069 b6372d44b8
commit e0b5b72454
60 changed files with 2404 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Systems/ParticleSystem.cpp
-5
View File
@@ -4,11 +4,6 @@
#include "World.h"
Systems::ParticleSystem::ParticleSystem(World *m_World) : System(m_World)
{
}
void Systems::ParticleSystem::Update(double dt)
{