sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop into master #9

Merged
SemvdH merged 126 commits from develop into main 2021-06-18 15:56:41 +00:00
Conversation 4 Commits 126 Files Changed 73 +29875 -4964

126 Commits

Author SHA1 Message Date
Sem van der Hoeven
0b1e37119c [ADD] resum textyre 2021-06-18 17:55:01 +02:00
Sem van der Hoeven
a204dbbc18 [pause button stuff] 2021-06-18 17:46:49 +02:00
Sem van der Hoeven
5601cabc28 Merge branch 'develop' into temp-end 2021-06-18 17:41:54 +02:00
Sem van der Hoeven
baa19a5109 [ADD] stop after end 2021-06-18 17:41:30 +02:00
Sem van der Hoeven
76206fa13e Merge branch 'feature/house_empty' into develop 2021-06-18 17:18:09 +02:00
Sem van der Hoeven
7c3d68a742 [ADD] hand detection in startup scene 2021-06-18 17:15:26 +02:00
Nathalie Seen
1ff08de055 [ADD] player spawns at hightlimit, hightlimit is lowered 2021-06-18 16:38:23 +02:00
Sem van der Hoeven
c1ba33e55b [ADD] button callback for game over screen 2021-06-18 16:24:12 +02:00
Sem van der Hoeven
2343b9aee7 [ADD] button callbacks 2021-06-18 16:21:31 +02:00
Sem van der Hoeven
f6a1258805 [ADD] only playing after calibrating 2021-06-18 16:11:23 +02:00
Sem van der Hoeven
0c9b663366 [ADD] stuff 2021-06-18 15:59:34 +02:00
Sem van der Hoeven
b04d999a7d [FIX] merge stuff 2021-06-18 15:49:10 +02:00
SemvdH
a6c2558e85 Merge pull request #8 from SemvdH/feature/loading_all_models 
merge Feature/loading all models into develop
 2021-06-18 15:33:33 +02:00
SemvdH
3a42966e92 Merge branch 'develop' into feature/loading_all_models 2021-06-18 15:33:06 +02:00
SemvdH
497186b587 Merge pull request #7 from SemvdH/feature/handControl 
merge Feature/hand control int develop
 2021-06-18 15:28:39 +02:00
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
3d382fd460 Merge pull request #6 from SemvdH/feature/game_logic/game_over 
merge Feature/game logic/game over into develop
 2021-06-18 15:18:18 +02:00
SemvdH
ec14dd1093 Merge branch 'develop' into feature/game_logic/game_over 2021-06-18 15:17:43 +02:00
Jasper
17b585190a [EDIT] loadingscreen now has a background, and got rid of some memory leaks 2021-06-18 15:09:30 +02:00
DESKTOP-EBR7IVA\kimve
b92c0c74eb no message 2021-06-18 15:08:08 +02:00
Jasper
ad2d651d41 [FIX] fixed the loading scene, everything runs correctly now 2021-06-18 14:53:16 +02:00
DESKTOP-EBR7IVA\kimve
5419801113 Merge branch 'feature/game_logic/collisionFix' into feature/game_logic/game_over 
* feature/game_logic/collisionFix:
  [FIXED] collisions
  [WIP] collision fixing

# Conflicts:
#	src/scenes/game_Over_Scene.cpp
#	src/scenes/in_Game_Scene.cpp
 2021-06-18 13:57:34 +02:00
