zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2025-12-20 13:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
573 Commits 4 Branches 6 Tags
b552ee3d45462eccad3dccd6a722fefb02a95612
Commit Graph

47 Commits

Author SHA1 Message Date
Askou
b552ee3d45 add collision for bumper and hole 2021-06-09 11:57:25 +02:00
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
395566598c last fixes 2021-06-08 12:02:56 +02:00
Clément Le Bihan
d08613a9d4 zoe has to smile ! 2021-06-08 11:58:30 +02:00
Clément Le Bihan
aba85c918e adding QoL changes 2021-06-08 01:10:15 +02:00
Clément Le Bihan
ca930db44d more cleanup 2021-06-08 00:55:32 +02:00
Clément Le Bihan
556021a4ef map colliders seems nice 2021-06-08 00:35:34 +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
Clément Le Bihan
65af11f3f9 collisions are working ok with user defined offsets 2021-06-07 23:37:51 +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
Clément Le Bihan
b7d43fef6a starting to look into collisions 2021-06-07 18:01:19 +02:00
Zoe Roux
7234d51130 Allowing entities to be created and removed 2021-06-07 17:57:45 +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
Zoe Roux
f47dd669f1 Collisions are still broke 2021-06-07 11:37:16 +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
Clément Le Bihan
96713ba549 fixing naming issue 2021-06-06 12:11:08 +02:00
Clément Le Bihan
d6992701df clion coding style refactor 2021-06-06 12:09:37 +02:00
Tom AUGIER
638cdaa58c Merge branch 'develop' into height_map_generator 2021-06-05 17:36:04 +02:00
Askou
6e26763dc7 fix norm 2021-06-05 17:31:20 +02:00
Askou
66e2168e65 fix merge 2021-06-05 17:29:53 +02:00
Askou
fb65cc3613 fix bumper position 2021-06-04 14:42:57 +02:00
arthur.jamet
8324eb48c2 remove specialt exture 2021-06-04 13:14:10 +02:00
arthur.jamet
da972a36e8 remove texture applying on model with complex materials 2021-06-04 11:09:20 +02:00
Zoe Roux
0236aaa2ea Merging with develop and reworking all systems 2021-06-04 01:04:05 +02:00
arthur.jamet
a48c0b7460 rename assets folder for map 2021-06-03 16:49:14 +02:00
arthur.jamet
c7ab528e86 map generator: use variable to avoir strings repetition 2021-06-03 16:40:12 +02:00
arthur.jamet
b0337ae2da fix breakable wall texture's white line 2021-06-03 10:56:42 +02:00
Askou
df10f9f011 add colors to upper_floor 2021-06-03 10:05:40 +02:00
Zoe Roux
a3804c170f Optimizing component handling 2021-06-02 21:29:14 +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
402b5386c5 Better perfomance and loading with map, in model.hpp place scale as third argument 2021-06-01 17:01:50 +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
0186a79858 undo changes 2021-05-31 17:52:28 +02:00
HENRY Benjamin
dd0d1e6fa2 little fix 2021-05-31 17:35:42 +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