zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-02-14 17:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,347 Commits 4 Branches 6 Tags
develop
Commit Graph

99 Commits

Author SHA1 Message Date
Zoe Roux
5293222f88 Resetting the velocity on death 2021-06-20 19:19:35 +02:00
arthur.jamet
5d89c20277 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into soundfix 2021-06-20 13:33:52 +02:00
arthur.jamet
3f86d506f7 fixing missing sounds 2021-06-20 13:29:38 +02:00
Zoe Roux
de6bdf61fe Fixing the pause timer 2021-06-20 12:17:43 +02:00
Zoe Roux
c518de097a Fixing pause menu without control 2021-06-20 12:14:10 +02:00
Zoe Roux
25c2d4774f Fixingn a bug 2021-06-20 11:49:43 +02:00
Bluub
6e7e0133c3 merge develop 2021-06-19 19:06:35 +02:00
Clément Le Bihan
28553cb6dd Merge pull request #230 from AnonymusRaccoon/parser 
Parser
 2021-06-19 16:29:45 +02:00
Bluub
4d4c8df243 Merge branch 'fixes' of github.com:AnonymusRaccoon/Bomberman into ai_script 2021-06-19 16:01:52 +02:00
Zoe Roux
d8da52af55 Fixing more than two players scores 2021-06-19 15:54:25 +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
309f2e5e70 Reducing the size of the player 2021-06-19 13:52:14 +02:00
Zoe Roux
9b0c39f12a Merging with develop 2021-06-19 13:43:37 +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
a9d5f81de7 Fixing the background wall 2021-06-18 22:42:54 +02:00
Zoe Roux
64d0244c54 Fixing background overlap 2021-06-18 22:19:33 +02:00
HENRY Benjamin
11720b8d10 now there's a background during the intro 2021-06-18 21:52:34 +02:00
Zoe Roux
e7cbb3e5fd Merging with develop 2021-06-18 20:40:16 +02:00
Zoe Roux
254640d710 Making the background follow the game 2021-06-18 19:53:11 +02:00
Clément Le Bihan
afc1fda08e resetting correct noclip spawn rate 2021-06-18 16:28:30 +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
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
arthur.jamet
f23a58a616 add backgrounds 2021-06-18 11:50:23 +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
5826b5f66f fixing compil 2021-06-18 10:52:27 +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
Zoe Roux
26ac0e0a44 Finding the issue 2021-06-17 18:34:08 +02:00
Askou
da448c49c9 add little parallax 2021-06-17 18:00:34 +02:00
arthur.jamet
df82ee88b9 timer starts after intro animatio is over 2021-06-17 16:50:00 +02:00
Zoe Roux
2ff8230c35 Merge pull request #175 from AnonymusRaccoon/camera_system 
Camera system
 2021-06-17 15:00:34 +02:00
Zoe Roux
03f3d25d00 Merge pull request #191 from AnonymusRaccoon/update_texture 
Update texture
 2021-06-17 14:57:09 +02:00
Zoe Roux
209472e05a Merging with develop 2021-06-17 14:53:28 +02:00
Bluub
0d5cfe109f aggressive ai stuck in loop 2021-06-17 14:52:57 +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
HENRY Benjamin
238a188487 merged with develop 2021-06-17 14:41:34 +02:00
Askou
fd7c1c8241 Merge remote-tracking branch 'origin/background' into update_texture 2021-06-17 12:03:20 +02:00
Askou
6f1efdc527 merge develop 2021-06-17 11:54:41 +02:00
Zoe Roux
8d84228cfd Adding a background map 2021-06-17 11:32:20 +02:00
Askou
6f9609a2f2 fix player heigth 2021-06-17 11:18:42 +02:00
Askou
8c56f7f4a1 Add Camera System 2021-06-17 10:58:13 +02:00
HENRY Benjamin
c601754c44 fixed an issue about the resume lobby 2021-06-17 10:51:41 +02:00
Askou
933a96c449 fix norm 2021-06-17 10:29:56 +02:00
Askou
6ca2b90291 Remove controllable instead of checking health 2021-06-17 10:29:29 +02:00