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

• 85f341e576 Merge pull request #9 from SemvdH/develop main SemvdH 2021-06-18 17:56:41 +02:00
• 0b1e37119c [ADD] resum textyre develop Sem van der Hoeven 2021-06-18 17:55:01 +02:00
• a204dbbc18 [pause button stuff] Sem van der Hoeven 2021-06-18 17:46:49 +02:00
• 5601cabc28 Merge branch 'develop' into temp-end temp-end Sem van der Hoeven 2021-06-18 17:41:54 +02:00
• baa19a5109 [ADD] stop after end Sem van der Hoeven 2021-06-18 17:41:30 +02:00
• 76206fa13e Merge branch 'feature/house_empty' into develop Sem van der Hoeven 2021-06-18 17:18:09 +02:00
• 7c3d68a742 [ADD] hand detection in startup scene Sem van der Hoeven 2021-06-18 17:15:26 +02:00
• 1ff08de055 [ADD] player spawns at hightlimit, hightlimit is lowered feature/house_empty Nathalie Seen 2021-06-18 16:38:23 +02:00
• c1ba33e55b [ADD] button callback for game over screen Sem van der Hoeven 2021-06-18 16:24:12 +02:00
• 2343b9aee7 [ADD] button callbacks Sem van der Hoeven 2021-06-18 16:21:31 +02:00
• f6a1258805 [ADD] only playing after calibrating Sem van der Hoeven 2021-06-18 16:11:23 +02:00
• 0c9b663366 [ADD] stuff Sem van der Hoeven 2021-06-18 15:59:34 +02:00
• b04d999a7d [FIX] merge stuff Sem van der Hoeven 2021-06-18 15:49:10 +02:00
• a6c2558e85 Merge pull request #8 from SemvdH/feature/loading_all_models SemvdH 2021-06-18 15:33:33 +02:00
• 3a42966e92 Merge branch 'develop' into feature/loading_all_models SemvdH 2021-06-18 15:33:06 +02:00
• 497186b587 Merge pull request #7 from SemvdH/feature/handControl SemvdH 2021-06-18 15:28:39 +02:00
• 17d2bd7382 Merge branch 'develop' into feature/handControl SemvdH 2021-06-18 15:28:30 +02:00
• 1d940fe1db [MERGE] develop into this Sem van der Hoeven 2021-06-18 15:25:15 +02:00
• 3d382fd460 Merge pull request #6 from SemvdH/feature/game_logic/game_over SemvdH 2021-06-18 15:18:18 +02:00
• ec14dd1093 Merge branch 'develop' into feature/game_logic/game_over SemvdH 2021-06-18 15:17:43 +02:00
• 17b585190a [EDIT] loadingscreen now has a background, and got rid of some memory leaks Jasper 2021-06-18 15:09:30 +02:00
• b92c0c74eb no message DESKTOP-EBR7IVA\kimve 2021-06-18 15:08:08 +02:00
• ad2d651d41 [FIX] fixed the loading scene, everything runs correctly now Jasper 2021-06-18 14:53:16 +02:00
• 5419801113 Merge branch 'feature/game_logic/collisionFix' into feature/game_logic/game_over DESKTOP-EBR7IVA\kimve 2021-06-18 13:57:34 +02:00
• 824f9a2433 [ADD] gameover scene shows the points DESKTOP-EBR7IVA\kimve 2021-06-18 13:35:19 +02:00
• c0a099a05e [FIXED] collisions feature/game_logic/collisionFix Menno 2021-06-18 12:32:45 +02:00
• 022c7eb1f0 [WIP] collision fixing DESKTOP-EBR7IVA\kimve 2021-06-18 11:20:24 +02:00
• 06a6930c58 [ADD] filled the method load_all_models() in loading_Scene Jasper 2021-06-18 11:13:26 +02:00
• 982f787d44 [ADD] comments feature/auto-calibration Sem van der Hoeven 2021-06-18 11:11:56 +02:00
• b446a366fb [ADD] comments and cleanup includes Sem van der Hoeven 2021-06-18 11:06:59 +02:00
• 0d6f10dff5 [ADD] comments and cleanup includes Sem van der Hoeven 2021-06-18 11:06:25 +02:00
• f1f8ac2d08 Merge branch 'feature/random_levels' into feature/loading_all_models Jasper 2021-06-18 10:54:17 +02:00
• 01570d8045 [FIX] auto skin calibration in game scene Sem van der Hoeven 2021-06-18 10:49:59 +02:00
• 773e8e9a96 [FIX + check] cleaned up the singleton and loading scene, only loading the models should be the only thing to do. besides checking it in another scene! Lars 2021-06-18 10:43:26 +02:00
• ce0a1f3da7 [EDIT] files accordingly to style guide Sem van der Hoeven 2021-06-18 10:31:00 +02:00
• 8dbe088a91 [add] add some code + singleton, not working properly yet Lars 2021-06-18 10:08:16 +02:00
• 26d438e4d1 [EDIT] models now generate in a 3x3 grid with always 9 models feature/random_levels Jasper 2021-06-18 09:58:08 +02:00
• ca61dfc781 [WIP] from start menu, if you press space, you get to gameover screen. Just to check. This works DESKTOP-EBR7IVA\kimve 2021-06-11 16:58:01 +02:00
• e51b56b156 [WIP] Collision detectie moet nog worden egimplementeerd om naar game over screen te gaan DESKTOP-EBR7IVA\kimve 2021-06-11 16:49:09 +02:00
• 344745d9cf [ADD] auto calibration in game scene Sem van der Hoeven 2021-06-11 16:46:00 +02:00
• 24285b9714 [ADD] added an extra layer to the grid for the lamps and fans. Grid now generates correctly. Jasper 2021-06-11 16:34:25 +02:00
• 3f172e1484 [ADD] auto calibration in startup scene Sem van der Hoeven 2021-06-11 16:19:41 +02:00
• a6fa9514df [ADD] maincharacter uses deltatime for movement Nathalie Seen 2021-06-11 16:19:21 +02:00
• 001f28d198 [forget] Lars 2021-06-11 16:01:17 +02:00
• fb70d10c47 [EDIT] made a grid for the models to load in Jasper 2021-06-11 15:58:28 +02:00
• f6fad79c2e [TRY] trying to manage some data storage Lars 2021-06-11 15:56:34 +02:00
• a65f3391f7 [Add] Pointsystem works feature/game_logic/point_system DESKTOP-EBR7IVA\kimve 2021-06-11 15:32:06 +02:00
• 3517d2b36a [ADD] made movement based on hand position Nathalie Seen 2021-06-11 14:46:24 +02:00
• 9b1bea3eec Merge branch 'feature/number-from-images' into feature/game_logic/point_system DESKTOP-EBR7IVA\kimve 2021-06-11 12:32:03 +02:00
• 8c1191c131 [ADD] start of number display DESKTOP-EBR7IVA\kimve 2021-06-11 12:31:33 +02:00
• 692bb76164 [ADD] convert number to digits feature/number-from-images Sem van der Hoeven 2021-06-11 12:30:47 +02:00
• bce2ccf889 [ADD] added base for loading scene Jasper 2021-06-11 11:43:46 +02:00
• 63c6ec8a0c Merge branch 'develop' of https://github.com/SemvdH/SDBA into develop DESKTOP-EBR7IVA\kimve 2021-06-11 11:15:24 +02:00
• 504b97b320 [FIX] pointer Sem van der Hoeven 2021-06-11 11:13:49 +02:00
• ae9386a811 [FIX] in game scene Sem van der Hoeven 2021-06-11 10:58:21 +02:00
• 645c4df494 [FIX] in game scene Sem van der Hoeven 2021-06-11 10:42:52 +02:00
• 04c6f52e64 Merge branch 'develop' of https://github.com/SemvdH/SDBA into develop DESKTOP-EBR7IVA\kimve 2021-06-11 10:31:34 +02:00
• 8835646e32 Merge pull request #5 from SemvdH/mergebranch-Jasper SemvdH 2021-06-11 10:27:46 +02:00
• ab7123b89a Merge branch 'develop' into mergebranch-Jasper SemvdH 2021-06-11 10:27:30 +02:00
• dbecbb594e Merge pull request #4 from SemvdH/feature/point-count SemvdH 2021-06-11 10:18:31 +02:00
• 38d3c6e5cb Merge branch 'develop' into feature/point-count SemvdH 2021-06-11 10:18:11 +02:00
• 71761dd322 Merge pull request #3 from SemvdH/feature/MovementCharacter SemvdH 2021-06-11 10:16:39 +02:00
• eaab85ac33 Merge branch 'develop' into feature/MovementCharacter SemvdH 2021-06-11 10:14:12 +02:00
• cca8680a98 Merge pull request #2 from SemvdH/feature/house-generation SemvdH 2021-06-11 10:05:23 +02:00
• 4e9e534c02 Merge branch 'develop' into feature/house-generation SemvdH 2021-06-11 10:05:11 +02:00
• 770b54bdd5 [ADD] character falls when it hits a tree Nathalie Seen 2021-06-11 09:59:35 +02:00
• a8996f63ef [ADD] start game scene fingers feature/calibration Sem van der Hoeven 2021-06-08 16:06:46 +02:00
• dd6ee77316 [ADD] added all the models to the project Menno 2021-06-08 15:53:51 +02:00
• 88252f4dc8 [ADD] static skin treshold Sem van der Hoeven 2021-06-08 15:35:03 +02:00
• 551d53a3dc [ADD] made collision work Nathalie Seen 2021-06-08 15:25:24 +02:00
• 27594d466b [ADD] better info on camera Sem van der Hoeven 2021-06-08 15:11:54 +02:00
• 5e137faef5 [ADD] up left and right detection regions Sem van der Hoeven 2021-06-08 14:48:46 +02:00
• 15f71680a9 [ADD] basic point system based on amount of entities in chunk (house entitie excluded) Kim 2021-06-08 14:42:58 +02:00
• b092bd5f0a [ADD] furniture Menno 2021-06-08 14:24:12 +02:00
• cadee7d8e9 [ADD] hand detection type enum Sem van der Hoeven 2021-06-08 13:38:47 +02:00
• 1e55736615 [ADD] multiple hand detection squares Sem van der Hoeven 2021-06-08 13:17:07 +02:00
• 625965ed1b [ADDED] rotating bounding boxes Menno 2021-06-08 12:22:54 +02:00
• 509f64f04d Merge branch 'feature/pause-menu' into feature/menu Jasper 2021-06-08 12:14:04 +02:00
• ae93ed6b34 [FIX] renamed uses of main_character to MainCharacter in in_Game_secene Nathalie Seen 2021-06-08 11:59:58 +02:00
• ef470bd4f1 [ADD] start of multiple squares Sem van der Hoeven 2021-06-08 11:54:48 +02:00
• 1558ee298b [ADD] added comments to startup_scene.h feature/menu Jasper 2021-06-08 11:49:57 +02:00
• 69d88ab1c1 [ADD] comments to camera and toolbox Nathalie Seen 2021-06-08 11:39:47 +02:00
• a4d5658a06 [ADD] Commented main_character h and cpp files Kim 2021-06-08 11:37:56 +02:00
• e7a9cda9dd [ADD] added a on/off for hand detection in menu Jasper 2021-06-08 11:14:07 +02:00
• afd3e00ddb [ADD] contour of hand in calibration screen Sem van der Hoeven 2021-06-08 11:03:22 +02:00
• edbbfb136a [ADD] made camera follow the character with lerp Nathalie Seen 2021-06-08 10:55:48 +02:00
• bb68d98bfe [ADD] comments Sem van der Hoeven 2021-06-08 10:43:59 +02:00
• c94f798a9d [ADD] added comments and deleted cout's Jasper 2021-06-04 16:45:11 +02:00
• 4587559030 [COMMENTS] added some comments for all the scene files feature/pause-menu Lars 2021-06-04 16:44:10 +02:00
• aa4860eb48 [FIX] only clicks ones when you close hand now Jasper 2021-06-04 16:41:16 +02:00
• e70d2ef19d [EDIT] removed unused hand stuff Sem van der Hoeven 2021-06-04 16:32:30 +02:00
• b3412e414e [ADD] menu now works Jasper 2021-06-04 16:32:26 +02:00
• 1ab5ae798e [ADD] hand calibration screen Sem van der Hoeven 2021-06-04 16:27:30 +02:00
• aa9c6a0fbb [ADDED] comments Menno 2021-06-04 15:54:23 +02:00
• 8c50792657 [FEATURE] simple house generator Menno 2021-06-04 15:49:56 +02:00
• e4b5dc39c0 [EDIT] change variable names in compliance with code style guide Sem van der Hoeven 2021-06-04 15:10:19 +02:00
• b80653b668 [EDIT] change method names in compliance with code style guide Sem van der Hoeven 2021-06-04 15:07:36 +02:00
• ca2959bf2d [FIX] detecting hand when its just a finger or hair Sem van der Hoeven 2021-06-04 14:48:19 +02:00
• 86383aace5 [ADD] camera follows the only at the z position Nathalie Seen 2021-06-04 14:44:41 +02:00
• cfd2d00d08 [ADDED] simple house generation Menno 2021-06-04 14:32:16 +02:00