zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2025-12-21 05:45:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
567 Commits 4 Branches 6 Tags
f74c053c8025198c95e00bc5f3fa35d5db2b6c3e
Commit Graph

25 Commits

Author SHA1 Message Date
Clément Le Bihan
f74c053c80 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into collision_check_clem 
# Conflicts:
#	sources/Map/Map.cpp
#	sources/Map/Map.hpp
 2021-06-08 16:19:32 +02:00
Clément Le Bihan
d08613a9d4 zoe has to smile ! 2021-06-08 11:58:30 +02:00
Clément Le Bihan
22606ecf68 giving the collided Axis for context to callback on collisions 2021-06-08 00:19:34 +02:00
Zoe Roux
31f712531a Merging with develop 2021-06-07 21:58:07 +02:00
Zoe Roux
fe9a650427 Making walls breakables 2021-06-07 21:47:04 +02:00
Zoe Roux
30a7da899f Merge pull request #116 from AnonymusRaccoon/ecs 
Views of entities and components
 2021-06-07 15:54:23 +02:00
Zoe Roux
b22a9f1c63 Merging with develop 2021-06-07 11:58:53 +02:00
arthur.jamet
95761b75b7 second floor hole asset 2021-06-07 10:17:53 +02:00
arthur.jamet
c7554c6b97 assets for hole on second flor 2021-06-07 09:39:00 +02:00
Zoe Roux
01ea9053fa Making block solids 2021-06-06 16:54:27 +02:00
Tom AUGIER
638cdaa58c Merge branch 'develop' into height_map_generator 2021-06-05 17:36:04 +02:00
Zoe Roux
a40b61845a Adding an iterator 2021-06-04 18:59:42 +02:00
arthur.jamet
c7ab528e86 map generator: use variable to avoir strings repetition 2021-06-03 16:40:12 +02:00
Askou
df10f9f011 add colors to upper_floor 2021-06-03 10:05:40 +02:00
arthur.jamet
f357eccd09 merging from develpo 2021-06-02 19:39:29 +02:00
TrueBabyChaise
777cdf29fe add collision 2021-06-02 16:51:11 +02:00
TrueBabyChaise
0d7d26b0f9 add basic depths with stairs and bumper to access it 2021-06-02 15:03:13 +02:00
Askou
07f466ca67 fix coding style 2021-06-01 17:30:58 +02:00
Askou
03dc561bff basic map with hole 2021-06-01 16:08:27 +02:00
Askou
c905803fc5 Add hole block and separate load/create map 2021-06-01 15:08:21 +02:00
HENRY Benjamin
87ef807308 add healthcomponent to breakable block 2021-06-01 11:54:01 +02:00
HENRY Benjamin
5aeb16b749 fix before merge (develop => map_generator) 2021-06-01 11:46:55 +02:00
HENRY Benjamin
38cbfa022e basic map with unbreakable & breakable block 2021-05-31 17:32:30 +02:00
TrueBabyChaise
4942bd8e99 Remove ColliderComponent and Fix issues on map 2021-05-28 10:10:18 +02:00
TrueBabyChaise
f79c6f46a3 Map + ColliderComponent 
Basic map and ColliderComponent, system hasn't be done at the moment

Co-Authored-By: Benjamin HENRY <44569175+EternalRat@users.noreply.github.com>
 2021-05-26 16:15:16 +02:00