Commit Graph
59 Commits
Author SHA1 Message Date
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
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
Menno ef466c9d95 Merge branch 'feature/timer' into develop 2021-06-01 11:41:43 +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
Menno 1ef0d87437 Merge remote-tracking branch 'origin/feature/adding_scenes' into feature/collision 2021-05-28 16:08:35 +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
Menno e8b3e1b482 [FEATURE] collisions!!!!!!!!!!! YAY 2021-05-28 15:45:46 +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
Sem van der Hoeven f1f1aac93d [ADD] comments 2021-05-25 15:54:02 +02:00
Menno 51cdc520e0 [EDIT] camera controls 2021-05-25 15:51:29 +02:00
Sem van der Hoeven 563f465e2c [EDIT] remove unused methods 2021-05-25 15:46:53 +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 ad4075a826 [EDIT] change window size to ints 2021-05-25 10:19:33 +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 ff79c1525c Merge branch 'feature/objectdetection' into develop 2021-05-21 15:25:29 +02:00
Nathalie Seen a7597c8d4f [ADD] comments to backgroundRemover 2021-05-21 15:24:06 +02:00
Sem van der Hoeven 5b4d9b624f Merge branch 'feature/objectdetection' into develop 2021-05-21 15:22:38 +02:00
Menno bd227d3afe Merge remote-tracking branch 'origin/feature/rendering-engine-expansion-comments' into feature/rendering-engine-expansion 2021-05-21 15:22:27 +02:00
Sem van der Hoeven 27aca98ea4 Merge branch 'feature/comments' into feature/objectdetection 2021-05-21 15:22:07 +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 ca591dd427 [ADD] comments to fingercount 2021-05-21 15:21:03 +02:00
Jasper 8720e50ba8 [ADD] added comments to the classes FaceDetector and ObjectDetection 2021-05-21 15:10:05 +02:00
Menno bb4fcbc97b [EDIT] comments on each function 2021-05-21 15:09:07 +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 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 01571d191f [FIXED] openCV included 2021-05-18 14:05:56 +02:00
Sem van der Hoeven ca0f7546bf [REMOVE] docs folders from tracking 2021-05-18 14:00:41 +02:00
Sem van der Hoeven 377311be60 [EDIT] add removal of docs folders to gitignore 2021-05-18 13:59:11 +02:00
Sem van der Hoeven 5075eb0dc2 [EDIT] add lines to gitignore 2021-05-18 13:56:20 +02:00
Sem van der Hoeven 45fd7d328b Merge branch 'feature/custom-rendering' into develop 2021-05-18 13:38:16 +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