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

30 Commits

Author SHA1 Message Date
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
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
Zoe Roux
6015b62664 Merging with develop 2021-06-18 17:07:17 +02:00
arthur.jamet
7503a06466 add controls in lobby 2021-06-18 14:57:31 +02:00
Zoe Roux
917e0c73ac Removing the lava option in the lobby 2021-06-18 14:25:19 +02:00
Zoe Roux
63044f756a Switching keyboard layouts 2021-06-18 13:43:28 +02:00
arthur.jamet
f23a58a616 add backgrounds 2021-06-18 11:50:23 +02:00
Zoe Roux
65f990f490 Merging with develop 2021-06-17 14:49:00 +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
1f1379a5a5 when a resource is not found, an exceptions is thrown 2021-06-17 11:17:18 +02:00
arthur.jamet
a8f5cb85a5 fix sound on click 2021-06-17 09:47:36 +02:00
Askou
88add0b8f1 basic game intro animation with reset 2021-06-17 09:37:11 +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
Clément Le Bihan
fa8ca67fbb cleaning missing infos 2021-06-16 17:46:41 +02:00
Clément Le Bihan
43de339cf7 creating a second ctor for Drawable2D 2021-06-16 17:42:48 +02:00
arthur.jamet
2956f7519f merge from develop 2021-06-16 17:37:23 +02:00
Clément Le Bihan
691a50ddb5 fixing cpu button display 2021-06-16 16:38:03 +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
578cf49906 fix indentation 2021-06-16 13:11:44 +02:00
Clément Le Bihan
f549faa424 hacky way to solve ready texture display 2021-06-16 00:54:18 +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
Zoe Roux
19d8425af0 Enabling height toogle 2021-06-15 17:05:26 +02:00
Zoe Roux
404c5d3d57 Adding AIs buttons 2021-06-15 16:09:47 +02:00
arthur.jamet
af599fac0f add how to play scene 2021-06-15 14:59:45 +02:00
arthur.jamet
1ff0a8bc5d add how to playbutton 2021-06-15 14:23:19 +02:00
Zoe Roux
01457a0cd5 Clearing the lobby on leave 2021-06-15 12:19:40 +02:00
Zoe Roux
b204f48059 Adding colors to players 2021-06-14 17:21:10 +02:00
Zoe Roux
06a6eb2ed7 Merging with develop 2021-06-14 13:50:47 +02:00