From 371000417a71704d222a989cc47861f2d5611e8b Mon Sep 17 00:00:00 2001 From: Marek Rusinowski Date: Sat, 15 Apr 2023 20:44:10 +0200 Subject: [PATCH] Move springsettings.json inside config.json --- dist_cfg/config.json | 91 +++++++++++++++++++++++++++++++++++- dist_cfg/springsettings.json | 89 ----------------------------------- 2 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 dist_cfg/springsettings.json diff --git a/dist_cfg/config.json b/dist_cfg/config.json index 18fa18233..9a5ad07f4 100644 --- a/dist_cfg/config.json +++ b/dist_cfg/config.json @@ -270,5 +270,94 @@ "engine": "105.1.1-1544-g058c8ea bar" } } - ] + ], + "default_springsettings": { + "AdvUnitShading": 1, + "AdvMapShading": 1, + "AdvSky": 0, + "AllowDeferredMapRendering": 1, + "AllowDeferredModelRendering": 1, + "BuildWarnings": 0, + "BumpWaterBlurReflection": 1, + "BumpWaterDepthBits": 16, + "BumpWaterShoreWaves": 1, + "BumpWaterTexSizeReflection": 1024, + "CamTimeExponent": 4.0, + "CamTimeFactor": 1.0, + "CrossAlpha": 0, + "CubeTexSpecularExponent": 100, + "CubeTexGenerateMipMaps": 1, + "CubeTexSizeReflection": 1024, + "DisplayDebugPrefixConsole": 0, + "DualScreenMiniMapOnLeft": 1, + "FPSFOV": 90, + "FeatureDrawDistance": 10000, + "FeatureFadeDistance": 10000, + "ForceDisableShaders": 0, + "Fullscreen": 0, + "FullscreenEdgeMove": 1, + "GrassDetail": 0, + "GroundDecals": 2, + "GroundDetail": 150, + "GroundScarAlphaFade": 1, + "HangTimeout": 30, + "HardwareCursor": 1, + "InitialNetworkTimeout": 0, + "LODScale": 1.000, + "LODScaleReflection": 1.000, + "LODScaleRefraction": 1.000, + "LODScaleShadow": 1.000, + "LuaGarbageCollectionMemLoadMult": 2.0, + "LogFlush": 0, + "LuaShaders": 1, + "LoadingMT": 0, + "MaxParticles": 20000, + "MaxSounds": 256, + "MaximumTransmissionUnit": 0, + "MaxTextureAtlasSizeX": 8192, + "MaxTextureAtlasSizeZ": 8192, + "MiddleClickScrollSpeed": -0.005, + "MinimapOnLeft": 1, + "MouseDragScrollThreshold": 0.3, + "MoveWarnings": 0, + "MSAA": 1, + "MSAALevel": 4, + "NormalMapping": 1, + "ReconnectTimeout": 0, + "Roam": 1, + "ReflectiveWater": 3, + "ScrollWheelSpeed": -20, + "Shadows": 1, + "ShadowMapSize": 2048, + "ShowClock": 0, + "ShowFps": 0, + "ShowSpeed": 0, + "SmoothLines": 1, + "SplashScreenDir": "./MenuLoadscreens", + "TreeRadius": 1000, + "UnitIconDist": 160, + "UnitLodDist": 999999, + "UnitIconsAsUI": 1, + "UnitIconScaleUI": 1.05, + "UnitIconFadeVanish": 2700, + "UnitIconFadeStart": 3000, + "UnitIconFadeAmount": 0.1, + "UsePBO": 1, + "Water": 4, + "WindowedEdgeMove": 1, + "WindowPosX": 0, + "WindowPosY": 0, + "snd_general": 100, + "snd_volmaster": 100, + "snd_volmusic": 30, + "snd_airAbsorption": 0.35, + "ui_opacity": 0.6, + "UseNetMessageSmoothingBuffer": 0, + "NetworkLossFactor": 2, + "MaxDynamicModelLights": 0, + "LinkOutgoingBandwidth": 262144, + "LinkIncomingSustainedBandwidth": 1048576, + "LinkIncomingPeakBandwidth": 1048576, + "LinkIncomingMaxPacketRate": 2048 + } } diff --git a/dist_cfg/springsettings.json b/dist_cfg/springsettings.json deleted file mode 100644 index dc068a9b2..000000000 --- a/dist_cfg/springsettings.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "AdvUnitShading": 1, - "AdvMapShading": 1, - "AdvSky": 0, - "AllowDeferredMapRendering": 1, - "AllowDeferredModelRendering": 1, - "BuildWarnings": 0, - "BumpWaterBlurReflection": 1, - "BumpWaterDepthBits": 16, - "BumpWaterShoreWaves": 1, - "BumpWaterTexSizeReflection": 1024, - "CamTimeExponent": 4.0, - "CamTimeFactor": 1.0, - "CrossAlpha": 0, - "CubeTexSpecularExponent": 100, - "CubeTexGenerateMipMaps": 1, - "CubeTexSizeReflection": 1024, - "DisplayDebugPrefixConsole": 0, - "DualScreenMiniMapOnLeft": 1, - "FPSFOV": 90, - "FeatureDrawDistance": 10000, - "FeatureFadeDistance": 10000, - "ForceDisableShaders": 0, - "Fullscreen": 0, - "FullscreenEdgeMove": 1, - "GrassDetail": 0, - "GroundDecals": 2, - "GroundDetail": 150, - "GroundScarAlphaFade": 1, - "HangTimeout": 30, - "HardwareCursor": 1, - "InitialNetworkTimeout": 0, - "LODScale": 1.000, - "LODScaleReflection": 1.000, - "LODScaleRefraction": 1.000, - "LODScaleShadow": 1.000, - "LuaGarbageCollectionMemLoadMult": 2.0, - "LogFlush": 0, - "LuaShaders": 1, - "LoadingMT": 0, - "MaxParticles": 20000, - "MaxSounds": 256, - "MaximumTransmissionUnit": 0, - "MaxTextureAtlasSizeX": 8192, - "MaxTextureAtlasSizeZ": 8192, - "MiddleClickScrollSpeed": -0.005, - "MinimapOnLeft": 1, - "MouseDragScrollThreshold": 0.3, - "MoveWarnings": 0, - "MSAA": 1, - "MSAALevel": 4, - "NormalMapping": 1, - "ReconnectTimeout": 0, - "Roam": 1, - "ReflectiveWater": 3, - "ScrollWheelSpeed": -20, - "Shadows": 1, - "ShadowMapSize": 2048, - "ShowClock": 0, - "ShowFps": 0, - "ShowSpeed": 0, - "SmoothLines": 1, - "SplashScreenDir": "./MenuLoadscreens", - "TreeRadius": 1000, - "UnitIconDist": 160, - "UnitLodDist": 999999, - "UnitIconsAsUI": 1, - "UnitIconScaleUI": 1.05, - "UnitIconFadeVanish": 2700, - "UnitIconFadeStart": 3000, - "UnitIconFadeAmount": 0.1, - "UsePBO": 1, - "Water": 4, - "WindowedEdgeMove": 1, - "WindowPosX": 0, - "WindowPosY": 0, - "snd_general": 100, - "snd_volmaster": 100, - "snd_volmusic": 30, - "snd_airAbsorption": 0.35, - "ui_opacity": 0.6, - "UseNetMessageSmoothingBuffer": 0, - "NetworkLossFactor": 2, - "MaxDynamicModelLights": 0, - "LinkOutgoingBandwidth": 262144, - "LinkIncomingSustainedBandwidth": 1048576, - "LinkIncomingPeakBandwidth": 1048576, - "LinkIncomingMaxPacketRate": 2048 -}