Commit Graph

Select branches

Hide Pull Requests

BUGGED/pose-detection

develop

feature/Start-scene

feature/adding_scenes

feature/async-computervision

feature/auto-calibration

feature/automatic-rendering

feature/calibration

feature/collision

feature/comments

feature/computervision

feature/custom-rendering

feature/game_logic/collisionFix

feature/game_logic/point_system

feature/house_empty

feature/improve-hand-detection

feature/menu

feature/number-from-images

feature/objectdetection

feature/pause-menu

feature/pose-detection-fix

feature/random_levels

feature/rendering-engine-expansion

feature/scenes

feature/timer

main

temp-end

#1

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 81dec3b9f4 [ADD] detecting if hand is in square Sem van der Hoeven 2021-06-04 13:10:11 +02:00
• f5926fffcb [ADD] detecting if hand is in square Sem van der Hoeven 2021-06-04 13:09:51 +02:00
• 2523e1abfa Merge branch 'feature/automatic-rendering' into feature/MovementCharacter Nathalie Seen 2021-06-04 12:57:51 +02:00
• bc5703eb65 [FIX] made bee move Nathalie Seen 2021-06-04 12:52:24 +02:00
• 4c49895f6d [MERGE] async compvision Sem van der Hoeven 2021-06-04 12:29:36 +02:00
• 921609de5d [EDIT] stuff feature/async-computervision Sem van der Hoeven 2021-06-04 11:39:23 +02:00
• fe94b0f83d [FIX] showing of pose detection points Sem van der Hoeven 2021-06-04 10:55:53 +02:00
• 7cc918fdf8 [MERGE] merged feature/improve-hand-detection into feature/Start-scene correctly Jasper 2021-06-04 10:51:53 +02:00
• 75c745427c [ADD] deque method feature/automatic-rendering Sem van der Hoeven 2021-06-04 10:22:35 +02:00
• f76c0fcf1b Merge remote-tracking branch 'origin/feature/improve-hand-detection' into feature/menu Jasper 2021-06-04 10:03:08 +02:00
• c25efec103 [ADD] load bee in scene Nathalie Seen 2021-06-04 10:01:13 +02:00
• c4e8c1bba2 Merge pull request #1 from SemvdH/develop SemvdH 2021-06-02 11:02:26 +02:00
• 6f546fdd8b [EDIT] caffemodel in gitignore Sem van der Hoeven 2021-06-02 10:54:10 +02:00
• e166c1f988 [EDIT] small fix Sem van der Hoeven 2021-06-02 10:51:59 +02:00
• ab30c41bee [FIX] crashing with pose detection Sem van der Hoeven 2021-06-02 10:41:50 +02:00
• 1a149b8b7e [ADD] static camera instance Sem van der Hoeven 2021-06-02 10:05:09 +02:00
• cc7cb37840 [ADD] caffemodel project entry Sem van der Hoeven 2021-06-02 09:44:30 +02:00
• ad35e14bfc [ADD] (test) trees at every chunk Sem van der Hoeven 2021-06-02 09:37:13 +02:00
• 2468d7fa7f [ADD] the pause menu can be accessed with the 'P' key. the real button are not implemented yet. lars 2021-06-01 15:18:07 +02:00
• 7679555059 [ADD] added the menu buttons with correct textures to the scene feature/Start-scene Jasper 2021-06-01 15:10:23 +02:00
• 623003a4f7 [ADD] gitignore change feature/improve-hand-detection Kim 2021-06-01 14:40:26 +02:00
• 27e99dd2eb [ADD] Looping through array depending on open or closed hand Kim 2021-06-01 14:37:57 +02:00
• f69e104a8d [ADD] comments Sem van der Hoeven 2021-06-01 14:24:16 +02:00
• 8d52703297 [ADD] added deque support for light loading Sem van der Hoeven 2021-06-01 14:06:28 +02:00
• 658b809ef2 [ADD] automatic loading of models Sem van der Hoeven 2021-06-01 13:57:45 +02:00
• c5939f7702 [EDIT] removed uses of face detector feature/rendering-engine-expansion Sem van der Hoeven 2021-06-01 12:19:37 +02:00
• 2cec8e9a62 [REMOVE] removed unused face detector Sem van der Hoeven 2021-06-01 12:18:19 +02:00
• ef466c9d95 Merge branch 'feature/timer' into develop Menno 2021-06-01 11:41:43 +02:00
• f03cc485cd [ADDED] timer class feature/timer Menno 2021-06-01 11:41:21 +02:00
• 612adf6e9b [EDIT] mutex? BUGGED/pose-detection Sem van der Hoeven 2021-05-31 15:50:06 +02:00
• 25c99abb72 [EDIT] mutex with cap Sem van der Hoeven 2021-05-31 10:25:24 +02:00
• 9d80cddbd1 [BUG] image still doesnt work Jasper 2021-05-28 16:49:13 +02:00
• 739b4a9eb6 [FIXED] merge Menno 2021-05-28 16:17:15 +02:00
• 0c654a51b9 Merge branch 'feature/collision' into develop Menno 2021-05-28 16:14:49 +02:00
• ef058b0087 [FIXED] merge feature/collision Menno 2021-05-28 16:12:51 +02:00
• 1ef0d87437 Merge remote-tracking branch 'origin/feature/adding_scenes' into feature/collision Menno 2021-05-28 16:08:35 +02:00
• 5d31327a47 [ADD] The scene switching works now, the only thing to do is controling the scenes with the keys! feature/adding_scenes Lars 2021-05-28 16:04:41 +02:00
• e8b3e1b482 [FEATURE] collisions!!!!!!!!!!! YAY Menno 2021-05-28 15:45:46 +02:00
• 40529f84b3 [ADD] basis for async arm detection Sem van der Hoeven 2021-05-28 15:31:21 +02:00
• 23624aea3f [DELETE] deleted unnecessary functions feature/pose-detection-fix Jasper 2021-05-28 14:21:55 +02:00
• a68c6a57bf [EDIT] edited file Jasper 2021-05-28 12:32:10 +02:00
• 078a6ce66d [ADD] added all the files Jasper 2021-05-28 12:27:12 +02:00
• 93b3223737 [testing] shader ddoesnt work, still on it Lars 2021-05-28 12:08:12 +02:00
• 28400fb320 [ADDED] simple collision logic for entities Menno 2021-05-28 11:37:21 +02:00
• 820c5a2eb0 [FIXED] merge errors Menno 2021-05-28 10:10:58 +02:00
• 942ddf24d8 Merge remote-tracking branch 'origin/feature/scenes' into feature/rendering-engine-expansion Menno 2021-05-28 10:06:36 +02:00
• f1f1aac93d [ADD] comments Sem van der Hoeven 2021-05-25 15:54:02 +02:00
• 1f2258bc01 [ADD] skeleton code for different scenes feature/scenes Lars 2021-05-25 15:52:41 +02:00
• 51cdc520e0 [EDIT] camera controls Menno 2021-05-25 15:51:29 +02:00
• 563f465e2c [EDIT] remove unused methods Sem van der Hoeven 2021-05-25 15:46:53 +02:00
• cc7fae5d2f [ADD] comments Menno 2021-05-25 14:55:27 +02:00
• 05ae8ee019 [FEATURE] finished hand open/closed recognition Sem van der Hoeven 2021-05-25 14:49:04 +02:00
• 977d377fe5 [FEATURE] working gui buttons Menno 2021-05-25 14:38:35 +02:00
• 3696e2eb30 [EDIT] improve hand detection with mask Sem van der Hoeven 2021-05-25 14:19:18 +02:00
• 276aa1a449 [ADD] mask methods Sem van der Hoeven 2021-05-25 13:31:25 +02:00
• 21a7f4f4b2 [FEATURE] simple GUI support Menno 2021-05-25 12:36:58 +02:00
• ad4075a826 [EDIT] change window size to ints Sem van der Hoeven 2021-05-25 10:19:33 +02:00
• e50cd92a35 [ADD] some headers Sem van der Hoeven 2021-05-25 10:16:58 +02:00
• 97a7501cda [FEATURE] multiple light support Menno 2021-05-21 16:25:39 +02:00
• ff79c1525c Merge branch 'feature/objectdetection' into develop Sem van der Hoeven 2021-05-21 15:25:29 +02:00
• a7597c8d4f [ADD] comments to backgroundRemover feature/objectdetection Nathalie Seen 2021-05-21 15:24:06 +02:00
• 5b4d9b624f Merge branch 'feature/objectdetection' into develop Sem van der Hoeven 2021-05-21 15:22:38 +02:00
• bd227d3afe Merge remote-tracking branch 'origin/feature/rendering-engine-expansion-comments' into feature/rendering-engine-expansion Menno 2021-05-21 15:22:27 +02:00
• 27aca98ea4 Merge branch 'feature/comments' into feature/objectdetection Sem van der Hoeven 2021-05-21 15:22:07 +02:00
• e2464ec8fd [comment] commented some temporary code in the main and commented a new method that gets the size of a model. Lars 2021-05-21 15:21:27 +02:00
• ca591dd427 [ADD] comments to fingercount Sem van der Hoeven 2021-05-21 15:21:03 +02:00
• 8720e50ba8 [ADD] added comments to the classes FaceDetector and ObjectDetection feature/comments Jasper 2021-05-21 15:10:05 +02:00
• bb4fcbc97b [EDIT] comments on each function Menno 2021-05-21 15:09:07 +02:00
• acf24cab36 [ADD] comments to skindetector Sem van der Hoeven 2021-05-21 14:56:45 +02:00
• e10aea5a15 [ADDED] smoke and some small changes Menno 2021-05-21 14:12:30 +02:00
• 1811bf51a4 [EDIT] added base for hand detection Sem van der Hoeven 2021-05-21 13:23:33 +02:00
• 27a09aeca4 [EDIT] added evrything to namespace, also fixed includes Jasper 2021-05-21 12:12:42 +02:00
• e39cb1a761 [ADD] added handy files Jasper 2021-05-21 11:52:47 +02:00
• ab3b0c296a [ADD] start for object detection feature/computervision Sem van der Hoeven 2021-05-21 11:19:17 +02:00
• e2f6bd720d [EDIT] renaming the static_shader Menno 2021-05-21 08:43:32 +02:00
• 9e9d50da9e [FEATURE] single light support Menno 2021-05-21 08:36:04 +02:00
• 01571d191f [FIXED] openCV included Menno 2021-05-18 14:05:56 +02:00
• ca0f7546bf [REMOVE] docs folders from tracking Sem van der Hoeven 2021-05-18 14:00:41 +02:00
• 377311be60 [EDIT] add removal of docs folders to gitignore Sem van der Hoeven 2021-05-18 13:59:11 +02:00
• 5075eb0dc2 [EDIT] add lines to gitignore Sem van der Hoeven 2021-05-18 13:56:20 +02:00
• 45fd7d328b Merge branch 'feature/custom-rendering' into develop Sem van der Hoeven 2021-05-18 13:38:16 +02:00
• 438b219d0a [EDIT] code style guide finished feature/custom-rendering Menno 2021-05-18 12:43:22 +02:00
• 41e02b0c39 [EDIT] code style guide - renderengine Menno 2021-05-18 12:03:15 +02:00
• 41d0667390 [EDIT] code style guide - shaders Menno 2021-05-18 11:46:19 +02:00
• 0517f9e897 [EDIT] code style guide - toolbox & main Menno 2021-05-18 11:31:25 +02:00
• df34658a4c [ EDIT] added opencv libs to project Sem van der Hoeven 2021-05-18 11:23:32 +02:00
• 5047467206 [ADD] 3d test model Menno 2021-05-18 11:22:41 +02:00
• 0bb4cc5e1d [ADD] custom rendering system Menno 2021-05-18 11:20:57 +02:00
• 4f4b125c12 [EDIT] gitignore Sem van der Hoeven 2021-05-18 11:19:00 +02:00
• e46e26c729 [EDIT] add deltatime to fps cam Sem van der Hoeven 2021-05-18 10:47:27 +02:00
• 8f13fe4d90 [EDIT] edit lib files Sem van der Hoeven 2021-05-18 10:44:08 +02:00
• 2f1a8e77e8 [ADD] template project with correct name Sem van der Hoeven 2021-05-18 10:33:08 +02:00
• 73538d9a93 Update .gitignore SemvdH 2021-05-18 10:19:19 +02:00
• 9b3622ea15 Initial commit SemvdH 2021-05-18 10:18:28 +02:00