5a948bca46
fixing test compil undoing emmscripten stuff
2021-06-16 19:58:54 +02:00
bd309179e3
fixing emscrippten warning and fixing windows artefact name
2021-06-16 19:50:21 +02:00
a0499f5f73
untrash RAY CMakeLists.txt
2021-06-16 18:39:20 +02:00
7fdb5a051d
mesh encapsulation done
2021-06-16 18:17:17 +02:00
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
c39884b2a6
Merging with develop
2021-06-16 12:52:53 +02:00
e9e389374b
adding lonely option for shaders and adding a BombExplosionShaderComponent.cpp to save data
2021-06-16 10:30:10 +02:00
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
a753e7b0f8
fixing rotation
2021-06-15 17:28:29 +02:00
a3fccd1c67
adding rotation & scale to texture
2021-06-15 16:39:40 +02:00
9daaf54e94
vs shader works a little bit
2021-06-15 15:53:31 +02:00
a0784875d3
sorting scores
2021-06-15 12:31:44 +02:00
01457a0cd5
Clearing the lobby on leave
2021-06-15 12:19:40 +02:00
3eac269a89
adding the first bg
2021-06-15 11:34:35 +02:00
3bc227329d
attempt to fix compilation for windows
2021-06-14 18:31:12 +02:00
4dd3097c8a
Merge branch 'lobby' of github.com:AnonymusRaccoon/Bomberman into lobby
2021-06-14 17:34:56 +02:00
d17836685e
fix memory errors realted to cache
2021-06-14 17:34:06 +02:00
312d0e2811
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into lobby
2021-06-14 17:26:13 +02:00
10a73e07d1
Cleaning u
2021-06-14 16:07:24 +02:00
9b385349dc
Trying things.
2021-06-14 16:00:41 +02:00
331f7f3817
Merge pull request #154 from AnonymusRaccoon/wires
...
Draw Wires and bounding boxes in debug mode
2021-06-14 14:48:06 +02:00
a229452dc4
adding red color for collisions boxes
2021-06-14 14:41:04 +02:00
06a6eb2ed7
Merging with develop
2021-06-14 13:50:47 +02:00
60a5ad0ded
Allowing the game to be started
2021-06-14 13:36:11 +02:00
a3236ffba6
debug color is now a memeber of the drawable 3D class
2021-06-14 11:43:39 +02:00
a42ca68595
Fixing play button and menu handling
2021-06-14 11:39:00 +02:00
de579ccda6
Handling ready buttons
2021-06-14 10:42:50 +02:00
ae68d5ab68
add wires + bounding box drawing for 3D shapes/Models
2021-06-14 10:07:08 +02:00
b5d33751af
square drwing
2021-06-12 14:18:42 +02:00
fb1cfa3654
Adding ready handling for players
2021-06-11 15:32:49 +02:00
ccde7a9879
Allowing players to join the lobby
2021-06-11 12:15:51 +02:00
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
87303195c5
fixing indentation
2021-06-10 10:56:49 +02:00
0ad827c37b
player models are now independant
2021-06-10 09:58:52 +02:00
7a641835a6
Merging with develop
2021-06-09 17:07:14 +02:00
19b91d58a5
need to fix collisionsystem
2021-06-09 16:13:23 +02:00
4f50985fe1
Fixing wasm
2021-06-09 16:13:12 +02:00
c94237dedc
Adding a onStart onStop
2021-06-09 16:00:06 +02:00
e4209c3ca2
fix merge + convert audio ressources + add sounds/music to scenes
2021-06-09 15:21:00 +02:00
c544a83ee8
Merging with develop
2021-06-09 14:52:18 +02:00
6218a4243f
Merge pull request #131 from AnonymusRaccoon/cache
...
Cache System - Lonely
2021-06-09 14:37:11 +02:00
0174d121f1
cache system test
2021-06-09 12:25:21 +02:00
70524fa935
cache system add lonely functionnality
2021-06-09 11:14:53 +02:00
07f61fb462
Merge branch 'develop' into music_component
2021-06-08 20:08:38 +02:00
783704d11e
fix sound asset
2021-06-08 19:17:12 +02:00
44afd5cd44
adding joystick support for gamepad controller
2021-06-08 18:27:12 +02:00
066d1dee42
Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into shader_non_broken
...
# Conflicts:
# CMakeLists.txt
# sources/Runner/Runner.cpp
2021-06-08 16:29:57 +02:00
29690b3744
fix button for pause menu opening
2021-06-08 16:21:03 +02:00
4af99e75e5
bonus working, just miss 3 bonuses (cause bombholder isn't finish yet)
2021-06-08 16:14:37 +02:00
1e5d97f831
settings: minux/plus inverted
2021-06-08 16:00:30 +02:00
Clément Le Bihan