search

S5-VR-Game / game

2 stars 0 forks source link

[CODE]-[UI]-[ENV] manual merge of ui_progress, game_code and environment_test #43

Closed JudiTeller closed 11 months ago

JudiTeller commented 11 months ago

This PR manually merged the following branches:

these branches can be now deleted, or reused

Only one merge conflict occurred in DoorController.cs field distance, which was non-breaking.

Also, the folder structure was refactored to match our discussed ideal.

JonasPTFL commented 11 months ago

Looks good to me, except the namespaces of the script files did not match the new folder structure. I corrected the namespaces in my last commit.