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
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
Zoe Roux
254640d710
Making the background follow the game
2021-06-18 19:53:11 +02:00
Clément Le Bihan
4faeb8a0ed
modif load player to be less cancerous & for lobby loading we should use lobby functions
2021-06-17 22:32:10 +02:00
Clément Le Bihan
bc8504a026
adding position in shader
2021-06-17 18:22:59 +02:00
Askou
c42ee35a38
remove G
2021-06-17 14:52:32 +02:00
Askou
bdf666d941
remove Z
2021-06-17 14:51:44 +02:00
Askou
991b77ad04
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into update_texture
2021-06-17 14:49:19 +02:00
Askou
55711dd343
change floor
2021-06-17 14:45:08 +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
arthur.jamet
63a77a61b4
fix fullscreen resolution
2021-06-17 14:37:16 +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
57f895b563
remve ascii escape
2021-06-17 12:07:07 +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
7fcdd05de6
add fullscreen toggle
2021-06-16 21:18:45 +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
7fdb5a051d
mesh encapsulation done
2021-06-16 18:17:17 +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
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
arthur.jamet
0d63fbab6c
win size
2021-06-16 11:52:32 +02:00
Clément Le Bihan
e9e389374b
adding lonely option for shaders and adding a BombExplosionShaderComponent.cpp to save data
2021-06-16 10:30:10 +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
Clément Le Bihan
a753e7b0f8
fixing rotation
2021-06-15 17:28:29 +02:00
Clément Le Bihan
a3fccd1c67
adding rotation & scale to texture
2021-06-15 16:39:40 +02:00
Clément Le Bihan
9daaf54e94
vs shader works a little bit
2021-06-15 15:53:31 +02:00
arthur.jamet
a0784875d3
sorting scores
2021-06-15 12:31:44 +02:00
Zoe Roux
01457a0cd5
Clearing the lobby on leave
2021-06-15 12:19:40 +02:00
Clément Le Bihan
3eac269a89
adding the first bg
2021-06-15 11:34:35 +02:00
arthur.jamet
3bc227329d
attempt to fix compilation for windows
2021-06-14 18:31:12 +02:00
arthur.jamet
4dd3097c8a
Merge branch 'lobby' of github.com:AnonymusRaccoon/Bomberman into lobby
2021-06-14 17:34:56 +02:00
arthur.jamet
d17836685e
fix memory errors realted to cache
2021-06-14 17:34:06 +02:00
Zoe Roux
312d0e2811
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into lobby
2021-06-14 17:26:13 +02:00
Zoe Roux
10a73e07d1
Cleaning u
2021-06-14 16:07:24 +02:00
Zoe Roux
9b385349dc
Trying things.
2021-06-14 16:00:41 +02:00
Clément Le Bihan
331f7f3817
Merge pull request #154 from AnonymusRaccoon/wires
...
Draw Wires and bounding boxes in debug mode
2021-06-14 14:48:06 +02:00
Clément Le Bihan
a229452dc4
adding red color for collisions boxes
2021-06-14 14:41:04 +02:00
Zoe Roux
06a6eb2ed7
Merging with develop
2021-06-14 13:50:47 +02:00
Zoe Roux
60a5ad0ded
Allowing the game to be started
2021-06-14 13:36:11 +02:00
arthur.jamet
a3236ffba6
debug color is now a memeber of the drawable 3D class
2021-06-14 11:43:39 +02:00
Zoe Roux
de579ccda6
Handling ready buttons
2021-06-14 10:42:50 +02:00
arthur.jamet
ae68d5ab68
add wires + bounding box drawing for 3D shapes/Models
2021-06-14 10:07:08 +02:00
arthur.jamet
b5d33751af
square drwing
2021-06-12 14:18:42 +02:00
Zoe Roux
fb1cfa3654
Adding ready handling for players
2021-06-11 15:32:49 +02:00
Clément Le Bihan
f1f81cc3f8
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into bonus
...
# Conflicts:
# CMakeLists.txt
# sources/Map/Map.cpp
2021-06-10 12:29:58 +02:00
Clément Le Bihan
87303195c5
fixing indentation
2021-06-10 10:56:49 +02:00
arthur.jamet
0ad827c37b
player models are now independant
2021-06-10 09:58:52 +02:00
Zoe Roux
7a641835a6
Merging with develop
2021-06-09 17:07:14 +02:00
HENRY Benjamin
19b91d58a5
need to fix collisionsystem
2021-06-09 16:13:23 +02:00