DESKTOP-EBR7IVA\kimve
824f9a2433 [ADD] gameover scene shows the points 2021-06-18 13:35:19 +02:00
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
Jasper
06a6930c58 [ADD] filled the method load_all_models() in loading_Scene 2021-06-18 11:13:26 +02:00
Sem van der Hoeven
982f787d44 [ADD] comments 2021-06-18 11:11:56 +02:00
Sem van der Hoeven
b446a366fb [ADD] comments and cleanup includes 2021-06-18 11:06:59 +02:00
Sem van der Hoeven
0d6f10dff5 [ADD] comments and cleanup includes 2021-06-18 11:06:25 +02:00
Jasper
f1f8ac2d08 Merge branch 'feature/random_levels' into feature/loading_all_models 2021-06-18 10:54:17 +02:00
Sem van der Hoeven
01570d8045 [FIX] auto skin calibration in game scene 2021-06-18 10:49:59 +02:00
Lars
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! 2021-06-18 10:43:26 +02:00
Sem van der Hoeven
ce0a1f3da7 [EDIT] files accordingly to style guide 2021-06-18 10:31:00 +02:00
Lars
8dbe088a91 [add] add some code + singleton, not working properly yet 2021-06-18 10:08:16 +02:00
Jasper
26d438e4d1 [EDIT] models now generate in a 3x3 grid with always 9 models 2021-06-18 09:58:08 +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
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
Sem van der Hoeven
344745d9cf [ADD] auto calibration in game scene 2021-06-11 16:46:00 +02:00
Jasper
24285b9714 [ADD] added an extra layer to the grid for the lamps and fans. Grid now generates correctly. 
Good enough
 2021-06-11 16:34:25 +02:00
Sem van der Hoeven
3f172e1484 [ADD] auto calibration in startup scene 2021-06-11 16:19:41 +02:00
Nathalie Seen
a6fa9514df [ADD] maincharacter uses deltatime for movement 2021-06-11 16:19:21 +02:00
Lars
001f28d198 [forget] 2021-06-11 16:01:17 +02:00
Jasper
fb70d10c47 [EDIT] made a grid for the models to load in 
Some items still clip through the wall
 2021-06-11 15:58:28 +02:00
Lars
f6fad79c2e [TRY] trying to manage some data storage 2021-06-11 15:56:34 +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
DESKTOP-EBR7IVA\kimve
9b1bea3eec Merge branch 'feature/number-from-images' into feature/game_logic/point_system 
* feature/number-from-images:
  [ADD] convert number to digits
 2021-06-11 12:32:03 +02:00
DESKTOP-EBR7IVA\kimve
8c1191c131 [ADD] start of number display 2021-06-11 12:31:33 +02:00
Sem van der Hoeven
692bb76164 [ADD] convert number to digits 2021-06-11 12:30:47 +02:00
Jasper
bce2ccf889 [ADD] added base for loading scene 2021-06-11 11:43:46 +02:00
DESKTOP-EBR7IVA\kimve
63c6ec8a0c Merge branch 'develop' of https://github.com/SemvdH/SDBA into develop 
* 'develop' of https://github.com/SemvdH/SDBA:
  [FIX] pointer
  [FIX] in game scene
  [FIX] in game scene
 2021-06-11 11:15:24 +02:00
Sem van der Hoeven
504b97b320 [FIX] pointer 2021-06-11 11:13:49 +02:00
Sem van der Hoeven
ae9386a811 [FIX] in game scene 2021-06-11 10:58:21 +02:00
Sem van der Hoeven
645c4df494 [FIX] in game scene 2021-06-11 10:42:52 +02:00
DESKTOP-EBR7IVA\kimve
04c6f52e64 Merge branch 'develop' of https://github.com/SemvdH/SDBA into develop 
* 'develop' of https://github.com/SemvdH/SDBA: (58 commits)
  [ADD] character falls when it hits a tree
  [ADD] start game scene fingers
  [ADD] added all the models to the project
  [ADD] static skin treshold
  [ADD] made collision work
  [ADD] better info on camera
  [ADD] up left and right detection regions
  [ADD] basic point system based on amount of entities in chunk (house entitie excluded)
  [ADD] furniture
  [ADD] hand detection type enum
  [ADD] multiple hand detection squares
  [ADDED] rotating bounding boxes
  [FIX] renamed uses of main_character to MainCharacter in in_Game_secene
  [ADD] start of multiple squares
  [ADD] added comments to startup_scene.h
  [ADD] comments to camera and toolbox
  [ADD] Commented main_character h and cpp files
  [ADD] added a on/off for hand detection in menu
  [ADD] contour of hand in calibration screen
  [ADD] made camera follow the character with lerp
  ...
 2021-06-11 10:31:34 +02:00
