Merge branch 'master' into particles

Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters

src/Events/ComponentCreated.h

@@ -0,0 +1,19 @@
+#ifndef Event_ComponentCreated_h__
+#define Event_ComponentCreated_h__
+
+#include "EventBroker.h"
+#include "Entity.h"
+#include "Component.h"
+
+namespace Events
+{
+
+struct ComponentCreated : Event
+{
+	EntityID Entity;
+	std::shared_ptr<::Component> Component;
+};
+
+}
+
+#endif // Event_ComponentCreated_h__

src/Events/EnterTrigger.h

@@ -8,8 +8,8 @@ namespace Events
 
 	struct EnterTrigger : Event
 	{
-		EntityID Entity1;
-		EntityID Entity2;
+		EntityID Trigger;
+		EntityID Entity;
 	};
 
 }

src/Events/LeaveTrigger.h

@@ -0,0 +1,17 @@
+#ifndef Events_LeaveTrigger_h__
+#define Events_LeaveTrigger_h__
+#include "Entity.h"
+#include "EventBroker.h"
+
+	namespace Events
+{
+
+	struct LeaveTrigger : Event
+	{
+		EntityID Trigger;
+		EntityID Entity;
+	};
+
+}
+
+#endif // Events_LeaveTrigger_h__

src/Events/Move.h

@@ -0,0 +1,19 @@
+#ifndef Event_Move_h__
+#define Event_Move_h__
+
+#include "EventBroker.h"
+
+namespace Events
+{
+
+	struct Move : Event
+	{
+		EntityID Entity;
+		glm::vec3 GoalPosition;
+		float Speed;
+		bool Queue;
+	};
+
+}
+
+#endif // Event_Move_h__

src/Events/PlayBGM.h

@@ -0,0 +1,18 @@
+#ifndef Event_PlayBGM_h__
+#define Event_PlayBGM_h__
+
+#include "EventBroker.h"
+#include "Entity.h"
+
+namespace Events
+{
+
+	struct PlayBGM : Event
+	{
+		std::string Resource;
+		bool Loop;
+	};
+
+}
+
+#endif // Event_PlayBGM_h__

src/Events/PlaySFX.h

@@ -0,0 +1,19 @@
+#ifndef Event_PlaySFX_h__
+#define Event_PlaySFX_h__
+
+#include "EventBroker.h"
+#include "Entity.h"
+
+namespace Events
+{
+
+struct PlaySFX : Event
+{
+	EntityID Emitter;
+	std::string Resource;
+	bool Loop;
+};
+
+}
+
+#endif // Event_PlaySFX_h__

src/Events/PlaySound.h

@@ -1,17 +0,0 @@
-#ifndef Event_PlaySound_h__
-#define Event_PlaySound_h__
-
-#include "EventBroker.h"
-
-namespace Events
-{
-
-struct PlaySound : Event
-{
-	EntityID Emitter;
-	std::string Resource;
-};
-
-}
-
-#endif // Event_PlaySound_h__

src/Events/Rotate.h

@@ -0,0 +1,19 @@
+#ifndef Event_Rotate_h__
+#define Event_Rotate_h__
+
+#include "EventBroker.h"
+
+namespace Events
+{
+
+	struct Rotate : Event
+	{
+		EntityID Entity;
+		glm::quat GoalRotation;
+		double Time;
+		bool Queue;
+	};
+
+}
+
+#endif // Event_Rotate_h__

src/Events/SpawnVehicle.h

@@ -0,0 +1,16 @@
+#ifndef Events_SpawnVehicle_h__
+#define Events_SpawnVehicle_h__
+
+#include "Entity.h"
+#include "EventBroker.h"
+
+namespace Events
+{
+	struct SpawnVehicle : Event
+	{
+		int PlayerID;
+		std::string VehicleType;
+	};
+}
+
+#endif // Events_SpawnVehicle_h__

src/Events/StopSound.h

@@ -0,0 +1,17 @@
+#ifndef Event_StopSound_h__
+#define Event_StopSound_h__
+
+#include "EventBroker.h"
+#include "Entity.h"
+
+namespace Events
+{
+
+	struct StopSound : Event
+	{
+		EntityID Emitter;
+	};
+
+}
+
+#endif // Event_StopSound_h__