Omg dem filter merge skillz

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

src/Events/Collision.h

@@ -0,0 +1,18 @@
+#ifndef Events_Collision_h__
+#define Events_Collision_h__
+
+#include "Entity.h"
+#include "EventBroker.h"
+
+namespace Events
+{
+
+struct Collision : Event
+{
+	EntityID Entity1;
+	EntityID Entity2;
+};
+
+}
+
+#endif // Events_Collision_h__

src/Events/Damage.h

@@ -0,0 +1,17 @@
+#ifndef Events_Damage_h__
+#define Events_Damage_h__
+#include "Entity.h"
+#include "EventBroker.h"
+
+namespace Events
+{
+	struct Damage : Event
+	{
+		EntityID Entity;
+		float Amount;
+	};
+}
+
+
+
+#endif // Events_Damage_h__

src/Events/DisableCollisions.h

@@ -0,0 +1,18 @@
+#ifndef Events_DisableCollisions_h__
+#define Events_DisableCollisions_h__
+#include "Entity.h"
+#include "EventBroker.h"
+
+	namespace Events
+{
+
+	struct DisableCollisions : Event
+	{
+		int Layer1;
+		int Layer2;
+		
+	};
+
+}
+
+#endif // Events_DisableCollisions_h__

src/Events/EnableCollisions.h

@@ -0,0 +1,18 @@
+#ifndef Events_EnableCollisions_h__
+#define Events_EnableCollisions_h__
+#include "Entity.h"
+#include "EventBroker.h"
+
+namespace Events
+{
+
+	struct EnableCollisions : Event
+	{
+		int Layer1;
+		int Layer2;
+
+	};
+
+}
+
+#endif // Events_EnableCollisions_h__

src/Events/EnterTrigger.h

@@ -0,0 +1,17 @@
+#ifndef Events_EnterTrigger_h__
+#define Events_EnterTrigger_h__
+#include "Entity.h"
+#include "EventBroker.h"
+
+namespace Events
+{
+
+	struct EnterTrigger : Event
+	{
+		EntityID Entity1;
+		EntityID Entity2;
+	};
+
+}
+
+#endif // Events_EnterTrigger_h__

src/Events/SetViewportCamera.h

@@ -0,0 +1,18 @@
+#ifndef Events_SetViewportCamera_h__
+#define Events_SetViewportCamera_h__
+
+#include "EventBroker.h"
+#include "Entity.h"
+
+namespace Events
+{
+
+struct SetViewportCamera : Event
+{
+	std::string ViewportFrame;
+	EntityID CameraEntity;
+};
+
+}
+
+#endif // Events_SetViewportCamera_h__