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

243 Commits

Author SHA1 Message Date
Clément Le Bihan
785e38c507 timer support but there's a bug when saving & loading consecutively (without restart) 2021-06-19 15:38:22 +02:00
Clément Le Bihan
5c3c3555c9 dding a timer delay but linak issue 2021-06-19 15:26:59 +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
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
Zoe Roux
254640d710 Making the background follow the game 2021-06-18 19:53:11 +02:00
Zoe Roux
a55b1543c9 Adding a restart timer when resuming the game 2021-06-18 17:56:34 +02:00
Zoe Roux
6015b62664 Merging with develop 2021-06-18 17:07:17 +02:00
Zoe Roux
9986166ccc Fixing fast click on the pause menu 2021-06-18 16:10:11 +02:00
Zoe Roux
000528ba14 Fixing #228 2021-06-18 16:07:40 +02:00
EternalRat
a19536f389 parser done? (need to test a lot) 2021-06-18 15:49:05 +02:00
EternalRat
9cbce05fbe fixed crash on windows 2021-06-18 15:07:58 +02:00
EternalRat
970df6570c fixed resumelobby 2021-06-18 14:10:20 +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
Zoe Roux
1bcbdcdd01 Fixing the timer 2021-06-18 12:04:33 +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
Benjamin HENRY
93c8fb1192 Merge branch 'develop' into parser 2021-06-17 21:54:54 +02:00
arthur.jamet
a886b50239 hide cursor ingame 2021-06-17 21:09:45 +02:00
arthur.jamet
051096a194 fix compile errors 2021-06-17 20:50:43 +02:00
arthur.jamet
6925d63309 add strict compilation flags 2021-06-17 18:21:43 +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
Arthi-chaud
685f661de2 Merge pull request #188 from AnonymusRaccoon/new_win_size 
UI Improvement (Vol. 2)
 2021-06-17 14:42:34 +02:00
Bluub
80013ddb41 merge develop 2021-06-17 12:47:14 +02:00
Arthi-chaud
944ad53f0b Merge pull request #186 from AnonymusRaccoon/safe_resource_loading 
when a resource is not found, an exceptions is thrown
 2021-06-17 12:19:29 +02:00
arthur.jamet
9c1f0b1bcd window in 720 2021-06-17 12:03:39 +02:00
Askou
6f1efdc527 merge develop 2021-06-17 11:54:41 +02:00
Clément Le Bihan
a1ad9a57ac Merge pull request #183 from AnonymusRaccoon/sound_fix 
Fix Sound On Click
 2021-06-17 11:22:10 +02:00
arthur.jamet
1f1379a5a5 when a resource is not found, an exceptions is thrown 2021-06-17 11:17:18 +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
arthur.jamet
a8f5cb85a5 fix sound on click 2021-06-17 09:47:36 +02:00
arthur.jamet
cb01bfe123 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into win_size 2021-06-16 19:31:40 +02:00
Clément Le Bihan
38bfec6c81 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into find_bg 
# Conflicts:
#	CMakeLists.txt
#	sources/Runner/GameScene.cpp
 2021-06-16 18:33:15 +02:00
Zoe Roux
847e004980 Merging with develop 2021-06-16 17:38:59 +02:00
arthur.jamet
2956f7519f merge from develop 2021-06-16 17:37:23 +02:00
Clément Le Bihan
a3c908dacc Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into find_bg 
# Conflicts:
#	sources/Runner/GameScene.cpp
#	sources/Runner/LobbyScene.cpp
 2021-06-16 16:33:08 +02:00
arthur.jamet
a11eef468c display simpe stat, no update 2021-06-16 16:32:07 +02:00
arthur.jamet
a477ef1252 timer system for ui 2021-06-16 13:26:48 +02:00
Zoe Roux
c39884b2a6 Merging with develop 2021-06-16 12:52:53 +02:00
arthur.jamet
797589a8a0 fix posiion rescaling 2021-06-16 12:27:40 +02:00
EternalRat
2ed5b79cfc added speed to the save 2021-06-16 11:47:46 +02:00
HENRY Benjamin
384c5e1188 merged with develop + everything working parser finish 2021-06-16 10:54:32 +02:00
HENRY Benjamin
cdfa4a4b03 parser & resume game finish 2021-06-16 10:40:50 +02:00
arthur.jamet
9acc6cb09c remove unused system 2021-06-16 09:04:43 +02:00
Clément Le Bihan
52d9eca934 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into find_bg 
# Conflicts:
#	CMakeLists.txt
#	lib/Ray/sources/Drawables/2D/Rectangle.hpp
#	lib/Ray/sources/Drawables/Texture.cpp
#	lib/Ray/sources/Drawables/Texture.hpp
#	sources/Runner/CreditScene.cpp
#	sources/Runner/GameScene.cpp
#	sources/Runner/Runner.cpp

still some issues with textures that are drawn behind
 2021-06-16 00:36:06 +02:00
arthur.jamet
8a4c3fa586 mosue management 2021-06-15 17:59:45 +02:00