Merge branch '4.26' into feature/remove_n_display_dependency
# Conflicts: # Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp # Source/RWTHVRToolkit/Public/Utility/VirtualRealityUtilities.h
No related branches found
No related tags found
Showing
- Content/Calibratio/CalibratioHud.uasset 0 additions, 0 deletionsContent/Calibratio/CalibratioHud.uasset
- Content/Calibratio/CalibratioMaterial.uasset 0 additions, 0 deletionsContent/Calibratio/CalibratioMaterial.uasset
- Content/Calibratio/Cylinder.uasset 0 additions, 0 deletionsContent/Calibratio/Cylinder.uasset
- RWTHVRToolkit.uplugin 5 additions, 0 deletionsRWTHVRToolkit.uplugin
- Source/Calibratio/Calibratio.Build.cs 32 additions, 0 deletionsSource/Calibratio/Calibratio.Build.cs
- Source/Calibratio/Private/Calibratio.cpp 55 additions, 0 deletionsSource/Calibratio/Private/Calibratio.cpp
- Source/Calibratio/Private/CalibratioActor.cpp 323 additions, 0 deletionsSource/Calibratio/Private/CalibratioActor.cpp
- Source/Calibratio/Private/CalibratioOverlay.cpp 60 additions, 0 deletionsSource/Calibratio/Private/CalibratioOverlay.cpp
- Source/Calibratio/Public/Calibratio.h 20 additions, 0 deletionsSource/Calibratio/Public/Calibratio.h
- Source/Calibratio/Public/CalibratioActor.h 70 additions, 0 deletionsSource/Calibratio/Public/CalibratioActor.h
- Source/Calibratio/Public/CalibratioOverlay.h 78 additions, 0 deletionsSource/Calibratio/Public/CalibratioOverlay.h
- Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp 3 additions, 12 deletions...kit/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp
- Source/RWTHVRToolkit/Private/Cluster/ClusterConsole.cpp 1 addition, 1 deletionSource/RWTHVRToolkit/Private/Cluster/ClusterConsole.cpp
- Source/RWTHVRToolkit/Private/Fixes/ActivateConsoleInShipping.cpp 24 additions, 0 deletions...RWTHVRToolkit/Private/Fixes/ActivateConsoleInShipping.cpp
- Source/RWTHVRToolkit/Private/Fixes/FixNDisplayStereoDevice.cpp 0 additions, 34 deletions...e/RWTHVRToolkit/Private/Fixes/FixNDisplayStereoDevice.cpp
- Source/RWTHVRToolkit/Private/RWTHVRToolkit.cpp 2 additions, 2 deletionsSource/RWTHVRToolkit/Private/RWTHVRToolkit.cpp
- Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp 7 additions, 4 deletions...RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp
- Source/RWTHVRToolkit/Public/Fixes/ActivateConsoleInShipping.h 24 additions, 0 deletions...ce/RWTHVRToolkit/Public/Fixes/ActivateConsoleInShipping.h
- Source/RWTHVRToolkit/Public/Fixes/FixNDisplayStereoDevice.h 0 additions, 33 deletionsSource/RWTHVRToolkit/Public/Fixes/FixNDisplayStereoDevice.h
- Source/RWTHVRToolkit/Public/RWTHVRToolkit.h 2 additions, 2 deletionsSource/RWTHVRToolkit/Public/RWTHVRToolkit.h
Loading
Please register or sign in to comment