Commit Graph
9876 Commits
Author SHA1 Message Date
Jordan BrownandGitHub f6a3499532 Fixes Test Merge Manager crashing Control Panel 2017-12-06 14:06:07 -05:00
Jordan BrownandGitHub 17020d3209 Merge pull request #442 from tgstation/437-HandleDeadOnArrival
Fix watchdog crashing if DreamDaemon immediately exits
2017-12-06 13:02:50 -05:00
Cyberboss c7a1cfa719 Fix watchdog crashing if DreamDaemon immediately exits 2017-12-06 12:52:52 -05:00
Jordan BrownandGitHub e0db57c740 Merge pull request #439 from tgstation/Cyberboss-patch-1
Rename View TGS3 Logs.xml to Tools/ViewTGS3Logs.xml
2017-12-06 12:14:47 -05:00
Jordan BrownandGitHub 189a19a939 Version bump to 3.2.1.3 [TGSDeploy] tgstation-server-v3.2.1.3 2017-12-06 12:06:54 -05:00
Jordan BrownandGitHub 39ab4411cb Rename View TGS3 Logs.xml to Tools/ViewTGS3Logs.xml 2017-12-06 12:06:14 -05:00
Jordan BrownandGitHub 25b4e6d4bf Merge pull request #438 from tgstation/336-StagedStaging
BYOND updates block compiles and recompile the game using the staged version
2017-12-06 12:05:25 -05:00
Cyberboss e6f6226bdb BYOND updates block compiles and recompile the game using the staged version 2017-12-06 11:59:32 -05:00
Jordan BrownandGitHub bbe9f14c1c Version bump to 3.2.1.2 [TGSDeploy] tgstation-server-v3.2.1.2 2017-12-05 15:25:13 -05:00
Jordan BrownandGitHub 8e30897d43 Merge pull request #436 from tgstation/Cyberboss-patch-1
Fixes rare compiler failure
2017-12-05 15:24:42 -05:00
Jordan BrownandGitHub 6e01133a90 Fixes rare compiler failure 2017-12-05 15:18:52 -05:00
Jordan BrownandGitHub 0481208c7c Merge pull request #435 from Cyberboss/NoMoreFactory
Changes Task.Factory.StartNew to Task.Run
2017-12-04 11:14:11 -05:00
Cyberboss b64ea64792 Changes Task.Factory.StartNew to Task.Run 2017-12-04 10:56:58 -05:00
Jordan BrownandGitHub 8ef3326a67 Version bump to 3.2.1.1 [TGSDeploy] tgstation-server-v3.2.1.1 2017-12-03 17:16:39 -05:00
Jordan BrownandGitHub 7e9ef88655 Merge pull request #434 from tgstation/Cyberboss-patch-1
Fix GetRepositoryRemote
2017-12-03 17:16:03 -05:00
Jordan BrownandGitHub d897771939 Fix GetRepositoryRemote 2017-12-03 17:10:27 -05:00
Jordan BrownandGitHub 68a0c870af Version bump to 3.2.1.0 [TGSDeploy] [NugetDeploy] tgstation-server-v3.2.1.0 2017-12-02 11:22:35 -05:00
Jordan BrownandGitHub 25c87d490f Merge pull request #432 from tgstation/Cyberboss-patch-1
WorldAnnounce when compile completes
2017-12-02 11:20:13 -05:00
Jordan BrownandGitHub a5f3a191d7 WorldAnnounce when compile completes 2017-12-02 11:15:45 -05:00
Jordan BrownandGitHub c24d99ac7c Merge pull request #429 from Cyberboss/LessCPSpam
Pull requests re-merged by the control panel don't announce
2017-11-30 10:57:16 -05:00
Jordan BrownandGitHub 598da27077 Merge pull request #430 from Cyberboss/CPFix
Fix RemoteLoginInfo Deserialization
2017-11-30 10:53:26 -05:00
Cyberboss 74b3786ce7 Fix xml doc comment 2017-11-30 10:49:30 -05:00
Cyberboss b76eec2548 Fix RemoteLoginInfo Deserialization 2017-11-30 10:46:24 -05:00
Cyberboss 96ad0afdc5 Various PR merging improvements 2017-11-30 10:45:31 -05:00
Cyberboss 4e10b53b83 Fix xml doc comment 2017-11-30 10:18:36 -05:00
Cyberboss 81bc98183e Make CP use MergePullRequests where applicable 2017-11-30 10:15:56 -05:00
Cyberboss 11b76298e1 Add MergePullRequests 2017-11-30 10:15:18 -05:00
Cyberboss 0b1c2dda94 Control panel update flow doesnt announce pre-merged PRs 2017-11-30 09:42:33 -05:00
Cyberboss 69eeff0ff1 Add a silent option to MergePullRequest 2017-11-30 09:42:15 -05:00
Jordan BrownandGitHub d3d5aa329b Merge pull request #428 from tgstation/Cyberboss-patch-1
Adds client build to Travis
2017-11-29 14:35:38 -05:00
Jordan BrownandGitHub 646b3c1b94 Use msbuild instead of xbuild 2017-11-29 14:30:17 -05:00
Jordan BrownandGitHub 5670f5f67e Add travis language specification 2017-11-29 14:23:27 -05:00
Jordan BrownandGitHub 24457877e3 Fix bash syntax 2017-11-29 14:19:53 -05:00
Jordan BrownandGitHub de8ca7c75f Remove uneeded nuget package 2017-11-29 14:18:14 -05:00
Jordan BrownandGitHub ea04d4257f Adds client build to Travis 2017-11-29 14:16:39 -05:00
Jordan BrownandGitHub 3260ac6d8d Merge pull request #427 from Cyberboss/SLNFixes
Fixes issues with building xbuild Client configuration
2017-11-29 10:21:39 -05:00
Cyberboss 3fcdfd9534 Fixes Console and Service building in Client configuration 2017-11-29 10:16:12 -05:00
Cyberboss 9847eb17a1 Fix GitHubLoginPrompt capitalization 2017-11-29 10:14:43 -05:00
Jordan BrownandGitHub 2566be3da1 Merge pull request #426 from Cyberboss/XamarinCompat
Interface compatibility changes for Xamarin
2017-11-28 18:49:20 -05:00
Cyberboss 834696cfce Remove unused reference 2017-11-28 18:41:43 -05:00
Cyberboss 1e26177381 Compatibility changes for Xamarin 2017-11-28 18:29:38 -05:00
Jordan BrownandGitHub ec4057b51b Merge pull request #425 from tgstation/312-CustomAuthentication
Gets the interface working on Mono
2017-11-28 16:20:17 -05:00
Cyberboss acd487ed26 Fixes failing test 2017-11-28 15:39:07 -05:00
Cyberboss 94b11b4ac1 Document new custom authentication scheme 2017-11-28 15:34:16 -05:00
Cyberboss a28b1af3fb Merge branch 'master' of https://github.com/tgstation/tgstation-server into 312-CustomAuthentication 2017-11-28 15:09:14 -05:00
Jordan BrownandGitHub eaae87b207 Merge pull request #424 from tgstation/Cyberboss-patch-1
Removes outdated comment
2017-11-28 15:08:38 -05:00
Cyberboss fe18c70e4e Fixes XMLDoc comment 2017-11-28 15:08:33 -05:00
Cyberboss 3203e9fbc6 Removes channel factory disposal as it causes stack overflow on mono 2017-11-28 14:37:20 -05:00
Cyberboss af4ae97e93 Use runtime mono detection 2017-11-28 13:34:19 -05:00
Cyberboss 41024d2d9e Mono compatiblity preprocessor switch 2017-11-28 13:23:09 -05:00