Commit Graph

20 Commits

Author SHA1 Message Date
Clément Le Bihan
f1f81cc3f8 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into bonus
# Conflicts:
#	CMakeLists.txt
#	sources/Map/Map.cpp
2021-06-10 12:29:58 +02:00
Clément Le Bihan
87303195c5 fixing indentation 2021-06-10 10:56:49 +02:00
arthur.jamet
0ad827c37b player models are now independant 2021-06-10 09:58:52 +02:00
HENRY Benjamin
19b91d58a5 need to fix collisionsystem 2021-06-09 16:13:23 +02:00
Zoe Roux
c544a83ee8 Merging with develop 2021-06-09 14:52:18 +02:00
arthur.jamet
70524fa935 cache system add lonely functionnality 2021-06-09 11:14:53 +02:00
Clément Le Bihan
7bff82a5c9 shaders are working for models 2021-06-08 15:52:12 +02:00
HENRY Benjamin
6de8505cfd levitatecomponent on bonus + system + fix something in model (raylib) 2021-06-07 10:21:51 +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
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
c9794975f3 avoid using auto variables for windows compilation 2021-05-31 22:04:14 +02:00
arthur.jamet
f8ca87cd9d model now use shared ptr + cache system to spare memmory 2021-05-31 18:22:24 +02:00
arthur.jamet
b92b35f191 ressources are not reloadable, ressource interface deleted 2021-05-28 12:41:21 +02:00
Zoe Roux
b88172b667 Adding a player 2021-05-27 23:02:39 +02:00
Bluub
16ea3e3d80 fix compilation, model is a 3D drawable 2021-05-27 16:27:48 +02:00
arthur.jamet
4c659439e3 model is now a 3D drawable 2021-05-27 17:39:03 +02:00
arthur.jamet
1f7b19b345 add exception class 2021-05-23 17:43:34 +02:00
arthur.jamet
4da077f796 model: add unload method 2021-05-22 14:20:02 +02:00
arthur.jamet
66c33b403c creation of animation containers 2021-05-22 11:55:44 +02:00