merge conficts fixed

1 files changed, 17 insertions, 0 deletions

diff --git a/src/crepe/api/Force.h b/src/crepe/api/Force.h
new file mode 100644
index 0000000..8da9a00
--- /dev/null
+++ b/src/crepe/api/Force.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <cstdint>
+
+#include "../Component.h"
+
+namespace crepe::api {
+
+class Force : public Component {
+public:
+	Force(uint32_t game_object_id, uint32_t magnitude, uint32_t direction);
+
+	int32_t force_x;
+	int32_t force_y;
+};
+
+} // namespace crepe::api