Commit Graph

39 Commits

Author SHA1 Message Date
arthur.jamet
d17836685e fix memory errors realted to cache 2021-06-14 17:34:06 +02:00
Zoe Roux
10a73e07d1 Cleaning u 2021-06-14 16:07:24 +02:00
Zoe Roux
9b385349dc Trying things. 2021-06-14 16:00:41 +02:00
Zoe Roux
06a6eb2ed7 Merging with develop 2021-06-14 13:50:47 +02:00
Zoe Roux
60a5ad0ded Allowing the game to be started 2021-06-14 13:36:11 +02:00
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
72d66bc970 setting copy ctor of ModelAnimations.hpp to default 2021-06-03 09:13:58 +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
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
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
fd94bd41d3 fix typos and mispalced spaces 2021-06-01 11:41:09 +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
70d69b0621 player 2021-05-27 15:04:47 +02:00
arthur.jamet
7f1e8ab398 animation 2021-05-27 10:37:44 +02:00
arthur.jamet
6bc09f1ab4 move class variable member to correct visibility 2021-05-23 21:59:45 +02:00
arthur.jamet
77534276ef fix double definition of cast operator 2021-05-23 19:22:49 +02:00
arthur.jamet
1f7b19b345 add exception class 2021-05-23 17:43:34 +02:00
arthur.jamet
57ebac7813 include missing header 2021-05-22 14:28:06 +02:00
arthur.jamet
bfd2e621e1 change documentation 2021-05-22 14:23:27 +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