Merge branch 'havok' into gui

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters

src/Events/ApplyForce.h

@@ -0,0 +1,18 @@
+#ifndef Events_ApplyForce_h__
+#define Events_ApplyForce_h__
+#include "Entity.h"
+#include "EventBroker.h"
+
+namespace Events
+{
+
+struct ApplyForce : Event
+{
+	EntityID Entity;
+	double DeltaTime;
+	glm::vec3 Force;
+};
+
+}
+
+#endif // Events_ApplyForce_h__

src/Events/ApplyPointImpulse.h

@@ -0,0 +1,18 @@
+#ifndef Events_ApplyPointImpulse_h__
+#define Events_ApplyPointImpulse_h__
+#include "Entity.h"
+#include "EventBroker.h"
+
+namespace Events
+{
+
+	struct ApplyPointImpulse : Event
+	{
+		EntityID Entity;
+		glm::vec3 Position;
+		glm::vec3 Impulse;
+	};
+
+}
+
+#endif // Events_ApplyPointImpulse_h__