zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-24 07:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into renderer

Browse Source 
# Conflicts:
#	lib/wal/sources/Component/Movable/MovableComponent.cpp
#	lib/wal/sources/Component/Position/PositionComponent.cpp
This commit is contained in:
Clément Le Bihan
2021-05-25 10:47:35 +02:00
parent 27717e742f 52fed37acd
commit 8c3ef2a23c
25 changed files with 115 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/System/Movable/MovableSystem.hpp
+1 -1
View File
@@ -26,4 +26,4 @@ class MovableSystem : public WAL::System
//! @brief A movable system is assignable.
MovableSystem &operator=(const MovableSystem &) = default;
};
}
} // namespace WAL