zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2025-12-22 14:25:10 +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

2
sources/System/Movable/MovableSystem.cpp
View File

@@ -25,4 +25,4 @@ namespace BBM
movable._velocity = movable._acceleration * WAL::Wal::timestep.count();
movable._acceleration = WAL::Vector3f();
}
}
} // namespace WAL