 SemvdH
|
17d2bd7382
|
Merge branch 'develop' into feature/handControl
|
2021-06-18 15:28:30 +02:00 |
|
|
Sem van der Hoeven
|
1d940fe1db
|
[MERGE] develop into this
|
2021-06-18 15:25:15 +02:00 |
|
|
SemvdH
|
ec14dd1093
|
Merge branch 'develop' into feature/game_logic/game_over
|
2021-06-18 15:17:43 +02:00 |
|
|
Sem van der Hoeven
|
ce0a1f3da7
|
[EDIT] files accordingly to style guide
|
2021-06-18 10:31:00 +02:00 |
|
|
DESKTOP-EBR7IVA\kimve
|
e51b56b156
|
[WIP] Collision detectie moet nog worden egimplementeerd om naar game over screen te gaan
|
2021-06-11 16:49:09 +02:00 |
|
|
DESKTOP-EBR7IVA\kimve
|
a65f3391f7
|
[Add] Pointsystem works
|
2021-06-11 15:32:06 +02:00 |
|
|
Nathalie Seen
|
3517d2b36a
|
[ADD] made movement based on hand position
|
2021-06-11 14:46:24 +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 |
|
|
Sem van der Hoeven
|
a8996f63ef
|
[ADD] start game scene fingers
|
2021-06-08 16:06:46 +02:00 |
|
|
Menno
|
b092bd5f0a
|
[ADD] furniture
|
2021-06-08 14:24:12 +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 |
|
|
Sem van der Hoeven
|
e70d2ef19d
|
[EDIT] removed unused hand stuff
|
2021-06-04 16:32:30 +02:00 |
|
|
Sem van der Hoeven
|
1ab5ae798e
|
[ADD] hand calibration screen
|
2021-06-04 16:27:30 +02:00 |
|
|
Menno
|
cfd2d00d08
|
[ADDED] simple house generation
|
2021-06-04 14:32:16 +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 |
|
|
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 |
|
|
Sem van der Hoeven
|
cc7cb37840
|
[ADD] caffemodel project entry
|
2021-06-02 09:44:30 +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
|
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 |
|
|
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 |
|
|
Sem van der Hoeven
|
40529f84b3
|
[ADD] basis for async arm detection
|
2021-05-28 15:31:21 +02:00 |
|
|
Jasper
|
a68c6a57bf
|
[EDIT] edited file
|
2021-05-28 12:32:10 +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
|
cc7fae5d2f
|
[ADD] comments
|
2021-05-25 14:55:27 +02:00 |
|
|
Menno
|
977d377fe5
|
[FEATURE] working gui buttons
|
2021-05-25 14:38:35 +02:00 |
|
|
Menno
|
21a7f4f4b2
|
[FEATURE] simple GUI support
|
2021-05-25 12:36:58 +02:00 |
|
|
Sem van der Hoeven
|
1811bf51a4
|
[EDIT] added base for hand detection
|
2021-05-21 13:23:33 +02:00 |
|
|
Jasper
|
27a09aeca4
|
[EDIT] added evrything to namespace, also fixed includes
|
2021-05-21 12:12:42 +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
|
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
|
0517f9e897
|
[EDIT] code style guide - toolbox & main
|
2021-05-18 11:31:25 +02:00 |
|
|
Menno
|
0bb4cc5e1d
|
[ADD] custom rendering system
|
2021-05-18 11:20:57 +02:00 |
|
|
Sem van der Hoeven
|
8f13fe4d90
|
[EDIT] edit lib files
|
2021-05-18 10:44:08 +02:00 |
|
|
Sem van der Hoeven
|
2f1a8e77e8
|
[ADD] template project with correct name
|
2021-05-18 10:33:08 +02:00 |
|