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 |
|