Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

VR-Klassenzimmer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Container Registry
- Model registry
- Incidents
- Contributor analytics
- Model experiments

Snippets Groups Projects

bdc4a834

Commit bdc4a834 authored 1 month ago by wiepke

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/144-inpenetratablewalls' into FrenchExperiment

# Conflicts:
#	Assets/Scenes/MediaRoom.unity

parents ae4c2b8a 8177f495

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/XRI Default Input Actions.inputactions 1 addition, 1 deletion

...0.4/Starter Assets/XRI Default Input Actions.inputactions
Assets/Scenes/MediaRoom.unity 2 additions, 2 deletions

Assets/Scenes/MediaRoom.unity
Assets/Scenes/PreviewRooms.unity 2 additions, 2 deletions

Assets/Scenes/PreviewRooms.unity
Assets/WallOffset.cs 65 additions, 0 deletions

Assets/WallOffset.cs
Assets/WallOffset.cs.meta 2 additions, 0 deletions

Assets/WallOffset.cs.meta
ProjectSettings/TagManager.asset 1 addition, 0 deletions

ProjectSettings/TagManager.asset

with 73 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment