SemvdH
eaab85ac33
Merge branch 'develop' into feature/MovementCharacter
2021-06-11 10:14:12 +02:00
Nathalie Seen
770b54bdd5
[ADD] character falls when it hits a tree
2021-06-11 09:59:35 +02:00
Nathalie Seen
551d53a3dc
[ADD] made collision work
2021-06-08 15:25:24 +02:00
Nathalie Seen
ae93ed6b34
[FIX] renamed uses of main_character to MainCharacter in in_Game_secene
2021-06-08 11:59:58 +02:00
Nathalie Seen
69d88ab1c1
[ADD] comments to camera and toolbox
2021-06-08 11:39:47 +02:00
Kim
a4d5658a06
[ADD] Commented main_character h and cpp files
2021-06-08 11:37:56 +02:00
Nathalie Seen
edbbfb136a
[ADD] made camera follow the character with lerp
2021-06-08 10:55:48 +02:00
Nathalie Seen
86383aace5
[ADD] camera follows the only at the z position
2021-06-04 14:44:41 +02:00
Nathalie Seen
2523e1abfa
Merge branch 'feature/automatic-rendering' into feature/MovementCharacter
...
* feature/automatic-rendering:
[ADD] deque method
[EDIT] caffemodel in gitignore
[EDIT] small fix
[ADD] (test) trees at every chunk
[ADD] comments
[ADD] added deque support for light loading
[ADD] automatic loading of models
[ADDED] timer class
# Conflicts:
# src/scenes/in_Game_Scene.cpp
# wk2_fps.vcxproj.filters
2021-06-04 12:57:51 +02:00
Nathalie Seen
bc5703eb65
[FIX] made bee move
2021-06-04 12:52:24 +02:00
Nathalie Seen
c25efec103
[ADD] load bee in scene
2021-06-04 10:01:13 +02:00
