sem/SDBA

Go to file

$DESKTOP-EBR7IVA\kimve$ 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

lib

[REMOVE] docs folders from tracking

2021-05-18 14:00:41 +02:00

res

Merge branch 'develop' into mergebranch-Jasper

2021-06-11 10:27:30 +02:00

src

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

2021-06-18 13:57:34 +02:00

.gitignore

[ADDED] simple house generation

2021-06-04 14:32:16 +02:00

README.md

Initial commit

2021-05-18 10:18:28 +02:00

SDBA.sln

[ADD] template project with correct name

2021-05-18 10:33:08 +02:00

wk2_fps.vcxproj

[WIP] Collision detectie moet nog worden egimplementeerd om naar game over screen te gaan

2021-06-11 16:49:09 +02:00

wk2_fps.vcxproj.filters

[WIP] Collision detectie moet nog worden egimplementeerd om naar game over screen te gaan

2021-06-11 16:49:09 +02:00

README.md

SDBA

Small Dude, Big Adventure. A 3D graphics Computer vision project