Commit Graph

29 Commits

Author SHA1 Message Date
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
Menno
dd6ee77316 [ADD] added all the models to the project 2021-06-08 15:53:51 +02:00
Nathalie Seen
551d53a3dc [ADD] made collision work 2021-06-08 15:25:24 +02:00
Menno
b092bd5f0a [ADD] furniture 2021-06-08 14:24:12 +02:00
Menno
625965ed1b [ADDED] rotating bounding boxes 2021-06-08 12:22:54 +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
Menno
aa9c6a0fbb [ADDED] comments 2021-06-04 15:54:23 +02:00
Menno
8c50792657 [FEATURE] simple house generator 2021-06-04 15:49:56 +02:00
Nathalie Seen
86383aace5 [ADD] camera follows the only at the z position 2021-06-04 14:44:41 +02:00
Menno
cfd2d00d08 [ADDED] simple house generation 2021-06-04 14:32:16 +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
Menno
ef058b0087 [FIXED] merge 2021-05-28 16:12:51 +02:00
Menno
1ef0d87437 Merge remote-tracking branch 'origin/feature/adding_scenes' into feature/collision 2021-05-28 16:08:35 +02:00
Menno
e8b3e1b482 [FEATURE] collisions!!!!!!!!!!! YAY 2021-05-28 15:45:46 +02:00
Lars
93b3223737 [testing] shader ddoesnt work, still on it 2021-05-28 12:08:12 +02:00
Menno
28400fb320 [ADDED] simple collision logic for entities 2021-05-28 11:37:21 +02:00
Menno
51cdc520e0 [EDIT] camera controls 2021-05-25 15:51:29 +02:00
Menno
97a7501cda [FEATURE] multiple light support 2021-05-21 16:25:39 +02:00
Menno
bb4fcbc97b [EDIT] comments on each function 2021-05-21 15:09:07 +02:00
Menno
e10aea5a15 [ADDED] smoke and some small changes 2021-05-21 14:12:30 +02:00
Menno
e2f6bd720d [EDIT] renaming the static_shader 2021-05-21 08:43:32 +02:00
Menno
9e9d50da9e [FEATURE] single light support 2021-05-21 08:36:04 +02:00
Menno
438b219d0a [EDIT] code style guide finished 2021-05-18 12:43:22 +02:00
Menno
0bb4cc5e1d [ADD] custom rendering system 2021-05-18 11:20:57 +02:00