Commit Graph

16 Commits

Author SHA1 Message Date
SemvdH
ab7123b89a Merge branch 'develop' into mergebranch-Jasper 2021-06-11 10:27:30 +02:00
SemvdH
eaab85ac33 Merge branch 'develop' into feature/MovementCharacter 2021-06-11 10:14:12 +02:00
SemvdH
4e9e534c02 Merge branch 'develop' into feature/house-generation 2021-06-11 10:05:11 +02:00
Jasper
509f64f04d Merge branch 'feature/pause-menu' into feature/menu 2021-06-08 12:15:27 +02:00
Menno
cfd2d00d08 [ADDED] simple house generation 2021-06-04 14:32:16 +02:00
Sem van der Hoeven
4c49895f6d [MERGE] async compvision 2021-06-04 12:29:36 +02:00
Nathalie Seen
c25efec103 [ADD] load bee in scene 2021-06-04 10:01:13 +02:00
lars
2468d7fa7f [ADD] the pause menu can be accessed with the 'P' key. the real button are not implemented yet. 2021-06-01 15:18:07 +02:00
Jasper
7679555059 [ADD] added the menu buttons with correct textures to the scene 2021-06-01 15:10:23 +02:00
Menno
0c654a51b9 Merge branch 'feature/collision' into develop 2021-05-28 16:14:49 +02:00
Jasper
078a6ce66d [ADD] added all the files 2021-05-28 12:27:12 +02:00
Menno
21a7f4f4b2 [FEATURE] simple GUI support 2021-05-25 12:36:58 +02:00
Menno
e10aea5a15 [ADDED] smoke and some small changes 2021-05-21 14:12:30 +02:00
Sem van der Hoeven
1811bf51a4 [EDIT] added base for hand detection 2021-05-21 13:23:33 +02:00
Menno
5047467206 [ADD] 3d test model 2021-05-18 11:22:41 +02:00
Menno
0bb4cc5e1d [ADD] custom rendering system 2021-05-18 11:20:57 +02:00