Merge the refactoring + box2d movement
Compare changes
- Frederik Alexander Keens authored
# Conflicts: # src/game/level/Level.cpp # src/game/main.cpp
+ 19
− 18
@@ -56,22 +56,22 @@ Level::Level(const std::string& path, Engine& engine)
@@ -87,30 +87,31 @@ Level::Level(const std::string& path, Engine& engine)
@@ -141,8 +142,8 @@ Level::Level(const std::string& path, Engine& engine)