HENRY Benjamin
|
6134ab9352
|
just miss timercomponent + bombholdercomponent now (using all callbacks from collisioncomponent)
|
2021-06-03 09:51:35 +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 |
|
EternalRat
|
27c73de6ed
|
include collisioncomponent missing
|
2021-06-02 18:26:40 +02:00 |
|
Clément Le Bihan
|
883022d255
|
reenable map drawing
|
2021-06-02 18:17:32 +02:00 |
|
Clément Le Bihan
|
3790b2a8cd
|
first pr fixes from reviews
|
2021-06-02 18:14:44 +02:00 |
|
arthur.jamet
|
34cbe24c19
|
remove unwanted defines + upade encapsulation for window drawing function
|
2021-06-02 17:54:16 +02:00 |
|
arthur.jamet
|
73c2ec5498
|
fix merge
|
2021-06-02 17:23:17 +02:00 |
|
Clément Le Bihan
|
e45942d532
|
merge develop into animations
|
2021-06-02 16:57:40 +02:00 |
|
TrueBabyChaise
|
777cdf29fe
|
add collision
|
2021-06-02 16:51:11 +02:00 |
|
TrueBabyChaise
|
363386eed9
|
Merge branch 'develop' of https://github.com/AnonymusRaccoon/Bomberman into height_map_generator
|
2021-06-02 16:46:15 +02:00 |
|
EternalRat
|
8d47eaa380
|
Merge branch 'develop' into bonus
|
2021-06-02 16:34:29 +02:00 |
|
Clément Le Bihan
|
37fb527d5b
|
little fix
|
2021-06-02 16:30:16 +02:00 |
|
EternalRat
|
2772b75de1
|
comments added
|
2021-06-02 16:29:00 +02:00 |
|
Zoe Roux
|
88e086b272
|
Finishing to rework the drawable system
|
2021-06-02 16:22:26 +02:00 |
|
Zoe Roux
|
09d8b1a90b
|
Reworking drawable components
|
2021-06-02 16:18:26 +02:00 |
|
EternalRat
|
8b7a24ff1f
|
bonus has been done, just need to remove comments when bombholder will be push + decide the time before they got remove
|
2021-06-02 16:13:18 +02:00 |
|
Clément Le Bihan
|
b3eae9ebdf
|
adding the possibility to pause/resume an animation
|
2021-06-02 16:11:14 +02:00 |
|
Clément Le Bihan
|
f245fe727b
|
Animation is working segfault on unload
|
2021-06-02 15:58:37 +02:00 |
|
Clément Le Bihan
|
45a566f197
|
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into animations
|
2021-06-02 15:09:52 +02:00 |
|
Clément Le Bihan
|
d986a24c47
|
animation component should theoretically work
|
2021-06-02 15:08:46 +02:00 |
|
TrueBabyChaise
|
0d7d26b0f9
|
add basic depths with stairs and bumper to access it
|
2021-06-02 15:03:13 +02:00 |
|
Bluub
|
a3e04870ed
|
fix emrge conflict
|
2021-06-02 15:00:06 +02:00 |
|
arthur.jamet
|
ef0c323d94
|
addition + correct drawing modes
|
2021-06-02 14:33:52 +02:00 |
|
arthur.jamet
|
d2ba552f61
|
set fps limit
|
2021-06-02 10:33:37 +02:00 |
|
Bluub
|
d0205b68e6
|
public onCollide and onCollided
|
2021-06-01 17:45:09 +02:00 |
|
Askou
|
07f466ca67
|
fix coding style
|
2021-06-01 17:30:58 +02:00 |
|
Clément Le Bihan
|
b4d783d6c2
|
adding AnimationsSystem.cpp
|
2021-06-01 17:26:01 +02:00 |
|
Bluub
|
349da67b29
|
runner with the collision system
|
2021-06-01 17:21:26 +02:00 |
|
Zoe Roux
|
fdc0e33e44
|
Merging with develop
|
2021-06-01 17:10:36 +02:00 |
|
Zoe Roux
|
2da5b219b9
|
Adding an event system
|
2021-06-01 17:06:35 +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 |
|
Clément Le Bihan
|
e298ce03eb
|
starting to implement a AnimationComponent.cpp/.hpp
|
2021-06-01 15:52:47 +02:00 |
|
Zoe Roux
|
9dca04e385
|
Making bomb explose
|
2021-06-01 15:33:32 +02:00 |
|
Askou
|
c905803fc5
|
Add hole block and separate load/create map
|
2021-06-01 15:08:21 +02:00 |
|
Bluub
|
0c0b860d04
|
fix merge conflict
|
2021-06-01 14:46:19 +02:00 |
|
Bluub
|
b3dd001532
|
adding on collided callback
|
2021-06-01 14:43:48 +02:00 |
|
arthur.jamet
|
573ab3fd92
|
add fps limit on window at construction
|
2021-06-01 13:40:43 +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 |
|
Bluub
|
ef492f3b57
|
adding a unit test to test with a movable entity
|
2021-06-01 09:55:49 +02:00 |
|
Zoe Roux
|
87c5703c60
|
Adding a on death callback
|
2021-05-31 20:14:07 +02:00 |
|
HENRY Benjamin
|
0186a79858
|
undo changes
|
2021-05-31 17:52:28 +02:00 |
|
Bluub
|
e1b1f0a5a4
|
setting bound as public and add velocity with a if instead of a try/catch
|
2021-05-31 17:36:48 +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 |
|
Zoe Roux
|
1cf2a9ee9f
|
Creating the timer system
|
2021-05-31 17:28:56 +02:00 |
|
Bluub
|
4d0621a987
|
min max static function on vector3f, bound is public, adding movable into collision calculation
|
2021-05-31 17:26:54 +02:00 |
|
Zoe Roux
|
44b68b15e6
|
Adding a timer component
|
2021-05-31 17:19:23 +02:00 |
|