zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-12 13:14:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	sources/Component/BombHolder/BombHolderComponent.cpp
#	sources/Map/Map.cpp
This commit is contained in:
Clément Le Bihan
2021-06-18 11:17:27 +02:00
parent 5826b5f66f f1918678be
commit 01982d00fe
53 changed files with 168 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Map/Map.cpp
+1
View File
@@ -175,6 +175,7 @@ namespace BBM
.addComponent<PositionComponent>(i, 0, height + 1)
.addComponent<TagComponent<Blowable>>();
}
scene->addEntity("Bottom Wall")
.addComponent<PositionComponent>(Vector3f((width + 1) / 2, 0, -1))
.addComponent<CollisionComponent>(