diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..83653c4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Builds diff --git a/StadlerMessestand/Config/DefaultEngine.ini b/StadlerMessestand/Config/DefaultEngine.ini index 7866ff8..39756b0 100644 --- a/StadlerMessestand/Config/DefaultEngine.ini +++ b/StadlerMessestand/Config/DefaultEngine.ini @@ -4,14 +4,14 @@ +EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore))) [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/FirstPerson/Maps/FirstPersonMap.FirstPersonMap +EditorStartupMap=/Game/Stadler_Messestand/MAPS/Stadler_Messestand.Stadler_Messestand LocalMapOptions= TransitionMap= bUseSplitscreen=True TwoPlayerSplitscreenLayout=Horizontal ThreePlayerSplitscreenLayout=FavorTop GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Game/FirstPerson/Maps/FirstPersonMap.FirstPersonMap +GameDefaultMap=/Game/Stadler_Messestand/MAPS/Stadler_Messestand.Stadler_Messestand ServerDefaultMap=/Engine/Maps/Entry GlobalDefaultGameMode=/Game/FirstPerson/Blueprints/BP_FirstPersonGameMode.BP_FirstPersonGameMode_C GlobalDefaultServerGameMode=None @@ -23,11 +23,8 @@ r.DynamicGlobalIlluminationMethod=1 r.Mobile.EnableNoPrecomputedLightingCSMShader=1 r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=true - r.Shadow.Virtual.Enable=1 - r.DefaultFeature.LocalExposure.HighlightContrastScale=0.8 - r.DefaultFeature.LocalExposure.ShadowContrastScale=0.8 r.MobileHDR=True r.Mobile.ShadingPath=1 @@ -76,6 +73,9 @@ AppliedDefaultGraphicsPerformance=Maximum +ActiveGameNameRedirects=(OldGameName="TP_FirstPersonBP",NewGameName="/Script/StadlerMessestand") +ActiveGameNameRedirects=(OldGameName="/Script/TP_FirstPersonBP",NewGameName="/Script/StadlerMessestand") GenerateDefaultTimecodeFrameRate=(Numerator=30,Denominator=1) +GameEngine=/Script/DisplayCluster.DisplayClusterGameEngine +UnrealEdEngine=/Script/DisplayClusterEditor.DisplayClusterEditorEngine +GameViewportClientClassName=/Script/DisplayCluster.DisplayClusterViewportClient [/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings] bEnablePlugin=True diff --git a/StadlerMessestand/Config/DefaultInput.ini b/StadlerMessestand/Config/DefaultInput.ini index 8961f6f..6266fb0 100644 --- a/StadlerMessestand/Config/DefaultInput.ini +++ b/StadlerMessestand/Config/DefaultInput.ini @@ -109,7 +109,7 @@ DefaultViewportMouseCaptureMode=CapturePermanently_IncludingInitialMouseDown DefaultViewportMouseLockMode=LockOnCapture FOVScale=0.011110 DoubleClickTime=0.200000 -DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput +DefaultPlayerInputClass=/Script/DisplayCluster.DisplayClusterPlayerInput DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent DefaultTouchInterface=/Game/FirstPerson/Input/MobileControls.MobileControls -ConsoleKeys=Tilde diff --git a/StadlerMessestand/Config/Tags/VPRoles.ini b/StadlerMessestand/Config/Tags/VPRoles.ini new file mode 100644 index 0000000..0de2a86 --- /dev/null +++ b/StadlerMessestand/Config/Tags/VPRoles.ini @@ -0,0 +1,3 @@ +[/Script/GameplayTags.GameplayTagsList] +GameplayTagList=(Tag="Playout",DevComment="") + diff --git a/StadlerMessestand/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/StadlerMessestand/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 9b72c3a..48d090d 100644 Binary files a/StadlerMessestand/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset and b/StadlerMessestand/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset differ diff --git a/StadlerMessestand/Content/Stadler_Messestand/Blueprints/BP_TuioPawn.uasset b/StadlerMessestand/Content/Stadler_Messestand/Blueprints/BP_TuioPawn.uasset index 17a44ea..640aea9 100644 Binary files a/StadlerMessestand/Content/Stadler_Messestand/Blueprints/BP_TuioPawn.uasset and b/StadlerMessestand/Content/Stadler_Messestand/Blueprints/BP_TuioPawn.uasset differ diff --git a/StadlerMessestand/Content/Stadler_Messestand/MAPS/Stadler_Messestand.umap b/StadlerMessestand/Content/Stadler_Messestand/MAPS/Stadler_Messestand.umap index be6220c..5cbeb25 100644 Binary files a/StadlerMessestand/Content/Stadler_Messestand/MAPS/Stadler_Messestand.umap and b/StadlerMessestand/Content/Stadler_Messestand/MAPS/Stadler_Messestand.umap differ diff --git a/StadlerMessestand/Content/Stadler_Messestand/Materials/M_Leucht_white.uasset b/StadlerMessestand/Content/Stadler_Messestand/Materials/M_Leucht_white.uasset index 1af2553..5eac072 100644 Binary files a/StadlerMessestand/Content/Stadler_Messestand/Materials/M_Leucht_white.uasset and b/StadlerMessestand/Content/Stadler_Messestand/Materials/M_Leucht_white.uasset differ diff --git a/StadlerMessestand/Content/Stadler_Messestand/Widgets/Stand.uasset b/StadlerMessestand/Content/Stadler_Messestand/Widgets/Stand.uasset new file mode 100644 index 0000000..10f354b Binary files /dev/null and b/StadlerMessestand/Content/Stadler_Messestand/Widgets/Stand.uasset differ diff --git a/StadlerMessestand/Content/Stadler_Messestand/Widgets/Textures/HighresScreenshot00001.uasset b/StadlerMessestand/Content/Stadler_Messestand/Widgets/Textures/HighresScreenshot00001.uasset new file mode 100644 index 0000000..45aad94 Binary files /dev/null and b/StadlerMessestand/Content/Stadler_Messestand/Widgets/Textures/HighresScreenshot00001.uasset differ diff --git a/StadlerMessestand/Content/Stadler_Messestand/Widgets/Textures/HighresScreenshot_2024_12_04-14_36_36.uasset b/StadlerMessestand/Content/Stadler_Messestand/Widgets/Textures/HighresScreenshot_2024_12_04-14_36_36.uasset new file mode 100644 index 0000000..0050e5b Binary files /dev/null and b/StadlerMessestand/Content/Stadler_Messestand/Widgets/Textures/HighresScreenshot_2024_12_04-14_36_36.uasset differ diff --git a/StadlerMessestand/Content/Stadler_Messestand/nDisplay/NDC_DualMonitor.uasset b/StadlerMessestand/Content/Stadler_Messestand/nDisplay/NDC_DualMonitor.uasset new file mode 100644 index 0000000..cb286c6 Binary files /dev/null and b/StadlerMessestand/Content/Stadler_Messestand/nDisplay/NDC_DualMonitor.uasset differ diff --git a/StadlerMessestand/Content/Stadler_Messestand/nDisplay/Screen3DScene.uasset b/StadlerMessestand/Content/Stadler_Messestand/nDisplay/Screen3DScene.uasset new file mode 100644 index 0000000..1e12dbb Binary files /dev/null and b/StadlerMessestand/Content/Stadler_Messestand/nDisplay/Screen3DScene.uasset differ diff --git a/StadlerMessestand/Content/Stadler_Messestand/nDisplay/ScreenTableScene.uasset b/StadlerMessestand/Content/Stadler_Messestand/nDisplay/ScreenTableScene.uasset new file mode 100644 index 0000000..b84653d Binary files /dev/null and b/StadlerMessestand/Content/Stadler_Messestand/nDisplay/ScreenTableScene.uasset differ diff --git a/StadlerMessestand/Saved/config.json b/StadlerMessestand/Saved/config.json index ba92c07..08a015d 100644 --- a/StadlerMessestand/Saved/config.json +++ b/StadlerMessestand/Saved/config.json @@ -1,6 +1,8 @@ { "OscAddress": "233.233.233.233", "OscPort": 3333, + "OscSecondaryPort": 3334, + "SecondaryScreen": false, "Floors": [{ "RangeMaximumX": 1210, @@ -9,7 +11,8 @@ "RangeMinimumY": -2270, "AngleOffsetDeg": -90, "ZOffset": 180, - "TuioMarkerId": 0 + "TuioMarkerId": 0, + "TextureAsset": "" },{ "RangeMaximumX": 1210, "RangeMinimumX": -1070, @@ -17,7 +20,8 @@ "RangeMinimumY": -2270, "AngleOffsetDeg": -90, "ZOffset": 490, - "TuioMarkerId": 1 + "TuioMarkerId": 1, + "TextureAsset": "" }], "TuioMarkerListenToAny": false } \ No newline at end of file diff --git a/StadlerMessestand/StadlerMessestand.uproject b/StadlerMessestand/StadlerMessestand.uproject index 515662d..02715d5 100644 --- a/StadlerMessestand/StadlerMessestand.uproject +++ b/StadlerMessestand/StadlerMessestand.uproject @@ -22,6 +22,22 @@ { "Name": "JsonBlueprintUtilities", "Enabled": true + }, + { + "Name": "nDisplay", + "Enabled": true, + "SupportedTargetPlatforms": [ + "Win64", + "Linux" + ] + }, + { + "Name": "Switchboard", + "Enabled": true + }, + { + "Name": "DisplayClusterLaunch", + "Enabled": true } ], "TargetPlatforms": [