Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 4.21
  • 4.22
  • 4.26
  • 4.27
  • 5.0
  • 5.3
  • 5.4
  • 5.5
  • IntenSelect5.3
  • _IntenSelect5.3
  • dev/5.3_downgrade
  • dev/5.4
  • dev/5.5
  • feature/experimenttime_hack
  • UE5.3-2023.1-rc
  • UE5.3-2023.1-rc2
  • UE5.3-2023.1-rc3
  • UE5.4-2024.1
  • UE5.4-2024.1-rc1
19 results

Target

Select target project
  • vr-vis/VR-Group/unreal-development/plugins/rwth-vr-toolkit
  • daniel.rupp/rwth-vr-toolkit
2 results
Select Git revision
  • 4.21
  • 4.22
  • 4.26
  • 4.27
  • 5.0
  • 5.3
  • ReworkedToolkit
  • TempNav
  • dev/5.1
  • dev/5.2
  • dev/5.3
  • feature/make_interaction_ray_accesible
  • feature/scaleAndHeightTeleport
  • feature/scaleTeleport
  • fix/DisplayClusterTemplateCode
  • fix_5.3/DisplayClusterTemplateFix
16 results
Show changes
Commits on Source (178)
Showing
with 65 additions and 15 deletions
...@@ -3,6 +3,30 @@ ...@@ -3,6 +3,30 @@
# Virtual Reality & Immersive Visualisation Group. # Virtual Reality & Immersive Visualisation Group.
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
spec:
inputs:
unreal_version:
description: The Unreal Engine version in the form of "major.minor"
type: string
regex: \d+\.\d+
default: "5.4"
build_type:
description: The game build type.
type: string
options: ["DebugGame", "Shipping"]
default: "DebugGame"
number_of_old_versions:
description: How many successful pipeline builds of this branch should be stored on the cluster.
type: number
default: 3
custom_ndisplay_config:
description: Custom nDisplay config stored on the cluster filesystem.
type: string
default: ""
---
# The include file can be change to either be removed or reference a specific commit. # The include file can be change to either be removed or reference a specific commit.
include: include:
...@@ -38,9 +62,12 @@ include: ...@@ -38,9 +62,12 @@ include:
# with a generated project. # with a generated project.
# #
# Use the UNREAL_VERSION variable to adjust to your preferred Unreal version. # Use the UNREAL_VERSION variable to adjust to your preferred Unreal version.
# Use the CUSTOM_NDISPLAY_CONFIG variable in case you need a custom ndisplay config. These are always located in /home/vrdemo/configs/ndisplay.
variables: variables:
UNREAL_VERSION: "5.3" UNREAL_VERSION: $[[ inputs.unreal_version ]]
NUMBER_OF_OLD_VERSIONS: $[[ inputs.number_of_old_versions ]]
CUSTOM_NDISPLAY_CONFIG: $[[ inputs.custom_ndisplay_config ]]
stages: stages:
- analyze - analyze
...@@ -49,7 +76,7 @@ stages: ...@@ -49,7 +76,7 @@ stages:
- deploy - deploy
clang-format: clang-format:
image: registry.git-ce.rwth-aachen.de/vr-vis/vr-group/unreal-development/plugins/rwth-vr-toolkit/alpine-analyze:latest image: registry.git-ce.rwth-aachen.de/vr-vis/vr-group/alpine-analyze:latest
tags: tags:
- docker-executor - docker-executor
- linux - linux
...@@ -67,7 +94,7 @@ clang-format: ...@@ -67,7 +94,7 @@ clang-format:
- echo $CI_MERGE_REQUEST_DIFF_BASE_SHA - echo $CI_MERGE_REQUEST_DIFF_BASE_SHA
- linter_errors=$(unbuffer git-clang-format --commit "$CI_MERGE_REQUEST_DIFF_BASE_SHA" *.h *.cpp -q --diff | grep -v --color=always "no modified files to format" || true) - linter_errors=$(unbuffer git-clang-format --commit "$CI_MERGE_REQUEST_DIFF_BASE_SHA" *.h *.cpp -q --diff | grep -v --color=always "no modified files to format" || true)
- echo "$linter_errors" - echo "$linter_errors"
- if [ ! -z "$linter_errors" ]; then echo "Detected formatting issues; please fix"; exit 1; else echo "Formatting is correct"; exit 0; fi - if [ ! -z "$linter_errors" ]; then echo "Detected formatting issues; please fix. Make sure you are using the same clang-format version! You can download it from the development section in this repo's wiki."; exit 1; else echo "Formatting is correct"; exit 0; fi
Generate_Project: Generate_Project:
rules: rules:
...@@ -80,8 +107,21 @@ Generate_Project: ...@@ -80,8 +107,21 @@ Generate_Project:
variables: variables:
RUN_SETUP: "false" RUN_SETUP: "false"
GEN_DEPENDENCIES: "( GEN_DEPENDENCIES: "(
[master@UnrealDTrackPlugin]='https://github.com/VRGroupRWTH/UnrealDTrackPlugin.git')" [master@UnrealDTrackPlugin]='https://github.com/VRGroupRWTH/UnrealDTrackPlugin.git'
[dev/5.4@RWTHVRCluster]='https://git-ce.rwth-aachen.de/vr-vis/VR-Group/unreal-development/plugins/rwth-vr-cluster-plugin.git'
)"
Generate_Project_Without_Cluster:
extends: Generate_Project
variables:
GEN_DEPENDENCIES: "(
[master@UnrealDTrackPlugin]='https://github.com/VRGroupRWTH/UnrealDTrackPlugin.git'
)"
script: # if we don't do this, cooking will for some reason fail even though it should use the correct fallback
- !reference [Generate_Project, script]
- echo "Generating without cluster mode, removing nDisplay configs..."
- cd ${CI_PROJECT_DIR}
- sed -i '/DisplayCluster/d' Config/Linux/LinuxEngine.ini
Build_Windows: Build_Windows:
rules: rules:
...@@ -98,7 +138,7 @@ Build_Windows: ...@@ -98,7 +138,7 @@ Build_Windows:
GIT_STRATEGY: none GIT_STRATEGY: none
GIT_CHECKOUT: "false" GIT_CHECKOUT: "false"
# CLIENT_CONFIG: "Shipping" # CLIENT_CONFIG: "Shipping"
CLIENT_CONFIG: "DebugGame" CLIENT_CONFIG: $[[ inputs.build_type ]]
needs: needs:
- job: "Generate_Project" - job: "Generate_Project"
artifacts: true artifacts: true
...@@ -119,21 +159,20 @@ Build_Linux: ...@@ -119,21 +159,20 @@ Build_Linux:
GIT_STRATEGY: none GIT_STRATEGY: none
GIT_CHECKOUT: "false" GIT_CHECKOUT: "false"
# CLIENT_CONFIG: "Shipping" # CLIENT_CONFIG: "Shipping"
CLIENT_CONFIG: "DebugGame" CLIENT_CONFIG: $[[ inputs.build_type ]]
needs: needs:
- job: "Generate_Project" - job: "Generate_Project"
artifacts: true artifacts: true
# Deploys to vrdev
Deploy_Windows: # Builds for linux without the cluster plugin
rules: Build_Linux_Without_Cluster:
- if: $CI_PIPELINE_SOURCE == "web" extends: Build_Linux
- if: $CI_PIPELINE_SOURCE == "schedule"
extends: .Deploy_VRDev_
needs: needs:
- job: "Build_Windows" - job: "Generate_Project_Without_Cluster"
artifacts: true artifacts: true
# Deploys to vrdemo instead of av006de. Use extends: .Deploy_CAVE_ to deploy to legacy av006de # Deploys to vrdemo instead of av006de. Use extends: .Deploy_CAVE_ to deploy to legacy av006de
Deploy_CAVE: Deploy_CAVE:
rules: rules:
......
...@@ -19,3 +19,14 @@ ...@@ -19,3 +19,14 @@
+FunctionRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnEndGrab",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnEndInteraction") +FunctionRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnEndGrab",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnEndInteraction")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousGrabBehavioursInRange",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousInteractableComponentsInRange") +PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousGrabBehavioursInRange",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousInteractableComponentsInRange")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.CurrentGrabBehavioursInRange",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.CurrentInteractableComponentsInRange") +PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.CurrentGrabBehavioursInRange",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.CurrentInteractableComponentsInRange")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.TurnComponent.DesktopRotation",NewName="/Script/RWTHVRToolkit.TurnComponent.DesktopTurnCondition")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.TurnComponent.Turn",NewName="/Script/RWTHVRToolkit.TurnComponent.XRTurn")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.RWTHVRWidgetInteractionComponent.WidgetClickInputAction",NewName="/Script/RWTHVRToolkit.RWTHVRWidgetInteractionComponent.WidgetLeftClickInputAction")
+FunctionRedirects = (OldName="/Script/RWTHVRToolkit.RWTHVRWidgetInteractionComponent.OnBeginClick",NewName="/Script/RWTHVRToolkit.RWTHVRWidgetInteractionComponent.OnBeginLeftClick")
+FunctionRedirects = (OldName="/Script/RWTHVRToolkit.RWTHVRWidgetInteractionComponent.OnEndClick",NewName="/Script/RWTHVRToolkit.RWTHVRWidgetInteractionComponent.OnEndLeftClick")
+FunctionRedirects=(OldName="/Script/RWTHVRToolkit.UBaseInteractionComponent.OnBeginInteraction",NewName="/Script/RWTHVRToolkit.UBaseInteractionComponent.OnBeginInteractionInputAction")
+FunctionRedirects=(OldName="/Script/RWTHVRToolkit.UBaseInteractionComponent.OnEndInteraction",NewName="/Script/RWTHVRToolkit.UBaseInteractionComponent.OnEndInteractionInputAction")
+FunctionRedirects=(OldName="/Script/RWTHVRToolkit.UBaseInteractionComponent.MulticastHoverBehaviourStartRpc",NewName="/Script/RWTHVRToolkit.UBaseInteractionComponent.MulticastHoverBehaviourReplicationStartRpc")
+FunctionRedirects=(OldName="/Script/RWTHVRToolkit.UBaseInteractionComponent.MulticastActionBehaviourStartRpc",NewName="/Script/RWTHVRToolkit.UBaseInteractionComponent.MulticastActionBehaviourReplicationStartRpc")
+FunctionRedirects=(OldName="/Script/RWTHVRToolkit.ActionBehaviour.OnActionStart",NewName="/Script/RWTHVRToolkit.ActionBehaviour.OnActionEvent")
+PropertyRedirects=(OldName="/Script/RWTHVRToolkit.ActionBehaviour.OnActionBeginEvent",NewName="/Script/RWTHVRToolkit.ActionBehaviour.OnActionEventEvent")
\ No newline at end of file
No preview for this file type
No preview for this file type
File deleted
File added
File added
No preview for this file type
File added
File deleted
File deleted