Jasper
|
509f64f04d
|
Merge branch 'feature/pause-menu' into feature/menu
|
2021-06-08 12:15:27 +02:00 |
|
Jasper
|
1558ee298b
|
[ADD] added comments to startup_scene.h
|
2021-06-08 11:49:57 +02:00 |
|
Jasper
|
e7a9cda9dd
|
[ADD] added a on/off for hand detection in menu
you can switch between mouse and hand detection now
|
2021-06-08 11:14:07 +02:00 |
|
Jasper
|
c94f798a9d
|
[ADD] added comments and deleted cout's
|
2021-06-04 16:45:11 +02:00 |
|
Lars
|
4587559030
|
[COMMENTS] added some comments for all the scene files
the only thing i could not find was the on key method, the other params are empty(thus no comments)
|
2021-06-04 16:44:10 +02:00 |
|
Jasper
|
aa4860eb48
|
[FIX] only clicks ones when you close hand now
|
2021-06-04 16:41:16 +02:00 |
|
Jasper
|
b3412e414e
|
[ADD] menu now works
menu switches to next item when hand is closed and calls OnClick() when hand is closed
|
2021-06-04 16:32:26 +02:00 |
|
Jasper
|
7cc918fdf8
|
[MERGE] merged feature/improve-hand-detection into feature/Start-scene correctly
|
2021-06-04 10:51:53 +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
|
ef058b0087
|
[FIXED] merge
|
2021-05-28 16:12:51 +02:00 |
|
Lars
|
5d31327a47
|
[ADD] The scene switching works now, the only thing to do is controling the scenes with the keys!
|
2021-05-28 16:04:41 +02:00 |
|
Lars
|
93b3223737
|
[testing] shader ddoesnt work, still on it
|
2021-05-28 12:08:12 +02:00 |
|