Commit Graph

6 Commits

Author SHA1 Message Date
Clément Le Bihan
a5a336e1f5 Merge branch 'develop' into renderer
# Conflicts:
#	CMakeLists.txt
#	lib/wal/CMakeLists.txt
#	sources/Component/Movable/MovableComponent.cpp
#	sources/Component/Position/PositionComponent.cpp
#	sources/Component/Position/PositionComponent.hpp
#	sources/System/Movable/MovableSystem.cpp
#	sources/System/Movable/MovableSystem.hpp
#	sources/main.cpp
2021-05-26 11:31:28 +02:00
Clément Le Bihan
1dd2117f8d Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into ecs 2021-05-26 11:22:20 +02:00
Zoe Roux
6deade8ddc Fixing namespace 2021-05-24 17:15:24 +02:00
Zoe Roux
c104a3ad99 Moving components and systems out of the ecs 2021-05-24 15:23:20 +02:00
Clément Le Bihan
269ec94412 fixed compil and finished moving files to the game 2021-05-24 11:46:52 +02:00
Clément Le Bihan
3d5ea204b6 adding a RectangleDrawable2DComponent and moving files 2021-05-24 11:33:19 +02:00