 Clément Le Bihan
|
1a2734eb4a
|
Merge pull request #262 from AnonymusRaccoon/ai_inprovements
Ai inprovements
|
2021-06-20 22:22:08 +02:00 |
|
|
Bluub
|
5d9fb5b09c
|
check if script has Update function
|
2021-06-20 22:00:51 +02:00 |
|
|
Zoe Roux
|
5293222f88
|
Resetting the velocity on death
|
2021-06-20 19:19:35 +02:00 |
|
|
Zoe Roux
|
56f9995431
|
Merge pull request #256 from AnonymusRaccoon/fix
Fix
|
2021-06-20 13:27:00 +02:00 |
|
|
Clément Le Bihan
|
51d1e6e73b
|
fixing last tag with quotes directly
|
2021-06-20 12:56:02 +02:00 |
|
|
Clément Le Bihan
|
4d1c16a233
|
fixing tag component and rm unused includes
|
2021-06-20 12:47:14 +02:00 |
|
|
Clément Le Bihan
|
a324d70dcc
|
fixing compil warning
|
2021-06-20 12:20:12 +02:00 |
|
|
Clément Le Bihan
|
614b5af580
|
it's better
|
2021-06-19 23:30:07 +02:00 |
|
|
Bluub
|
6e7e0133c3
|
merge develop
|
2021-06-19 19:06:35 +02:00 |
|
|
Bluub
|
2184425336
|
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into ai_script
|
2021-06-19 15:07:03 +02:00 |
|
|
Clément Le Bihan
|
d8396337dd
|
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser
# 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
|
2021-06-19 14:39:43 +02:00 |
|
|
Zoe Roux
|
9b0c39f12a
|
Merging with develop
|
2021-06-19 13:43:37 +02:00 |
|
|
Clément Le Bihan
|
631b03c996
|
Merge pull request #223 from AnonymusRaccoon/menues
Menus improvements
|
2021-06-19 13:34:08 +02:00 |
|
|
Clément Le Bihan
|
75ad53b40f
|
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser
# Conflicts:
# CMakeLists.txt
# sources/Runner/GameScene.cpp
|
2021-06-19 11:34:12 +02:00 |
|
|
Bluub
|
96255c5c89
|
merge develop
|
2021-06-19 02:25:44 +02:00 |
|
|
Zoe Roux
|
e7cbb3e5fd
|
Merging with develop
|
2021-06-18 20:40:16 +02:00 |
|
|
Clément Le Bihan
|
41e1becdeb
|
fixing small issues
|
2021-06-18 20:08:34 +02:00 |
|
|
Bluub
|
638be2f3a8
|
cleanup on some files
|
2021-06-18 18:27:38 +02:00 |
|
|
Zoe Roux
|
a55b1543c9
|
Adding a restart timer when resuming the game
|
2021-06-18 17:56:34 +02:00 |
|
|
Clément Le Bihan
|
3218da652b
|
fixing warnings
|
2021-06-18 17:39:41 +02:00 |
|
|
Zoe Roux
|
6015b62664
|
Merging with develop
|
2021-06-18 17:07:17 +02:00 |
|
|
HENRY Benjamin
|
3c0d933b83
|
fixed some warning + one test
|
2021-06-18 16:25:38 +02:00 |
|
|
Clément Le Bihan
|
cdba078231
|
first correct no clip version
|
2021-06-18 16:25:20 +02:00 |
|
|
EternalRat
|
a19536f389
|
parser done? (need to test a lot)
|
2021-06-18 15:49:05 +02:00 |
|
|
EternalRat
|
970df6570c
|
fixed resumelobby
|
2021-06-18 14:10:20 +02:00 |
|
|
Zoe Roux
|
63044f756a
|
Switching keyboard layouts
|
2021-06-18 13:43:28 +02:00 |
|
|
Zoe Roux
|
8d9432c1f4
|
Handling buttons on key up
|
2021-06-18 12:42:51 +02:00 |
|
|
arthur.jamet
|
eb76ae832d
|
merge from develop (tested)
|
2021-06-18 12:39:28 +02:00 |
|
|
Askou
|
b5a4ee17ff
|
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into background_parallax
|
2021-06-18 11:57:35 +02:00 |
|
|
Clément Le Bihan
|
01982d00fe
|
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser
# Conflicts:
# sources/Component/BombHolder/BombHolderComponent.cpp
# sources/Map/Map.cpp
|
2021-06-18 11:17:27 +02:00 |
|
|
Clément Le Bihan
|
d9accd58bd
|
doesn't compile
|
2021-06-18 10:40:36 +02:00 |
|
|
Clément Le Bihan
|
a21c9c7a38
|
adding a speed component
|
2021-06-18 10:33:58 +02:00 |
|
|
Clément Le Bihan
|
e18f72578e
|
fixing shaders throw
|
2021-06-18 09:11:33 +02:00 |
|
|
arthur.jamet
|
11792958f2
|
add epitech logo in splash screen
|
2021-06-18 08:42:02 +02:00 |
|
|
Zoe Roux
|
d424c07744
|
Finishing the replay button
|
2021-06-17 22:31:21 +02:00 |
|
|
Benjamin HENRY
|
93c8fb1192
|
Merge branch 'develop' into parser
|
2021-06-17 21:54:54 +02:00 |
|
|
arthur.jamet
|
051096a194
|
fix compile errors
|
2021-06-17 20:50:43 +02:00 |
|
|
arthur.jamet
|
1cf820bf87
|
fix compile errors
|
2021-06-17 19:24:49 +02:00 |
|
|
Bluub
|
8914579fd7
|
test register on component
|
2021-06-17 18:20:37 +02:00 |
|
|
Askou
|
da448c49c9
|
add little parallax
|
2021-06-17 18:00:34 +02:00 |
|
|
Zoe Roux
|
dfc42ced60
|
Cleaning up the cmake
|
2021-06-17 17:32:46 +02:00 |
|
|
HENRY Benjamin
|
c71104389d
|
updated everything with node
|
2021-06-17 17:10:31 +02:00 |
|
|
Clément Le Bihan
|
8a6abebeaf
|
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into opti
|
2021-06-17 17:01:26 +02:00 |
|
|
Zoe Roux
|
9826375c62
|
Using fixed update and adding optimization flags
|
2021-06-17 16:58:39 +02:00 |
|
|
Zoe Roux
|
37a4889ea7
|
Merging with develop
|
2021-06-17 14:50:41 +02:00 |
|
|
Zoe Roux
|
65f990f490
|
Merging with develop
|
2021-06-17 14:49:00 +02:00 |
|
|
Zoe Roux
|
a02381b23c
|
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into fixs
|
2021-06-17 14:38:33 +02:00 |
|
|
Zoe Roux
|
e9c3f8e083
|
Fixing bonus collisions
|
2021-06-17 14:37:34 +02:00 |
|
|
Clément Le Bihan
|
fec3f22e97
|
Merge pull request #189 from AnonymusRaccoon/fixs
Bombs fix
|
2021-06-17 14:33:06 +02:00 |
|
|
Bluub
|
80013ddb41
|
merge develop
|
2021-06-17 12:47:14 +02:00 |
|