Merge branch 'develop' into feature/loading_all_models

2021-06-18 15:33:06 +02:00
parent 17b585190a 497186b587
commit 3a42966e92
38 changed files with 794 additions and 384 deletions
--- a/src/entities/house_generator.h
+++ b/src/entities/house_generator.h
@@ -8,6 +8,7 @@
 #include "../models/Model.h"
 #include "../collision/collision.h"
 #include "../model_Storage.h"
+#include "collision_entity.h"

 namespace entities
 {