PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Fix frostbite (#368)

Browse Source 
Stop using playtest dir
This commit is contained in:
Equinox
2020-03-19 12:15:32 -07:00
committed by GitHub
parent f2a077deed
commit b220243b75
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkins/jenkins-grab-se.ps1
View File

@@ -1,6 +1,6 @@
pushd pushd
$steamData = "C:/Steam/Data-playtest/" $steamData = "C:/Steam/Data/"
$steamCMDPath = "C:/Steam/steamcmd/" $steamCMDPath = "C:/Steam/steamcmd/"
$steamCMDZip = "C:/Steam/steamcmd.zip" $steamCMDZip = "C:/Steam/steamcmd.zip"

3
Jenkinsfile vendored
View File

@@ -22,7 +22,8 @@ node {
stage('Acquire SE') { stage('Acquire SE') {
bat 'powershell -File Jenkins/jenkins-grab-se.ps1' bat 'powershell -File Jenkins/jenkins-grab-se.ps1'
bat 'IF EXIST GameBinaries RMDIR GameBinaries' bat 'IF EXIST GameBinaries RMDIR GameBinaries'
bat 'mklink /J GameBinaries "C:/Steam/Data-playtest/DedicatedServer64/"' bat 'mklink /J GameBinaries "C:/Steam/Data/DedicatedServer64/"'
bat 'dir GameBinaries'
} }
stage('Acquire NuGet Packages') { stage('Acquire NuGet Packages') {

2
Torch.Server/Views/WorldGeneratorDialog.xaml.cs
View File

@@ -44,7 +44,7 @@ namespace Torch.Server
_instanceManager = instanceManager; _instanceManager = instanceManager;
InitializeComponent(); InitializeComponent();
_loadLocalization(); _loadLocalization();
var scenarios = MyLocalCache.GetAvailableWorldInfos(Path.Combine(MyFileSystem.ContentPath, "CustomWorlds")); var scenarios = MyLocalCache.GetAvailableWorldInfos(new List<string> {Path.Combine(MyFileSystem.ContentPath, "CustomWorlds")});
foreach (var tup in scenarios) foreach (var tup in scenarios)
{ {
string directory = tup.Item1; string directory = tup.Item1;

3
Torch/Patches/TorchAsyncSaving.cs
View File

@@ -62,7 +62,7 @@ namespace Torch.Patches
if (!Game.IsDedicated) if (!Game.IsDedicated)
TakeSaveScreenshot(); TakeSaveScreenshot();
tmpSnapshot.SaveParallel(() => true, () => tmpSnapshot.SaveParallel(null, null, () =>
{ {
if (!Game.IsDedicated && MySession.Static != null) if (!Game.IsDedicated && MySession.Static != null)
ShowWorldSaveResult(tmpSnapshot.SavingSuccess); ShowWorldSaveResult(tmpSnapshot.SavingSuccess);
@@ -99,6 +99,7 @@ namespace Torch.Patches
{ {
File.Delete(thumbPath); File.Delete(thumbPath);
} }
MyGuiSandbox.TakeScreenshot(1200, 672, thumbPath, true, false); MyGuiSandbox.TakeScreenshot(1200, 672, thumbPath, true, false);
} }
catch (Exception ex) catch (Exception ex)

2
Torch/VRageGame.cs
View File

@@ -179,7 +179,7 @@ namespace Torch
} }
else else
{ {
MyPerformanceSettings preset = MyGuiScreenOptionsGraphics.GetPreset(MyRenderQualityEnum.NORMAL); MyPerformanceSettings preset = MyGuiScreenOptionsGraphics.GetPreset(MyRenderPresetEnum.NORMAL);
MyRenderProxy.Settings.User = MyVideoSettingsManager.GetGraphicsSettingsFromConfig(ref preset, false) MyRenderProxy.Settings.User = MyVideoSettingsManager.GetGraphicsSettingsFromConfig(ref preset, false)
.PerformanceSettings.RenderSettings; .PerformanceSettings.RenderSettings;
MyStringId graphicsRenderer = MySandboxGame.Config.GraphicsRenderer; MyStringId graphicsRenderer = MySandboxGame.Config.GraphicsRenderer;