Commit Graph

1041 Commits

Author SHA1 Message Date
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 eef7c1ae25 remove return (SPEED UP) in bonus 2021-06-17 14:47:23 +02:00
Askou ffda04b785 Merge branch 'update_texture' of github.com:AnonymusRaccoon/Bomberman into update_texture 2021-06-17 14:45:26 +02:00
Askou 55711dd343 change floor 2021-06-17 14:45:08 +02:00
Zoe Roux 17159fbc65 Merge pull request #190 from AnonymusRaccoon/fixs
Fixing bonus infinite takes.
2021-06-17 14:44:31 +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
Zoe Roux 741633b0fd Merging with develops 2021-06-17 14:38:49 +02:00
Zoe Roux a02381b23c Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into fixs 2021-06-17 14:38:33 +02:00
Zoe Roux e9c3f8e083 Fixing bonus collisions 2021-06-17 14:37:34 +02:00
arthur.jamet 63a77a61b4 fix fullscreen resolution 2021-06-17 14:37:16 +02:00
Clément Le Bihan fec3f22e97 Merge pull request #189 from AnonymusRaccoon/fixs
Bombs fix
2021-06-17 14:33:06 +02:00
Clément Le Bihan 77655268f1 Merge pull request #173 from AnonymusRaccoon/ai_script
Ai script
2021-06-17 14:03:22 +02:00
Askou 55b19d8bac Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into update_texture 2021-06-17 14:01:47 +02:00
Zoe Roux fcb1c91044 Fixing multiple bombs at the same pos 2021-06-17 14:00:30 +02:00
Clément Le Bihan ff172e9b47 fixing ci ? 2021-06-17 13:55:20 +02:00
Bluub 80013ddb41 merge develop 2021-06-17 12:47:14 +02:00
Zoe Roux 4f782e9d75 Spawning a bomb inside a player dont block him anymore 2021-06-17 12:37:40 +02:00
Bluub ee951f8ca5 starting aggressive pathing 2021-06-17 12:33:27 +02:00
arthur.jamet f0b6b59428 fix tile position ingame 2021-06-17 12:25:35 +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 1992f54a74 fire up ui: now displayed in int 2021-06-17 12:14:06 +02:00
Askou 43a5f8e1a8 Change background and floor 2021-06-17 12:11:57 +02:00
arthur.jamet 57f895b563 remve ascii escape 2021-06-17 12:07:07 +02:00
arthur.jamet 9c1f0b1bcd window in 720 2021-06-17 12:03:39 +02:00
Askou fd7c1c8241 Merge remote-tracking branch 'origin/background' into update_texture 2021-06-17 12:03:20 +02:00
Bluub 3da5ae9961 remoe lua.hpp 2021-06-17 11:52:18 +02:00
Clément Le Bihan 93e8c579e8 Merge pull request #187
Player pos fix with height
2021-06-17 11:45:16 +02:00
arthur.jamet e3b6b87b11 menu controllable: when the mouse doesn't move: the keyboard event overlaod mouse's 2021-06-17 11:39:55 +02:00
Bluub 71a0b9cd34 less log 2021-06-17 11:33:52 +02:00
Zoe Roux 8d84228cfd Adding a background map 2021-06-17 11:32:20 +02:00
Clément Le Bihan a1ad9a57ac Merge pull request #183 from AnonymusRaccoon/sound_fix
Fix Sound On Click
2021-06-17 11:22:10 +02:00
Askou e16e726881 remove useless file 2021-06-17 11:21:58 +02:00
Arthi-chaud 113536b86b Merge pull request #180 from AnonymusRaccoon/win_size
Managable Window Size
2021-06-17 11:21:15 +02:00
Bluub b9dbfebdc3 john is running even better 2021-06-17 11:21:11 +02:00
Askou 6f9609a2f2 fix player heigth 2021-06-17 11:18:42 +02:00
arthur.jamet 1f1379a5a5 when a resource is not found, an exceptions is thrown 2021-06-17 11:17:18 +02:00
Bluub 9bf73f37a0 john is running 2021-06-17 10:53:02 +02:00
Clément Le Bihan 9e1ebedf02 Merge pull request #184 from AnonymusRaccoon/readme
Readme in Doxygen Documentation
2021-06-17 10:07:55 +02:00
arthur.jamet bbce773c98 add readme in main page 2021-06-17 10:00:43 +02:00
arthur.jamet a8f5cb85a5 fix sound on click 2021-06-17 09:47:36 +02:00
Bluub cb3c29369a john is running but need to fix ai not perfect precision 2021-06-17 02:45:19 +02:00
arthur.jamet 7fcdd05de6 add fullscreen toggle 2021-06-16 21:18:45 +02:00
arthur.jamet cf842903be add fullscreen button to settings 2021-06-16 20:59:16 +02:00
arthur.jamet 84dfc16be1 mouse event scale to new window size 2021-06-16 20:41:56 +02:00
arthur.jamet bd758d858c win size adaptative 2021-06-16 20:25:21 +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
Clément Le Bihan bbc84b06b6 updating windows artefact path 2021-06-16 19:41:08 +02:00
Clément Le Bihan e91b466b1e adding artefact uploads 2021-06-16 19:33:47 +02:00