Menno
|
c0a099a05e
|
[FIXED] collisions
|
2021-06-18 12:32:45 +02:00 |
|
DESKTOP-EBR7IVA\kimve
|
022c7eb1f0
|
[WIP] collision fixing
|
2021-06-18 11:20:24 +02:00 |
|
DESKTOP-EBR7IVA\kimve
|
ca61dfc781
|
[WIP] from start menu, if you press space, you get to gameover screen. Just to check. This works
|
2021-06-11 16:58:01 +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 |
|
SemvdH
|
4e9e534c02
|
Merge branch 'develop' into feature/house-generation
|
2021-06-11 10:05:11 +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 |
|
Jasper
|
509f64f04d
|
Merge branch 'feature/pause-menu' into feature/menu
|
2021-06-08 12:15:27 +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
|
f5926fffcb
|
[ADD] detecting if hand is in square
|
2021-06-04 13:09:51 +02:00 |
|
Sem van der Hoeven
|
4c49895f6d
|
[MERGE] async compvision
|
2021-06-04 12:29:36 +02:00 |
|
Sem van der Hoeven
|
921609de5d
|
[EDIT] stuff
|
2021-06-04 11:39:23 +02:00 |
|
Sem van der Hoeven
|
fe94b0f83d
|
[FIX] showing of pose detection points
|
2021-06-04 10:55:53 +02:00 |
|
Jasper
|
7cc918fdf8
|
[MERGE] merged feature/improve-hand-detection into feature/Start-scene correctly
|
2021-06-04 10:51:53 +02:00 |
|
Jasper
|
f76c0fcf1b
|
Merge remote-tracking branch 'origin/feature/improve-hand-detection' into feature/menu
|
2021-06-04 10:03:08 +02:00 |
|
Sem van der Hoeven
|
1a149b8b7e
|
[ADD] static camera instance
|
2021-06-02 10:05:09 +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 |
|
Kim
|
27e99dd2eb
|
[ADD] Looping through array depending on open or closed hand
|
2021-06-01 14:37:57 +02:00 |
|
Menno
|
f03cc485cd
|
[ADDED] timer class
|
2021-06-01 11:41:21 +02:00 |
|
Menno
|
739b4a9eb6
|
[FIXED] merge
|
2021-05-28 16:17:15 +02:00 |
|
Menno
|
0c654a51b9
|
Merge branch 'feature/collision' into develop
|
2021-05-28 16:14:49 +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 |
|
Sem van der Hoeven
|
40529f84b3
|
[ADD] basis for async arm detection
|
2021-05-28 15:31:21 +02:00 |
|
Jasper
|
078a6ce66d
|
[ADD] added all the files
|
2021-05-28 12:27:12 +02:00 |
|
Lars
|
93b3223737
|
[testing] shader ddoesnt work, still on it
|
2021-05-28 12:08:12 +02:00 |
|
Menno
|
51cdc520e0
|
[EDIT] camera controls
|
2021-05-25 15:51:29 +02:00 |
|
Menno
|
cc7fae5d2f
|
[ADD] comments
|
2021-05-25 14:55:27 +02:00 |
|
Sem van der Hoeven
|
05ae8ee019
|
[FEATURE] finished hand open/closed recognition
|
2021-05-25 14:49:04 +02:00 |
|
Menno
|
977d377fe5
|
[FEATURE] working gui buttons
|
2021-05-25 14:38:35 +02:00 |
|
Sem van der Hoeven
|
3696e2eb30
|
[EDIT] improve hand detection with mask
|
2021-05-25 14:19:18 +02:00 |
|
Sem van der Hoeven
|
276aa1a449
|
[ADD] mask methods
|
2021-05-25 13:31:25 +02:00 |
|
Menno
|
21a7f4f4b2
|
[FEATURE] simple GUI support
|
2021-05-25 12:36:58 +02:00 |
|
Sem van der Hoeven
|
e50cd92a35
|
[ADD] some headers
|
2021-05-25 10:16:58 +02:00 |
|
Menno
|
97a7501cda
|
[FEATURE] multiple light support
|
2021-05-21 16:25:39 +02:00 |
|
Sem van der Hoeven
|
5b4d9b624f
|
Merge branch 'feature/objectdetection' into develop
|
2021-05-21 15:22:38 +02:00 |
|
Lars
|
e2464ec8fd
|
[comment] commented some temporary code in the main and commented a new method that gets the size of a model.
|
2021-05-21 15:21:27 +02:00 |
|
Sem van der Hoeven
|
acf24cab36
|
[ADD] comments to skindetector
|
2021-05-21 14:56:45 +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 |
|
Jasper
|
e39cb1a761
|
[ADD] added handy files
|
2021-05-21 11:52:47 +02:00 |
|
Sem van der Hoeven
|
ab3b0c296a
|
[ADD] start for object detection
|
2021-05-21 11:19:17 +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
|
01571d191f
|
[FIXED] openCV included
|
2021-05-18 14:05:56 +02:00 |
|
Menno
|
438b219d0a
|
[EDIT] code style guide finished
|
2021-05-18 12:43:22 +02:00 |
|
Menno
|
41e02b0c39
|
[EDIT] code style guide - renderengine
|
2021-05-18 12:03:15 +02:00 |
|
Menno
|
41d0667390
|
[EDIT] code style guide - shaders
|
2021-05-18 11:46:19 +02:00 |
|
Menno
|
0517f9e897
|
[EDIT] code style guide - toolbox & main
|
2021-05-18 11:31:25 +02:00 |
|