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

1347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bluub 1f1414c16e static_cast and try find safe space 2021-06-19 13:41:48 +02:00
Clément Le Bihan 631b03c996 Merge pull request #223 from AnonymusRaccoon/menues 
Menus improvements
 2021-06-19 13:34:08 +02:00
Bluub 64b4ac3d71 more encapsulatino 2021-06-19 12:20:26 +02:00
Bluub ca6367e143 use encapsulation 2021-06-19 12:10:10 +02:00
Bluub 8eba1e88c5 start of find safe space 2021-06-19 12:01:19 +02:00
Clément Le Bihan 8dc7e2b560 fixing height issues 2021-06-19 11:56:04 +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
Askou d12b49c4ca map generate breakable again 2021-06-19 10:24:19 +02:00
Askou 520d717041 reduce holes hitbox but player can't pass trough them, he's too big right now 2021-06-19 10:22:25 +02:00
Bluub 96255c5c89 merge develop 2021-06-19 02:25:44 +02:00
Bluub d3e862b9ed rm useless file 2021-06-19 02:21:20 +02:00
Bluub 1b64d3ed38 john is running correctly 2021-06-19 02:21:10 +02:00
Clément Le Bihan 427c2eb824 Merge pull request #229 from AnonymusRaccoon/shader_no_clip 
Shader no clip
 2021-06-19 01:30:12 +02:00
Clément Le Bihan f54287db54 Merge branch 'shader_to_property' of github.com:AnonymusRaccoon/Bomberman into shader_no_clip 2021-06-19 01:13:06 +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
Clément Le Bihan 96fe7be3da adding a little fix on position parsing 2021-06-19 00:54:47 +02:00
Bluub 00f9931a8b adding getDangerLevel and getBlockType 2021-06-18 22:59:13 +02:00
HENRY Benjamin 1093e2d910 added some static function in lobbysystem (createtile) and fixed some old changes not necessary now 2021-06-18 22:44:34 +02:00
Zoe Roux a9d5f81de7 Fixing the background wall 2021-06-18 22:42:54 +02:00
HENRY Benjamin ae488a1623 Merge branch 'parser' of github.com:AnonymusRaccoon/Bomberman into parser 2021-06-18 22:39:50 +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 64d0244c54 Fixing background overlap 2021-06-18 22:19:33 +02:00
HENRY Benjamin 11720b8d10 now there's a background during the intro 2021-06-18 21:52:34 +02:00
Bluub 341e9cd302 running on top when near a bomb 2021-06-18 21:34:54 +02:00
Zoe Roux ffae0f52cf Fixing windows compilation 2021-06-18 20:54:06 +02:00
Zoe Roux e7cbb3e5fd Merging with develop 2021-06-18 20:40:16 +02:00
Clément Le Bihan 41e1becdeb fixing small issues 2021-06-18 20:08:34 +02:00
Zoe Roux 254640d710 Making the background follow the game 2021-06-18 19:53:11 +02:00
Askou 5d068b118e I have no clue why, bound is 0.75, 2, 0.75 when I set it a 0 0.75 0 2021-06-18 19:51:56 +02:00
Bluub 5565a15ab3 adding register for getPlayer and getPlayerRound 2021-06-18 18:51:04 +02:00
Bluub 278cb9204f add set player 2021-06-18 18:36:02 +02:00
Bluub 638be2f3a8 cleanup on some files 2021-06-18 18:27:38 +02:00
Clément Le Bihan cafe6bbd89 fixing CMakeLists.txt 2021-06-18 18:25:00 +02:00
Zoe Roux a55b1543c9 Adding a restart timer when resuming the game 2021-06-18 17:56:34 +02:00
Bluub 9850e7ae0c pathfinding working 2021-06-18 17:54:46 +02:00
Clément Le Bihan 4669ff9280 fixing splitStr and position parsing 2021-06-18 17:54:20 +02:00
Clément Le Bihan 3218da652b fixing warnings 2021-06-18 17:39:41 +02:00
Clément Le Bihan 09d73c7988 parser errors are updated and now loading failed return to main menu 2021-06-18 17:30:32 +02:00
Clément Le Bihan a359ede5d6 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser 2021-06-18 17:08:46 +02:00
Zoe Roux 6015b62664 Merging with develop 2021-06-18 17:07:17 +02:00
Clément Le Bihan ec01fdf5d1 Merge pull request #227 from AnonymusRaccoon/lobby_controls 
Add Controls to Lobby Scene
 2021-06-18 16:58:27 +02:00
Bluub f52f8378ae compile a star 2021-06-18 16:54:16 +02:00
HENRY Benjamin 4c9b8958ba fixed timer ig 2021-06-18 16:40:04 +02:00
HENRY Benjamin 19ad954c46 fixed loadedscene 2021-06-18 16:37:19 +02:00
HENRY Benjamin 7164a8b22c fixed one crash 2021-06-18 16:33:40 +02:00
Clément Le Bihan afc1fda08e resetting correct noclip spawn rate 2021-06-18 16:28:30 +02:00
HENRY Benjamin 3c0d933b83 fixed some warning + one test 2021-06-18 16:25:38 +02:00
Clément Le Bihan cdba078231 first correct no clip version 2021-06-18 16:25:20 +02:00
HENRY Benjamin 74f85373ac added some ui in resumelobbyscene 2021-06-18 16:12:01 +02:00
Zoe Roux 9986166ccc Fixing fast click on the pause menu 2021-06-18 16:10:11 +02:00