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

737de804

Commit 737de804 authored 4 months ago by wiepke

Downloads
- Plain Diff

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/Enable_hardcoded_presentation_for_French_Class' into CleaningDevelopment

parents 51d526a0 4927ae7f

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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

Assets/Scenes/MediaRoom.unity
Assets/StreamingAssets/Config~/theme/achterMai/presentation/tagDerBefreiung.jpg 0 additions, 0 deletions

.../Config~/theme/achterMai/presentation/tagDerBefreiung.jpg
Assets/StreamingAssets/Config~/theme/achterMai/presentation/tagDerNiederlage.jpg 0 additions, 0 deletions

...Config~/theme/achterMai/presentation/tagDerNiederlage.jpg
Packages/com.unity.xr/Runtime/Settings/Open XR Package Settings.asset 2 additions, 2 deletions

....unity.xr/Runtime/Settings/Open XR Package Settings.asset
Packages/vr.teachr.displays/Runtime/Scripts/Presentation.cs 6 additions, 0 deletions

Packages/vr.teachr.displays/Runtime/Scripts/Presentation.cs
Packages/vr.teachr.displays/Runtime/Scripts/PresentationController.cs 28 additions, 0 deletions

...teachr.displays/Runtime/Scripts/PresentationController.cs
Packages/vr.teachr.displays/TeachR.Displays.asmdef 2 additions, 1 deletion

Packages/vr.teachr.displays/TeachR.Displays.asmdef
Packages/vr.teachr.structuretree/Runtime/Scripts/ImpulseController.cs 12 additions, 21 deletions

...teachr.structuretree/Runtime/Scripts/ImpulseController.cs

with 52 additions and 26 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