1347 Commits

Author SHA1 Message Date
HENRY Benjamin a5b794b1d1 added ia to parser 2021-06-20 10:34:55 +02:00
Askou d18e125127 fix berserk camera 2021-06-20 10:27:08 +02:00
Clément Le Bihan 146eb2f833 Merge pull request #249 from AnonymusRaccoon/develop
Merging Develop
2021-06-20 10:01:53 +02:00
Clément Le Bihan 1249820386 Merge pull request #246 from AnonymusRaccoon/anim_tricks
it's better (animations optis)
2021-06-20 09:54:08 +02:00
Clément Le Bihan 614b5af580 it's better 2021-06-19 23:30:07 +02:00
Clément Le Bihan 13af8732bc Merge pull request #234 from AnonymusRaccoon/ai_script
Ai script
2021-06-19 20:22:54 +02:00
Clément Le Bihan e68b1359d8 fixing unused warning 2021-06-19 20:15:32 +02:00
Bluub 6342c6bce7 remove debug log and better hash operator 2021-06-19 20:08:56 +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 4e36829d61 Merge pull request #244 from AnonymusRaccoon/readme
Add Screenshot & Demo Link to Readme
2021-06-19 19:00:21 +02:00
Arthi-chaud 58a550eb82 reamde: use relative paths 2021-06-19 18:58:45 +02:00
Bluub 35adf49c66 add collisions back 2021-06-19 18:51:26 +02:00
Bluub 121729d875 john is moving and putting bombs 2021-06-19 18:49:39 +02:00
arthur.jamet a55364dfea move images to assets 2021-06-19 18:49:07 +02:00
Arthi-chaud 4debdbb3f5 Update README.md 2021-06-19 18:47:03 +02:00
Bluub 7b060c8781 can put bomb working 2021-06-19 18:07:26 +02:00
Zoe Roux 327ca1665f Merge pull request #243 from AnonymusRaccoon/ingame_tile
Player Tiles In-Game are Transparant
2021-06-19 18:02:26 +02:00
Arthi-chaud f804d1f381 Update README.md 2021-06-19 18:01:31 +02:00
arthur.jamet f677d11754 add images for readme 2021-06-19 17:54:09 +02:00
arthur.jamet b4897e4b0e ui tile in game are transluscent 2021-06-19 17:42:22 +02:00
Tom AUGIER 2c83021579 Merge pull request #242 from AnonymusRaccoon/fix_collision
Fix collision
2021-06-19 17:13:49 +02:00
Askou 75b3dc8e3a Fix collision 2021-06-19 16:59:14 +02:00
Clément Le Bihan 28553cb6dd Merge pull request #230 from AnonymusRaccoon/parser
Parser
2021-06-19 16:29:45 +02:00
Clément Le Bihan 9ae112a2a5 fixing pr comment issue 2021-06-19 16:19:35 +02:00
Bluub 28916bde0a reset map before update, not optimale but ok for now 2021-06-19 16:17:02 +02:00
Clément Le Bihan 18aa8c2435 Merge pull request #241 from AnonymusRaccoon/fixes
Fixes
2021-06-19 16:10:30 +02:00
Clément Le Bihan 2f76dc359b sixing indent 2021-06-19 16:03:06 +02:00
Bluub 4d4c8df243 Merge branch 'fixes' of github.com:AnonymusRaccoon/Bomberman into ai_script 2021-06-19 16:01:52 +02:00
Clément Le Bihan a0b7141f88 fxing waird apparently cam related error 2021-06-19 16:01:45 +02:00
Zoe Roux d8da52af55 Fixing more than two players scores 2021-06-19 15:54:25 +02:00
Clément Le Bihan 785e38c507 timer support but there's a bug when saving & loading consecutively (without restart) 2021-06-19 15:38:22 +02:00
Clément Le Bihan 5c3c3555c9 dding a timer delay but linak issue 2021-06-19 15:26:59 +02:00
Zoe Roux 4bc5b54a2e Fixing gamepad controls 2021-06-19 15:25:20 +02:00
Bluub 8a07cce006 Merge branch 'ai_script' of github.com:AnonymusRaccoon/Bomberman into ai_script 2021-06-19 15:10:32 +02:00
Zoe Roux 46612e30a5 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into ai_script 2021-06-19 15:10:12 +02:00
Bluub 2184425336 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into ai_script 2021-06-19 15:07:03 +02:00
Bluub c60e8ee013 find safe space working 2021-06-19 14:56:49 +02:00
Clément Le Bihan 462628b90e fixing throw 2021-06-19 14:48:59 +02:00
Zoe Roux a9bf6d3192 Merge pull request #238 from AnonymusRaccoon/raylib
Raylib
2021-06-19 14:39:53 +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 2d2055a86b Merge pull request #224 from AnonymusRaccoon/no_clip_fixes
No clip fixes
2021-06-19 14:00:13 +02:00
Zoe Roux 309f2e5e70 Reducing the size of the player 2021-06-19 13:52:14 +02:00
Zoe Roux 72f0e0f6e9 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into no_clip_fixes 2021-06-19 13:50:51 +02:00
Zoe Roux c997fbd12e Merge pull request #220 from AnonymusRaccoon/background_parallax
Background parallax
2021-06-19 13:50:39 +02:00
Zoe Roux cb680b89da Merging with develop 2021-06-19 13:50:27 +02:00
Bluub 0d49984fae const auto instead of decltype 2021-06-19 13:48:55 +02:00
Bluub 638c134529 reinterpet instead of static 2021-06-19 13:47:46 +02:00
Zoe Roux 9b0c39f12a Merging with develop 2021-06-19 13:43:37 +02:00