Go to file
nooahe a42f89e1b7 Merge branch 'marlon' into Noah
* marlon:
  final merged project marlon + chrigi working sweet and smooth <3
  backup before merge with chrigi
  final marlon scene before merge with christoph
  newest working version marlon 10.0 sheesh
  newest version marlon
  almost perfect version!

# Conflicts:
#	Assets/Assets/00_Shared/05_Scripts/SceneChanger.asset
#	Assets/Samples/XR Interaction Toolkit/2.0.3/Starter Assets/XRI Default Input Actions.inputactions
#	ProjectSettings/ProjectSettings.asset
#	ProjectSettings/TagManager.asset
2023-01-19 09:28:04 +01:00
Assets Merge branch 'marlon' into Noah 2023-01-19 09:28:04 +01:00
Packages Merge branch 'marlon' into Noah 2023-01-09 15:48:59 +01:00
ProjectSettings final merged project marlon + chrigi working sweet and smooth <3 2023-01-18 18:29:30 +01:00
.gitignore init 2022-12-06 15:12:25 +01:00
README - Kopie.md Revert "Readme rausgelöscht" 2022-12-06 16:41:57 +01:00
README.md init 2022-12-06 15:12:25 +01:00

README.md

Mission_Rosetta_XR

VR Project
Major XR FHGR
MMP20 Zuerich
MMP20 Bern

Marlon Portmann
Christoph Blank
Noah Eckert

-----Important-----

Additional required files:
https://www.icloud.com/iclouddrive/014CejoeW_tzA-NH6PwK9VUEg#Mission%5FRosetta%5FXR%5FLocalFiles

Settings according to:
https://developer.oculus.com/documentation/unity/unity-conf-settings/

------Versions-----

Unity Version 2021.3.11f1

Packages:
XR Interaction Toolkit 2.0.3
Oculus XR Plugin 3.0.2
XR Plugin Management 4.2.1

Assets:
Oculus Integration 40.0