SemvdH
|
3a42966e92
|
Merge branch 'develop' into feature/loading_all_models
|
2021-06-18 15:33:06 +02:00 |
|
Jasper
|
ad2d651d41
|
[FIX] fixed the loading scene, everything runs correctly now
|
2021-06-18 14:53:16 +02:00 |
|
Sem van der Hoeven
|
ce0a1f3da7
|
[EDIT] files accordingly to style guide
|
2021-06-18 10:31:00 +02:00 |
|
Jasper
|
bce2ccf889
|
[ADD] added base for loading scene
|
2021-06-11 11:43:46 +02:00 |
|
Sem van der Hoeven
|
504b97b320
|
[FIX] pointer
|
2021-06-11 11:13:49 +02:00 |
|
Sem van der Hoeven
|
ae9386a811
|
[FIX] in game scene
|
2021-06-11 10:58:21 +02:00 |
|
SemvdH
|
ab7123b89a
|
Merge branch 'develop' into mergebranch-Jasper
|
2021-06-11 10:27:30 +02:00 |
|
Sem van der Hoeven
|
a8996f63ef
|
[ADD] start game scene fingers
|
2021-06-08 16:06:46 +02:00 |
|
Sem van der Hoeven
|
cadee7d8e9
|
[ADD] hand detection type enum
|
2021-06-08 13:38:47 +02:00 |
|
Sem van der Hoeven
|
1e55736615
|
[ADD] multiple hand detection squares
|
2021-06-08 13:17:07 +02:00 |
|
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 |
|
Sem van der Hoeven
|
1ab5ae798e
|
[ADD] hand calibration screen
|
2021-06-04 16:27:30 +02:00 |
|
Sem van der Hoeven
|
ca2959bf2d
|
[FIX] detecting hand when its just a finger or hair
|
2021-06-04 14:48:19 +02:00 |
|
Sem van der Hoeven
|
f5926fffcb
|
[ADD] detecting if hand is in square
|
2021-06-04 13:09:51 +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 |
|
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 |
|