SemvdH
8835646e32 Merge pull request #5 from SemvdH/mergebranch-Jasper 
Mergebranch jasper into develop
 2021-06-11 10:27:46 +02:00
SemvdH
ab7123b89a Merge branch 'develop' into mergebranch-Jasper 2021-06-11 10:27:30 +02:00
SemvdH
dbecbb594e Merge pull request #4 from SemvdH/feature/point-count 
point count into develop
 2021-06-11 10:18:31 +02:00
SemvdH
38d3c6e5cb Merge branch 'develop' into feature/point-count 2021-06-11 10:18:11 +02:00
SemvdH
71761dd322 Merge pull request #3 from SemvdH/feature/MovementCharacter 
Feature/movement character into develop
 2021-06-11 10:16:39 +02:00
SemvdH
eaab85ac33 Merge branch 'develop' into feature/MovementCharacter 2021-06-11 10:14:12 +02:00
SemvdH
cca8680a98 Merge pull request #2 from SemvdH/feature/house-generation 
Feature/house generation into develop
 2021-06-11 10:05:23 +02:00
SemvdH
4e9e534c02 Merge branch 'develop' into feature/house-generation 2021-06-11 10:05:11 +02:00
Nathalie Seen
770b54bdd5 [ADD] character falls when it hits a tree 2021-06-11 09:59:35 +02:00
Sem van der Hoeven
a8996f63ef [ADD] start game scene fingers 2021-06-08 16:06:46 +02:00
Menno
dd6ee77316 [ADD] added all the models to the project 2021-06-08 15:53:51 +02:00
Sem van der Hoeven
88252f4dc8 [ADD] static skin treshold 2021-06-08 15:35:03 +02:00
Nathalie Seen
551d53a3dc [ADD] made collision work 2021-06-08 15:25:24 +02:00
Sem van der Hoeven
27594d466b [ADD] better info on camera 2021-06-08 15:11:54 +02:00
Sem van der Hoeven
5e137faef5 [ADD] up left and right detection regions 2021-06-08 14:48:46 +02:00
Kim
15f71680a9 [ADD] basic point system based on amount of entities in chunk (house entitie excluded) 2021-06-08 14:42:58 +02:00
Menno
b092bd5f0a [ADD] furniture 2021-06-08 14:24:12 +02:00
Sem van der Hoeven
cadee7d8e9 [ADD] hand detection type enum 2021-06-08 13:38:47 +02:00
Sem van der Hoeven
1e55736615 [ADD] multiple hand detection squares 2021-06-08 13:17:07 +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
Nathalie Seen
ae93ed6b34 [FIX] renamed uses of main_character to MainCharacter in in_Game_secene 2021-06-08 11:59:58 +02:00
Sem van der Hoeven
ef470bd4f1 [ADD] start of multiple squares 2021-06-08 11:54:48 +02:00
Jasper
1558ee298b [ADD] added comments to startup_scene.h 2021-06-08 11:49:57 +02:00
Nathalie Seen
69d88ab1c1 [ADD] comments to camera and toolbox 2021-06-08 11:39:47 +02:00
Kim
a4d5658a06 [ADD] Commented main_character h and cpp files 2021-06-08 11:37:56 +02:00
Jasper
e7a9cda9dd [ADD] added a on/off for hand detection in menu 
you can switch between mouse and hand detection now
 2021-06-08 11:14:07 +02:00
