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

Merge branch 'feature/game_logic/collisionFix' into feature/game_logic/game_over

Browse Source 
* feature/game_logic/collisionFix:
  [FIXED] collisions
  [WIP] collision fixing

# Conflicts:
#	src/scenes/game_Over_Scene.cpp
#	src/scenes/in_Game_Scene.cpp
This commit is contained in:
DESKTOP-EBR7IVA\kimve
2021-06-18 13:57:34 +02:00
parent 824f9a2433 c0a099a05e
commit 5419801113
12 changed files with 78 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scenes/game_Over_Scene.cpp
View File

@@ -193,7 +193,7 @@ namespace scene
{
if (glfwGetKey(window, GLFW_KEY_SPACE) == GLFW_PRESS)
{
return_value = scene::Scenes::STARTUP;
//return_value = scene::Scenes::STARTUP;
cv::destroyWindow("camera");
}
else if (glfwGetKey(window, GLFW_KEY_BACKSPACE) == GLFW_PRESS) {