Enable LFS for UE assets

# Conflicts:
#	InteractiveControl/Content/Version2/widget/Page_mode2.uasset
#	InteractiveControl/Content/Version2/widget/Page_mode2_13_YongHe.uasset
#	SpaceStudioClient/Content/Blueprints/BP_UDPMessageProcessor.uasset
#	SpaceStudioClient/Content/Blueprints/ND_PC.uasset
#	SpaceStudioClient/Content/Blueprints/UI/WB_Wall_A.uasset

.gitattributes

@@ -1,4 +1,7 @@
+*.wav filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.tga filter=lfs diff=lfs merge=lfs -text
+*.pdb filter=lfs diff=lfs merge=lfs -text
 *.uasset filter=lfs diff=lfs merge=lfs -text
 *.umap filter=lfs diff=lfs merge=lfs -text
 *.mp4 filter=lfs diff=lfs merge=lfs -text
-*.wav filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -73,7 +73,3 @@ Plugins/**/Intermediate/*
 # Cache files for the editor to use
 DerivedDataCache/*
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 95f315ade3bf74f55a7ff178d6c65dfcb6ece4df

SpaceStudioClient/Config/DefaultEngine.ini

@@ -1,105 +0,0 @@
-[/Script/EngineSettings.GameMapsSettings]
-GameDefaultMap=/Game/Main.Main
-EditorStartupMap=/Game/Main.Main
-
-[/Script/WindowsTargetPlatform.WindowsTargetSettings]
-DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
--D3D12TargetedShaderFormats=PCD3D_SM5
-+D3D12TargetedShaderFormats=PCD3D_SM6
--D3D11TargetedShaderFormats=PCD3D_SM5
-+D3D11TargetedShaderFormats=PCD3D_SM5
-Compiler=Default
-AudioSampleRate=48000
-AudioCallbackBufferFrameSize=1024
-AudioNumBuffersToEnqueue=1
-AudioMaxChannels=0
-AudioNumSourceWorkers=4
-SpatializationPlugin=
-SourceDataOverridePlugin=
-ReverbPlugin=
-OcclusionPlugin=
-CompressionOverrides=(bOverrideCompressionTimes=False,DurationThreshold=5.000000,MaxNumRandomBranches=0,SoundCueQualityIndex=0)
-CacheSizeKB=65536
-MaxChunkSizeOverrideKB=0
-bResampleForDevice=False
-MaxSampleRate=48000.000000
-HighSampleRate=32000.000000
-MedSampleRate=24000.000000
-LowSampleRate=12000.000000
-MinSampleRate=8000.000000
-CompressionQualityModifier=1.000000
-AutoStreamingThreshold=0.000000
-SoundCueCookQualityIndex=-1
-
-[/Script/HardwareTargeting.HardwareTargetingSettings]
-TargetedHardwareClass=Desktop
-AppliedTargetedHardwareClass=Desktop
-DefaultGraphicsPerformance=Maximum
-AppliedDefaultGraphicsPerformance=Maximum
-
-[/Script/Engine.RendererSettings]
-r.GenerateMeshDistanceFields=True
-r.DynamicGlobalIlluminationMethod=1
-r.ReflectionMethod=1
-r.SkinCache.CompileShaders=True
-r.RayTracing=True
-r.Shadow.Virtual.Enable=1
-r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
-r.DefaultFeature.LocalExposure.HighlightContrastScale=0.8
-r.DefaultFeature.LocalExposure.ShadowContrastScale=0.8
-r.ClearCoatNormal=True
-r.VirtualTextures=True
-r.VT.TileSize=512
-r.RayTracing.Shadows=True
-r.Lumen.HardwareRayTracing=True
-r.Lumen.TranslucencyReflections.FrontLayer.EnableForProject=True
-r.ReflectionCaptureResolution=2048
-r.AllowGlobalClipPlane=True
-r.PostProcessing.PropagateAlpha=1
-r.TextureStreaming=False
-
-[/Script/WorldPartitionEditor.WorldPartitionEditorSettings]
-CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'
-
-[/Script/Engine.UserInterfaceSettings]
-bAuthorizeAutomaticWidgetVariableCreation=False
-FontDPIPreset=Standard
-FontDPI=72
-DesignScreenSize=(X=3840,Y=2160)
-UIScaleCurve=(EditorCurveData=(Keys=((Time=480.000000,Value=0.444000),(Time=720.000000,Value=0.333000),(Time=1080.000000,Value=0.500000),(Time=2160.000000,Value=1.000000),(Time=8640.000000,Value=8.000000)),DefaultValue=340282346638528859811704183484516925440.000000,PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant),ExternalCurve=None)
-UIScaleRule=ShortestSide
-
-[/Script/Engine.Engine]
-+ActiveGameNameRedirects=(OldGameName="TP_BlankBP",NewGameName="/Script/SpaceStudioClient")
-+ActiveGameNameRedirects=(OldGameName="/Script/TP_BlankBP",NewGameName="/Script/SpaceStudioClient")
-GameEngine=/Script/DisplayCluster.DisplayClusterGameEngine
-UnrealEdEngine=/Script/DisplayClusterEditor.DisplayClusterEditorEngine
-GameViewportClientClassName=/Script/DisplayCluster.DisplayClusterViewportClient
-
-[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings]
-bEnablePlugin=True
-bAllowNetworkConnection=True
-SecurityToken=55D0C7F04C701EB3CC127F9AE4347B4F
-bIncludeInShipping=False
-bAllowExternalStartInShipping=False
-bCompileAFSProject=False
-bUseCompression=False
-bLogFiles=False
-bReportStats=False
-ConnectionType=USBOnly
-bUseManualIPAddress=False
-ManualIPAddress=
-
-[/Script/DisplayClusterEditor.DisplayClusterEditorSettings]
-bClusterReplicationEnabled=True
-
-[/Script/Engine.GameEngine]
-+NetDriverDefinitions=(DefName=GameNetDriver,DriverClassName=/Script/DisplayClusterReplication.DisplayClusterNetDriver,DriverClassNameFallback=/Script/OnlineSubsystemUtils.IpNetDriver)
-+NetDriverDefinitions=(DefName=DemoNetDriver,DriverClassName=/Script/Engine.DemoNetDriver,DriverClassNameFallback=/Script/Engine.DemoNetDriver)
-
-[/Script/DisplayClusterReplication.DisplayClusterNetDriver]
-NetConnectionClassName=DisplayClusterReplication.DisplayClusterNetConnection
-
-[Audio]
-UnfocusedVolumeMultiplier=1
-