Commit Graph
16 Commits
Author SHA1 Message Date
nooahe f7cd9e324e Works all together - lots of updates 2023-01-19 15:19:40 +01:00
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
nooahe 22b5c4ed25 changed XR Origin to XR Origin Noah 2023-01-19 09:24:37 +01:00
nooahe 341b491d60 changed Scene file 2023-01-19 09:12:19 +01:00
nooahe 3bac025670 Allmost finished 2023-01-14 17:43:37 +01:00
nooahe 689a2fd387 finished overlay 2023-01-11 07:45:04 +01:00
nooahe d9892c4ff7 Commit befor Branch Change 2023-01-09 18:37:06 +01:00
nooahe f6ecdb8894 overlay Clickable 2023-01-09 18:20:42 +01:00
nooahe a86e27ed2a Merge branch 'marlon' into Noah
* marlon:
  marlon neuster branch. workt!!
  fully functioning marlon-branch. sick!
  blabla
  various additions sick.
  a looot of changes!
  marlon file setup
  Revert "Readme rausgelöscht"
  Readme rausgelöscht
  neues Readme test

# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2023-01-09 15:48:59 +01:00
nooahe 283ea8b21a changed aaalooot 2023-01-07 09:37:07 +01:00
nooahe 73fe43117d added particle systems and changed camera angle 2022-12-28 19:50:07 +01:00
nooahe 90969eeb7e added particle systems 2022-12-28 17:39:20 +01:00
nooahe dd1c23da48 generated Lightmaps and added general Logic with Text 2022-12-28 16:18:44 +01:00
nooahe b770933d9c deleted readme kopie 2022-12-06 16:56:26 +01:00
nooahe 05a9130825 added readme 2022-12-06 16:53:52 +01:00
nooahe b7da35f8a3 init 2022-12-06 15:12:25 +01:00