1 files changed, 17 insertions, 0 deletions
diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index 5eef32f..b1d9cb9 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -5,6 +5,11 @@
 #include <string>
 #include <unordered_map>
 #include <variant>
+<<<<<<< HEAD
+#include "keyCodes.h"
+#include "customTypes.h"
+=======
+>>>>>>> b3b762a34e7ccb4a0dcd041a693ac7180af16002
 
 class UUIDGenerator {
 public:
@@ -89,3 +94,15 @@ private:
 	int mouseX = 0;
 	int mouseY = 0;
 };
+class CollisionEvent : public Event {
+public:
+    CollisionEvent(Collision);
+
+    REGISTER_EVENT_TYPE(CollisionEvent)
+
+    Collision getCollisionData() const;
+
+private:
+   	Collision collisionData;
+    
+};