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

Omg dem filter merge skillz

Browse Source 
Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
	src/Systems/ParticleSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
Stiffly
2014-05-30 19:11:52 +02:00
parent d17450b554 cc84f04542
commit bf77fba963
84 changed files with 4232 additions and 1736 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Systems/ParticleSystem.cpp
+1
View File
@@ -26,6 +26,7 @@ void Systems::ParticleSystem::Update(double dt)
{
m_World->RemoveEntity(explosionID);
it = m_ExplosionEmitters.erase(it);
//LOG_INFO("Deleted explosion emitter successfully");
LOG_INFO("Deleted explosion emitter successfully");
}
else