Skip to content
Snippets Groups Projects
Commit 02ab0e9c authored by Daniel Rupp's avatar Daniel Rupp
Browse files

Merge branch 'dev/5.3' of...

parents 34691cfb dc57f757
Branches
Tags
2 merge requests!80UE5.3-2023.1-rc2,!56feature(Interaction): improve grabbing
Pipeline #332958 failed
This commit is part of merge request !56. Comments created here will be created in the context of that merge request.
Showing
with 69 additions and 5 deletions
---
Language: Cpp
BasedOnStyle: LLVM
AccessModifierOffset: -4
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignOperands: false
AlignTrailingComments: false
AlwaysBreakTemplateDeclarations: Yes
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterStruct: true
AfterUnion: true
AfterExternBlock: false
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: true
BeforeWhile: true
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBraces: Custom
BreakConstructorInitializers: AfterColon
ColumnLimit: 120
SortIncludes: false
PointerAlignment: Left
IndentCaseBlocks: true
IndentWidth: 4
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 2
NamespaceIndentation: All
SpacesInAngles: false
TabWidth: 4
UseTab: Always
...
......@@ -38,10 +38,32 @@ include:
# with a generated project.
stages:
- analyze
- generate
- build
- deploy
clang-format:
image: registry.git-ce.rwth-aachen.de/vr-vis/vr-group/unreal-development/plugins/rwth-vr-toolkit/alpine-analyze:latest
tags:
- docker-executor
- linux
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
variables:
GIT_STRATEGY: fetch
GIT_CHECKOUT: "true"
GIT_DEPTH: "2"
stage: analyze
allow_failure: false
script:
- clang-format --version
- git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME --depth 1
- 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)
- echo "$linter_errors"
- if [ ! -z "$linter_errors" ]; then echo "Detected formatting issues; please fix"; exit 1; else echo "Formatting is correct"; exit 0; fi
Generate_Project:
only: ['web', 'schedules']
extends: .Generate_Project_
......@@ -49,7 +71,7 @@ Generate_Project:
RUN_SETUP: "false"
GEN_TEMPLATE_BRANCH: "5.3"
GEN_DEPENDENCIES: "(
[develop@UnrealDTrackPlugin]='https://github.com/VRGroupRWTH/UnrealDTrackPlugin.git')"
[master@UnrealDTrackPlugin]='https://github.com/VRGroupRWTH/UnrealDTrackPlugin.git')"
Build_Windows:
......@@ -91,8 +113,7 @@ Deploy_Windows:
Deploy_CAVE:
only: ['web', 'schedules']
extends: .Deploy_CAVE_
extends: .Deploy_vrdemo_
needs:
- job: "Build_Linux"
artifacts: true
[CoreRedirects]
+PackageRedirects=(OldName="/nDisplayExtensions",NewName="/RWTHVRToolkit",MatchSubstring=true)
+PackageRedirects=(OldName="/DisplayClusterExtensions",NewName="/RWTHVRToolkit",MatchSubstring=true)
\ No newline at end of file
+ClassRedirects=(OldName="/Script/RWTHVRToolkit.VirtualRealityPawn",NewName="/Script/RWTHVRToolkit.RWTHVRPawn")
+ClassRedirects=(OldName="/Script/RWTHVRToolkit.VRPawnMovement",NewName="/Script/RWTHVRToolkit.CollisionHandlingMovement")
+StructRedirects=(OldName="/Script/RWTHVRToolkit.VRTransformRep",NewName="/Script/RWTHVRToolkit.ReplicatedTransform")
+ClassRedirects=(OldName="/Script/RWTHVRToolkit.VRWidgetInteractionComponent",NewName="/Script/RWTHVRToolkit.RWTHVRWidgetInteractionComponent")
\ No newline at end of file
No preview for this file type
No preview for this file type
No preview for this file type
File added
No preview for this file type
File deleted
File added
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment