zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-14 21:56:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,347 Commits 4 Branches 6 Tags
master
Commit Graph

63 Commits

Author SHA1 Message Date
Clément Le Bihan 51d1e6e73b fixing last tag with quotes directly 2021-06-20 12:56:02 +02:00
Zoe Roux cddeeaf3f9 Fixing #255 2021-06-20 12:32:42 +02:00
arthur.jamet b4897e4b0e ui tile in game are transluscent 2021-06-19 17:42:22 +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
Clément Le Bihan 8dc7e2b560 fixing height issues 2021-06-19 11:56:04 +02:00
HENRY Benjamin 68c219671f added some static function in lobbysystem (createtile) and fixed some old changes not necessary now 2021-06-18 22:38:32 +02:00
Zoe Roux 6015b62664 Merging with develop 2021-06-18 17:07:17 +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 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
arthur.jamet eb76ae832d merge from develop (tested) 2021-06-18 12:39:28 +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
Clément Le Bihan ff39fc6e40 fixing compil but linkage issues 2021-06-17 22:57:12 +02:00
Zoe Roux 94aa978220 The game can only be started with more than one player 2021-06-17 22:37:37 +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 cc065a2fb6 Trying to create a retry button 2021-06-17 17:58:02 +02:00
Zoe Roux 03f3d25d00 Merge pull request #191 from AnonymusRaccoon/update_texture 
Update texture
 2021-06-17 14:57:09 +02:00
Clément Le Bihan 2e630f981f Merge pull request #185 from AnonymusRaccoon/fix_player_death 
Fix player death
 2021-06-17 14:50:46 +02:00
Askou 991b77ad04 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into update_texture 2021-06-17 14:49:19 +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
HENRY Benjamin 238a188487 merged with develop 2021-06-17 14:41:34 +02:00
HENRY Benjamin 4e306581de the player now see the bomb explosion before dying of it 2021-06-17 14:34:29 +02:00
Bluub 80013ddb41 merge develop 2021-06-17 12:47:14 +02:00
arthur.jamet f0b6b59428 fix tile position ingame 2021-06-17 12:25:35 +02:00
arthur.jamet 1992f54a74 fire up ui: now displayed in int 2021-06-17 12:14:06 +02:00
Askou 6f9609a2f2 fix player heigth 2021-06-17 11:18:42 +02:00
HENRY Benjamin c601754c44 fixed an issue about the resume lobby 2021-06-17 10:51:41 +02:00
Bluub 09ad8b4efd ai scripts in assets 2021-06-16 18:56:49 +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 19a3eafebb fixing update display 2021-06-16 17:10:26 +02:00
Clément Le Bihan fcffbdca6d fixing update display 2021-06-16 17:10:07 +02:00
arthur.jamet 65dda46918 stat displays, no update 2021-06-16 16:47:19 +02:00
arthur.jamet 1f639fec98 stat displays, no update 2021-06-16 16:36:42 +02:00
arthur.jamet a11eef468c display simpe stat, no update 2021-06-16 16:32:07 +02:00
arthur.jamet b81fefc4e0 add squares to hide bonus in ui tile 2021-06-16 13:55:55 +02:00
EternalRat 2ed5b79cfc added speed to the save 2021-06-16 11:47:46 +02:00
HENRY Benjamin cdfa4a4b03 parser & resume game finish 2021-06-16 10:40:50 +02:00
Zoe Roux 856809d9c0 Fixing p 2021-06-15 18:00:37 +02:00
Zoe Roux 0533796f63 Adding ai holders 2021-06-15 16:35:04 +02:00
Bluub 35d07117a7 merge lobby 2021-06-15 16:28:29 +02:00
Zoe Roux 404c5d3d57 Adding AIs buttons 2021-06-15 16:09:47 +02:00
arthur.jamet 7f22d3279c add tile in ui 2021-06-15 15:57:59 +02:00
arthur.jamet ca400d7c6b add ui on game 2021-06-15 15:36:55 +02:00
Zoe Roux 123fe91080 Renaming the select button 2021-06-15 14:03:07 +02:00
Zoe Roux 01457a0cd5 Clearing the lobby on leave 2021-06-15 12:19:40 +02:00