Sem van der Hoeven
afd3e00ddb [ADD] contour of hand in calibration screen 2021-06-08 11:03:22 +02:00
Nathalie Seen
edbbfb136a [ADD] made camera follow the character with lerp 2021-06-08 10:55:48 +02:00
Sem van der Hoeven
bb68d98bfe [ADD] comments 2021-06-08 10:43:59 +02:00
Jasper
c94f798a9d [ADD] added comments and deleted cout's 2021-06-04 16:45:11 +02:00
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
Jasper
aa4860eb48 [FIX] only clicks ones when you close hand now 2021-06-04 16:41:16 +02:00
Sem van der Hoeven
e70d2ef19d [EDIT] removed unused hand stuff 2021-06-04 16:32:30 +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
1ab5ae798e [ADD] hand calibration screen 2021-06-04 16:27:30 +02:00
Menno
aa9c6a0fbb [ADDED] comments 2021-06-04 15:54:23 +02:00
Menno
8c50792657 [FEATURE] simple house generator 2021-06-04 15:49:56 +02:00
Sem van der Hoeven
e4b5dc39c0 [EDIT] change variable names in compliance with code style guide 2021-06-04 15:10:19 +02:00
Sem van der Hoeven
b80653b668 [EDIT] change method names in compliance with code style guide 2021-06-04 15:07:36 +02:00
Sem van der Hoeven
ca2959bf2d [FIX] detecting hand when its just a finger or hair 2021-06-04 14:48:19 +02:00
Nathalie Seen
86383aace5 [ADD] camera follows the only at the z position 2021-06-04 14:44:41 +02:00
Menno
cfd2d00d08 [ADDED] simple house generation 2021-06-04 14:32:16 +02:00
Sem van der Hoeven
81dec3b9f4 [ADD] detecting if hand is in square 2021-06-04 13:10:11 +02:00
Sem van der Hoeven
f5926fffcb [ADD] detecting if hand is in square 2021-06-04 13:09:51 +02:00
Nathalie Seen
2523e1abfa Merge branch 'feature/automatic-rendering' into feature/MovementCharacter 
* feature/automatic-rendering:
  [ADD] deque method
  [EDIT] caffemodel in gitignore
  [EDIT] small fix
  [ADD] (test) trees at every chunk
  [ADD] comments
  [ADD] added deque support for light loading
  [ADD] automatic loading of models
  [ADDED] timer class

# Conflicts:
#	src/scenes/in_Game_Scene.cpp
#	wk2_fps.vcxproj.filters
 2021-06-04 12:57:51 +02:00
Nathalie Seen
bc5703eb65 [FIX] made bee move 2021-06-04 12:52:24 +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
Sem van der Hoeven
75c745427c [ADD] deque method 2021-06-04 10:22:35 +02:00
Jasper
f76c0fcf1b Merge remote-tracking branch 'origin/feature/improve-hand-detection' into feature/menu 2021-06-04 10:03:08 +02:00
Nathalie Seen
c25efec103 [ADD] load bee in scene 2021-06-04 10:01:13 +02:00
Sem van der Hoeven
6f546fdd8b [EDIT] caffemodel in gitignore 2021-06-02 10:54:10 +02:00
Sem van der Hoeven
e166c1f988 [EDIT] small fix 2021-06-02 10:51:59 +02:00
Sem van der Hoeven
ab30c41bee [FIX] crashing with pose detection 2021-06-02 10:41:50 +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
Sem van der Hoeven
ad35e14bfc [ADD] (test) trees at every chunk 2021-06-02 09:37:13 +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
Jasper
7679555059 [ADD] added the menu buttons with correct textures to the scene 2021-06-01 15:10:23 +02:00
Kim
623003a4f7 [ADD] gitignore change 2021-06-01 14:40:26 +02:00
Kim
27e99dd2eb [ADD] Looping through array depending on open or closed hand 2021-06-01 14:37:57 +02:00
Sem van der Hoeven
f69e104a8d [ADD] comments 2021-06-01 14:24:16 +02:00
Sem van der Hoeven
8d52703297 [ADD] added deque support for light loading 2021-06-01 14:06:28 +02:00
Sem van der Hoeven
658b809ef2 [ADD] automatic loading of models 2021-06-01 13:57:45 +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
Jasper
078a6ce66d [ADD] added all the files 2021-05-28 12:27:12 +02:00