164 Commits

Author SHA1 Message Date
arthur.jamet e4209c3ca2 fix merge + convert audio ressources + add sounds/music to scenes 2021-06-09 15:21:00 +02:00
Zoe Roux c544a83ee8 Merging with develop 2021-06-09 14:52:18 +02:00
Zoe Roux 6218a4243f Merge pull request #131 from AnonymusRaccoon/cache
Cache System - Lonely
2021-06-09 14:37:11 +02:00
arthur.jamet 0174d121f1 cache system test 2021-06-09 12:25:21 +02:00
arthur.jamet 70524fa935 cache system add lonely functionnality 2021-06-09 11:14:53 +02:00
Tom AUGIER 07f61fb462 Merge branch 'develop' into music_component 2021-06-08 20:08:38 +02:00
arthur.jamet 783704d11e fix sound asset 2021-06-08 19:17:12 +02:00
Clément Le Bihan 44afd5cd44 adding joystick support for gamepad controller 2021-06-08 18:27:12 +02:00
arthur.jamet 29690b3744 fix button for pause menu opening 2021-06-08 16:21:03 +02:00
EternalRat 4af99e75e5 bonus working, just miss 3 bonuses (cause bombholder isn't finish yet) 2021-06-08 16:14:37 +02:00
arthur.jamet 1e5d97f831 settings: minux/plus inverted 2021-06-08 16:00:30 +02:00
Clément Le Bihan 7bff82a5c9 shaders are working for models 2021-06-08 15:52:12 +02:00
Askou 6c7d8fcfcf add updateMusicStream + musicSystem 2021-06-08 14:52:03 +02:00
arthur.jamet 5fff4dce9f skelton of pause menu 2021-06-08 14:30:57 +02:00
Clément Le Bihan 4ee45c9c28 putting shaders changes on a new branch to avoid merge nightmare 2021-06-08 12:41:32 +02:00
arthur.jamet 8691b7cdfb disable debug on startup 2021-06-08 12:15:33 +02:00
TrueBabyChaise 57fd7fbbfa merge develop in music_component 2021-06-08 09:48:35 +02:00
arthur.jamet 5bba1f68e8 now use texture instead of images 2021-06-07 15:18:28 +02:00
arthur.jamet 9218ebe4dc when window context is loaded, audio device is initialized 2021-06-07 12:37:30 +02:00
arthur.jamet ea69116255 main menu button hover callback 2021-06-07 12:14:53 +02:00
arthur.jamet c18305d027 add cache system for audio material 2021-06-07 11:17:06 +02:00
arthur.jamet e094a7d5d9 compoenent for title screen 2021-06-07 11:03:47 +02:00
HENRY Benjamin 6de8505cfd levitatecomponent on bonus + system + fix something in model (raylib) 2021-06-07 10:21:51 +02:00
arthur.jamet d7a65c7d45 pull from develop + fix merge + add optimization flag 2021-06-04 15:06:01 +02:00
Arthi-chaud 666f1dbf2b Merge branch 'develop' into wasm 2021-06-03 11:43:47 +02:00
Clément Le Bihan 72d66bc970 setting copy ctor of ModelAnimations.hpp to default 2021-06-03 09:13:58 +02:00
arthur.jamet f357eccd09 merging from develpo 2021-06-02 19:39:29 +02:00
Clément Le Bihan d29b0dc4ed pain 2021-06-02 18:44:31 +02:00
Clément Le Bihan 066e77c47b hope you're HaPpY 2021-06-02 18:42:21 +02:00
Clément Le Bihan 3790b2a8cd first pr fixes from reviews 2021-06-02 18:14:44 +02:00
arthur.jamet 34cbe24c19 remove unwanted defines + upade encapsulation for window drawing function 2021-06-02 17:54:16 +02:00
arthur.jamet f3d9effb83 fix double free for model animation unloading 2021-06-02 16:47:05 +02:00
Clément Le Bihan f245fe727b Animation is working segfault on unload 2021-06-02 15:58:37 +02:00
Clément Le Bihan 45a566f197 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into animations 2021-06-02 15:09:52 +02:00
Clément Le Bihan d986a24c47 animation component should theoretically work 2021-06-02 15:08:46 +02:00
arthur.jamet ef0c323d94 addition + correct drawing modes 2021-06-02 14:33:52 +02:00
Clément Le Bihan 1cb90f9ac3 Merge pull request #97 from AnonymusRaccoon/map_generator
Map generator
2021-06-01 20:53:39 +02:00
arthur.jamet ab449ee882 generic cache system 2021-06-01 17:24:32 +02:00
Askou 402b5386c5 Better perfomance and loading with map, in model.hpp place scale as third argument 2021-06-01 17:01:50 +02:00
arthur.jamet 382b830b27 generic cache system 2021-06-01 17:00:00 +02:00
arthur.jamet 812a4da727 cache system for textures 2021-06-01 14:44:04 +02:00
Arthi-chaud da7d103cb9 Merge pull request #86 from AnonymusRaccoon/renderer
model now use shared ptr + cache system to spare memory
2021-06-01 14:09:53 +02:00
arthur.jamet fabc51ca2f fix ressources path of image 2021-06-01 14:07:34 +02:00
arthur.jamet 573ab3fd92 add fps limit on window at construction 2021-06-01 13:40:43 +02:00
arthur.jamet fd94bd41d3 fix typos and mispalced spaces 2021-06-01 11:41:09 +02:00
arthur.jamet 8b5208ddbf rename cache variable for images 2021-06-01 11:26:54 +02:00
arthur.jamet 41c42da5b7 sprites can be resized, independently from one another 2021-06-01 08:52:03 +02:00
arthur.jamet a66e87ab48 avoid using auto variables for windows compilation (rectangle) 2021-05-31 22:08:35 +02:00
arthur.jamet c9794975f3 avoid using auto variables for windows compilation 2021-05-31 22:04:14 +02:00
arthur.jamet 39deddcc91 image have been enhance, so it can now be drawn on a window 2021-05-31 21:59:54 +02:00