eckertnoah/Mission_Rosetta_2
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2025-03-06. You can view files and clone it, but cannot push or open issues or pull requests.
Mission_Rosetta_2/Assets
History
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
Plugins
init
2022-12-06 15:12:25 +01:00
Resources
init
2022-12-06 15:12:25 +01:00
Samples
finished overlay
2023-01-11 07:45:04 +01:00
TextMesh Pro
init
2022-12-06 15:12:25 +01:00
Unity.VisualScripting.Generated
newest working version marlon 10.0 sheesh
2023-01-10 17:11:44 +01:00
XR
init
2022-12-06 15:12:25 +01:00
XRI
overlay Clickable
2023-01-09 18:20:42 +01:00
Assets.meta
init
2022-12-06 15:12:25 +01:00
CheatPhilae.anim
Allmost finished
2023-01-14 17:43:37 +01:00
CheatPhilae.anim.meta
Allmost finished
2023-01-14 17:43:37 +01:00
Fade.controller
Allmost finished
2023-01-14 17:43:37 +01:00
Fade.controller.meta
Allmost finished
2023-01-14 17:43:37 +01:00
Oculus.meta
init
2022-12-06 15:12:25 +01:00
PhilaeLanding.anim
Allmost finished
2023-01-14 17:43:37 +01:00
PhilaeLanding.anim.meta
Allmost finished
2023-01-14 17:43:37 +01:00
Plugins.meta
init
2022-12-06 15:12:25 +01:00
Resources.meta
init
2022-12-06 15:12:25 +01:00
Samples.meta
init
2022-12-06 15:12:25 +01:00
SetClickedLetter.asset
finished overlay
2023-01-11 07:45:04 +01:00
SetClickedLetter.asset.meta
Merge branch 'marlon' into Noah
2023-01-09 15:48:59 +01:00
TextMesh Pro.meta
init
2022-12-06 15:12:25 +01:00
Unity.VisualScripting.Generated.meta
init
2022-12-06 15:12:25 +01:00
UniversalRenderPipelineGlobalSettings.asset
init
2022-12-06 15:12:25 +01:00
UniversalRenderPipelineGlobalSettings.asset.meta
init
2022-12-06 15:12:25 +01:00
video screen right 1.mat
various additions sick.
2022-12-27 15:44:03 +01:00
video screen right 1.mat.meta
various additions sick.
2022-12-27 15:44:03 +01:00
video screen right.mat
various additions sick.
2022-12-27 15:44:03 +01:00
video screen right.mat.meta
various additions sick.
2022-12-27 15:44:03 +01:00
XR.meta
init
2022-12-06 15:12:25 +01:00
XRI.meta
init
2022-12-06 15:12:25 +01:00