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

Merge branch 'FMOD'

Browse Source 
Conflicts:
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/PhysicsSystem.h
	src/Systems/SoundSystem.cpp
	src/Systems/SoundSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
Stiffly
2014-06-02 18:49:16 +02:00
parent 2f2154ffe1 4ac67a22ac
commit 98399c3995
72 changed files with 4778 additions and 6461 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Systems/TriggerSystem.cpp
-4
View File
@@ -26,10 +26,6 @@ void Systems::TriggerSystem::UpdateEntity( double dt, EntityID entity, EntityID
}
void Systems::TriggerSystem::OnComponentCreated( std::string type, std::shared_ptr<Component> component )
{
}
void Systems::TriggerSystem::OnComponentRemoved(EntityID entity, std::string type, Component* component )
{