Commit f460785a authored 6 months ago by mhby1g21

Merge branch 'readding-premade-rooms-ui' into 'main'

working premade rooms ui, also exportable as .exe (works)

See merge request !9

parents ee1cdac7 67fe1a8e

No related branches found

No related tags found

1 merge request!9working premade rooms ui, also exportable as .exe (works)

Show whitespace changes

Inline Side-by-side

Showing

AVVR/Assets/Prefabs/Complete XR Origin Set Up Variant AVVR.prefab 1274 additions, 0 deletions

...ets/Prefabs/Complete XR Origin Set Up Variant AVVR.prefab
AVVR/Assets/Prefabs/Complete XR Origin Set Up Variant AVVR.prefab.meta 1 addition, 1 deletion

...refabs/Complete XR Origin Set Up Variant AVVR.prefab.meta
AVVR/Assets/Prefabs/InteractableAudioSource.prefab 3 additions, 3 deletions

AVVR/Assets/Prefabs/InteractableAudioSource.prefab
AVVR/Assets/Prefabs/XR Origin (XR Rig) Variant.prefab 0 additions, 237 deletions

AVVR/Assets/Prefabs/XR Origin (XR Rig) Variant.prefab
AVVR/Assets/Resources/Materials/AudioSourceMaterial.mat 6 additions, 1 deletion

AVVR/Assets/Resources/Materials/AudioSourceMaterial.mat
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Materials/Concrete Dark Blue.mat 5 additions, 10 deletions

...r Assets/DemoSceneAssets/Materials/Concrete Dark Blue.mat
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Materials/Concrete Grey.mat 6 additions, 10 deletions

...tarter Assets/DemoSceneAssets/Materials/Concrete Grey.mat
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Materials/Concrete Light Blue.mat 5 additions, 10 deletions

... Assets/DemoSceneAssets/Materials/Concrete Light Blue.mat
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Materials/Lit White.mat 5 additions, 10 deletions

....3/Starter Assets/DemoSceneAssets/Materials/Lit White.mat
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Models/Primitive_Blaster.fbx 0 additions, 0 deletions

...arter Assets/DemoSceneAssets/Models/Primitive_Blaster.fbx
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Models/Primitive_Blaster_Long.fbx 0 additions, 0 deletions

... Assets/DemoSceneAssets/Models/Primitive_Blaster_Long.fbx
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Models/Primitive_Cylinder.fbx 0 additions, 0 deletions

...rter Assets/DemoSceneAssets/Models/Primitive_Cylinder.fbx
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx 0 additions, 0 deletions

...arter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Models/Primitive_Tapered_Cylinder.fbx 0 additions, 0 deletions

...ets/DemoSceneAssets/Models/Primitive_Tapered_Cylinder.fbx
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx 0 additions, 0 deletions

...Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Models/Primitive_Torus_Cut.fbx 0 additions, 0 deletions

...ter Assets/DemoSceneAssets/Models/Primitive_Torus_Cut.fbx
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/DemoSceneAssets/Models/PushButton.fbx 0 additions, 0 deletions

....0.3/Starter Assets/DemoSceneAssets/Models/PushButton.fbx
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Materials/Controller_Grey.mat 5 additions, 10 deletions

...oolkit/3.0.3/Starter Assets/Materials/Controller_Grey.mat
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Materials/Controller_White.mat 5 additions, 10 deletions

...olkit/3.0.3/Starter Assets/Materials/Controller_White.mat
AVVR/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Materials/FresnelHighlight.mat 4 additions, 6 deletions

...olkit/3.0.3/Starter Assets/Materials/FresnelHighlight.mat

with 1319 additions and 308 deletions

Please register or to comment