Commit Graph

9 Commits

Author SHA1 Message Date
Sem van der Hoeven
7c3d68a742 [ADD] hand detection in startup scene 2021-06-18 17:15:26 +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
b04d999a7d [FIX] merge stuff 2021-06-18 15:49:10 +02:00
DESKTOP-EBR7IVA\kimve
b92c0c74eb no message 2021-06-18 15:08:08 +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
DESKTOP-EBR7IVA\kimve
022c7eb1f0 [WIP] collision fixing 2021-06-18 11:20:24 +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