Compare commits

merge into: sem:develop

Branches Tags

sem:main sem:develop sem:temp-end sem:feature/house_empty sem:feature/game_logic/collisionFix sem:feature/auto-calibration sem:feature/random_levels sem:feature/game_logic/point_system sem:feature/number-from-images sem:feature/calibration sem:feature/menu sem:feature/pause-menu sem:feature/async-computervision sem:feature/automatic-rendering sem:feature/Start-scene sem:feature/improve-hand-detection sem:feature/rendering-engine-expansion sem:feature/timer sem:BUGGED/pose-detection sem:feature/collision sem:feature/adding_scenes sem:feature/pose-detection-fix sem:feature/scenes sem:feature/objectdetection sem:feature/comments sem:feature/computervision sem:feature/custom-rendering

...

pull from: sem:main

Branches Tags

sem:main sem:develop sem:temp-end sem:feature/house_empty sem:feature/game_logic/collisionFix sem:feature/auto-calibration sem:feature/random_levels sem:feature/game_logic/point_system sem:feature/number-from-images sem:feature/calibration sem:feature/menu sem:feature/pause-menu sem:feature/async-computervision sem:feature/automatic-rendering sem:feature/Start-scene sem:feature/improve-hand-detection sem:feature/rendering-engine-expansion sem:feature/timer sem:BUGGED/pose-detection sem:feature/collision sem:feature/adding_scenes sem:feature/pose-detection-fix sem:feature/scenes sem:feature/objectdetection sem:feature/comments sem:feature/computervision sem:feature/custom-rendering

2 Commits

develop ... main

Author	SHA1	Message	Date
SemvdH	85f341e576	Merge pull request #9 from SemvdH/develop ... Develop into master	2021-06-18 17:56:41 +02:00
SemvdH	c4e8c1bba2	Merge pull request #1 from SemvdH/develop ... merge Develop into main after sprint 1	2021-06-02 11:02:26 +02:00

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Expand all files Collapse all files

Diff Content Not Available