16 Commits
Author SHA1 Message Date
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
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
SemvdH 8835646e32 Merge pull request #5 from SemvdH/mergebranch-Jasper
Mergebranch jasper into develop
2021-06-11 10:27:46 +02:00
SemvdH ab7123b89a Merge branch 'develop' into mergebranch-Jasper 2021-06-11 10:27:30 +02:00
SemvdH dbecbb594e Merge pull request #4 from SemvdH/feature/point-count
point count into develop
2021-06-11 10:18:31 +02:00
SemvdH 38d3c6e5cb Merge branch 'develop' into feature/point-count 2021-06-11 10:18:11 +02:00
SemvdH 71761dd322 Merge pull request #3 from SemvdH/feature/MovementCharacter
Feature/movement character into develop
2021-06-11 10:16:39 +02:00
SemvdH eaab85ac33 Merge branch 'develop' into feature/MovementCharacter 2021-06-11 10:14:12 +02:00
SemvdH cca8680a98 Merge pull request #2 from SemvdH/feature/house-generation
Feature/house generation into develop
2021-06-11 10:05:23 +02:00
SemvdH 4e9e534c02 Merge branch 'develop' into feature/house-generation 2021-06-11 10:05:11 +02:00
SemvdH 73538d9a93 Update .gitignore 2021-05-18 10:19:19 +02:00
SemvdH 9b3622ea15 Initial commit 2021-05-18 10:18:28 +02:00