cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-26 22:48:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Cyberboss-patch-6

Browse Source
This commit is contained in:
Jordan Brown
2018-01-10 08:19:56 -08:00
committed by GitHub
parent dc3aec213f c4e09eecce
commit 4dc0cdeec5
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGS.Server/Instance/Compiler.cs
+1 -1
View File
@@ -517,7 +517,7 @@ namespace TGS.Server
return;
}
UpdateLiveSha(CurrentSha);
var msg = String.Format("Compile complete!{0}", !staged ? "" : " Server will update next round.");
var msg = String.Format("Compile complete!{0}", !staged ? "" : " Server will update on reboot.");
WorldAnnounce("Server updated, changes will be applied on reboot...");
SendMessage("DM: " + msg, MessageType.DeveloperInfo);
WriteInfo(msg, EventID.DMCompileSuccess);
TGS.Server/Instance/Interop.cs
+1 -1
View File
@@ -211,7 +211,7 @@ namespace TGS.Server
var returnedString = "NULL";
var returnedData = new byte[UInt16.MaxValue];
using (var topicSender = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp) { SendTimeout = 5000, ReceiveTimeout = 5000 })
using (var topicSender = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp) { SendTimeout = 5000, ReceiveTimeout = 10000 })
try
{
topicSender.Connect(IPAddress.Loopback, port);
TGS.Server/Instance/Repository.cs
+1
View File
@@ -1012,6 +1012,7 @@ namespace TGS.Server
var prAPI = remoteUrl;
prAPI = prAPI.Replace("/.git", "");
prAPI = prAPI.Replace(".git", "");
prAPI = prAPI.Replace("git:", "https:");
prAPI = prAPI.Replace("github.com", "api.github.com/repos");
prAPI += "/pulls/" + PRNumberString + ".json";
string json;
Tools/BuildDox.ps1
+1 -1
View File
@@ -11,7 +11,7 @@ if($publish_dox){
echo "Cloning https://git@$github_url..."
git clone -b gh-pages --single-branch "https://git@$github_url" "$doxdir" 2>$null
rm -r "$doxdir\*"
Add-Content "$bf\Tools\Doxyfile" "`nPROJECT_NUMBER = $version`nINPUT = $bf`nOUTPUT_DIRECTORY = $doxdir`nPROJECT_LOGO = $bf/tgs.ico`nHAVE_DOT=YES"
Add-Content "$bf\Tools\Doxyfile" "`nPROJECT_NUMBER = $version`nINPUT = $bf`nOUTPUT_DIRECTORY = $doxdir`nPROJECT_LOGO = $bf/tgs.ico"
}else{
Add-Content "$bf\Tools\Doxyfile" "`nPROJECT_NUMBER = $version`nINPUT = $bf`nOUTPUT_DIRECTORY = $doxdir`nPROJECT_LOGO = $bf/tgs.ico"
}
appveyor.yml
+2 -2
View File
@@ -6,7 +6,7 @@ environment:
snk_passphrase:
secure: dsRGlNewYn/JoycPaMoxLCrb3wkL31RsdU7Xwbo7TIAmClwShCVWeRPN+eGA+fMZX12MDNRBs8Fws4IxqLKQ36thQo6p2B+kPksAUJiAOR5QKJoT6nt8JB1wBMFS2kH4
skip_branch_with_pr: true
image: Visual Studio 2017
image: Previous Visual Studio 2017
configuration: Release
shallow_clone: true
artifacts:
@@ -27,7 +27,7 @@ cache:
- C:\ProgramData\chocolatey\bin -> appveyor.yml
- C:\ProgramData\chocolatey\lib -> appveyor.yml
install:
- choco install fciv doxygen.portable graphviz.portable codecov
- choco install fciv doxygen.portable codecov
before_build:
- nuget restore TGStationServer3.sln
build: