zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-07 19:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser

Browse Source 
# Conflicts:
#	sources/Map/Map.cpp
#	sources/Runner/GameScene.cpp
#	sources/Runner/PauseMenuScene.cpp
#	sources/Runner/Runner.cpp
#	sources/System/Controllable/ControllableSystem.cpp
#	sources/System/Lobby/LobbySystem.cpp
This commit is contained in:
Clément Le Bihan
2021-06-19 14:39:43 +02:00
parent 8dc7e2b560 2d2055a86b
commit d8396337dd
34 changed files with 219 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Ray/sources/Drawables/3D/Plane.cpp
+2 -1
View File
@@ -11,7 +11,8 @@ namespace RAY::Drawables::Drawables3D
{
Plane::Plane(const Vector3 &position, const Vector2 &dimensions, const Color &color) :
ADrawable3D(position, color), _dimensions(dimensions)
ADrawable3D(position, color),
_dimensions(dimensions)
{
}