Merge branch 'deffered_rendering'

Conflicts:
	assets
	src/Components/Physics.h
	src/GameWorld.cpp
	src/GameWorld.h
	src/Systems/PhysicsSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
2014-06-03 17:39:54 +02:00
17 changed files with 1017 additions and 238 deletions
+16
View File
@@ -0,0 +1,16 @@
#ifndef Events_OnDead_h__
#define Events_OnDead_h__
#include "Entity.h"
#include "EventBroker.h"
namespace Events
{
struct OnDead : Event
{
EntityID Entity;
};
}
#endif // Events_OnDead_h__