aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/stm32/TODO/hh_entity.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/stm32/TODO/hh_entity.c b/src/stm32/TODO/hh_entity.c
index fa550d5..94aa370 100644
--- a/src/stm32/TODO/hh_entity.c
+++ b/src/stm32/TODO/hh_entity.c
@@ -1,3 +1,11 @@
+<<<<<<< HEAD
+#include "maths.h"
+#include "hh_entity.h"
+
+bool hh_collision(const vec2& environment, const vec2& entity){
+
+}
+=======
#include <stdbool.h>
#include "hh_entity.h"
@@ -39,3 +47,4 @@ void hh_solve_collision(vec2* pos_environment, hh_entity* entity){
}
}
+>>>>>>> 458d620a4ae17c42e97413a49db6c1c5f53393e5