Merge branch 'develop' into feature/house-generation

This commit is contained in:
SemvdH
2021-06-11 10:05:11 +02:00
committed by GitHub
25 changed files with 5937 additions and 156 deletions

View File

@@ -8,6 +8,7 @@ namespace scene
{
private:
scene::Scenes return_value = scene::Scenes::INGAME;
void update_hand_detection();
public:
In_Game_Scene();