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

405 Commits

Author SHA1 Message Date
Bluub
14e1e2a6b3 added through breakable 2021-06-20 22:09:27 +02:00
Bluub
6e7e0133c3 merge develop 2021-06-19 19:06:35 +02:00
Bluub
fc3b6943f0 encapsulation closure 2021-06-19 19:00:56 +02:00
Clément Le Bihan
28553cb6dd Merge pull request #230 from AnonymusRaccoon/parser 
Parser
 2021-06-19 16:29:45 +02:00
Bluub
2184425336 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into ai_script 2021-06-19 15:07:03 +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
24d522d828 Fixing the raylib version to a commit 2021-06-19 14:19:02 +02:00
Zoe Roux
9b0c39f12a Merging with develop 2021-06-19 13:43:37 +02:00
Bluub
64b4ac3d71 more encapsulatino 2021-06-19 12:20:26 +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
Bluub
96255c5c89 merge develop 2021-06-19 02:25:44 +02:00
Clément Le Bihan
fe62e13433 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into shader_to_property 
# Conflicts:
#	sources/System/BombHolder/BombHolderSystem.cpp
 2021-06-19 01:12:34 +02:00
Zoe Roux
e7cbb3e5fd Merging with develop 2021-06-18 20:40:16 +02:00
Zoe Roux
254640d710 Making the background follow the game 2021-06-18 19:53:11 +02:00
EternalRat
a19536f389 parser done? (need to test a lot) 2021-06-18 15:49:05 +02:00
arthur.jamet
eb76ae832d merge from develop (tested) 2021-06-18 12:39:28 +02:00
Bluub
4f6dd75c5d should close on the lua state encapsulation to use it in labmdas 2021-06-18 11:51:58 +02:00
Bluub
b355aed333 getMap and getDanger working 2021-06-18 11:46:31 +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
4faeb8a0ed modif load player to be less cancerous & for lobby loading we should use lobby functions 2021-06-17 22:32:10 +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
c08319d1f3 remove werror compilation flag 2021-06-17 21:54:54 +02:00
arthur.jamet
051096a194 fix compile errors 2021-06-17 20:50:43 +02:00
arthur.jamet
1cf820bf87 fix compile errors 2021-06-17 19:24:49 +02:00
Clément Le Bihan
bc8504a026 adding position in shader 2021-06-17 18:22:59 +02:00
Bluub
6bfcac515f lua gate new ctor 2021-06-17 18:20:02 +02:00
Zoe Roux
03f3d25d00 Merge pull request #191 from AnonymusRaccoon/update_texture 
Update texture
 2021-06-17 14:57:09 +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
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
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
HENRY Benjamin
238a188487 merged with develop 2021-06-17 14:41:34 +02:00
arthur.jamet
63a77a61b4 fix fullscreen resolution 2021-06-17 14:37:16 +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
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
Bluub
3da5ae9961 remoe lua.hpp 2021-06-17 11:52:18 +02:00
arthur.jamet
1f1379a5a5 when a resource is not found, an exceptions is thrown 2021-06-17 11:17:18 +02:00
HENRY Benjamin
c601754c44 fixed an issue about the resume lobby 2021-06-17 10:51:41 +02:00
Askou
1261476a00 try to add death timer 2021-06-17 09:52:45 +02:00
arthur.jamet
7fcdd05de6 add fullscreen toggle 2021-06-16 21:18:45 +02:00
Clément Le Bihan
5a948bca46 fixing test compil undoing emmscripten stuff 2021-06-16 19:58:54 +02:00
Clément Le Bihan
bd309179e3 fixing emscrippten warning and fixing windows artefact name 2021-06-16 19:50:21 +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
a0499f5f73 untrash RAY CMakeLists.txt 2021-06-16 18:39:20 +02:00
Clément Le Bihan
7fdb5a051d mesh encapsulation done 2021-06-16 18:17:17 +02:00