Commit Graph

77 Commits

Author SHA1 Message Date
z__
58b9c926ae net6 things 2022-01-22 21:13:38 +07:00
Bishbash777
147c94fd93 Merge pull request #15 from zznty/fix/xbox
Fixes for EOS & consoles
2021-07-28 09:46:13 +01:00
zznty
b56c8f711c fixed crash due to clientId duplicate
fixes for System.ArgumentException: Key <clientId> already exists
Parameter name: key
2021-07-17 17:36:36 +07:00
zznty
c5c6ef1cd2 xbox compat support 2021-07-09 01:26:39 +07:00
zznty
3e01cecdcc mod.io support and eos fix 2021-05-07 19:02:28 +07:00
LTP
cee5cb3c4d totally fixed 2021-02-12 19:36:28 +07:00
foogs
f25a412a47 YOUR PRIVACY HAS BEEN DELETED 2020-11-26 08:43:56 +03:00
John Gross
aa5963b29b Merge branch 'master' of https://github.com/TorchAPI/Torch into master 2020-11-25 12:26:26 -08:00
John Gross
15c4276a81 More fixes for 25th 2020-11-25 12:26:18 -08:00
John Gross
c3e65a5bdd Tentative fix for 2020-11-25 update 2020-11-25 11:32:05 -08:00
Yuri.Sh
3d13460302 Added ModSDK Logging (#404)
This change was made by @BobDaRoss
I like to help with correct pull request.
2020-08-23 12:40:50 -07:00
Jimmacle
fc986c87a6 Copy and paste bad 2020-08-10 14:40:41 -07:00
Bob Da Ross
80a820ae3d Fixed ModSDK players from joining and getting sandbox file. (#399) 2020-08-10 14:21:13 -07:00
John Gross
540b17448a Fix overwriting Sandbox with stale cached version 2019-12-07 18:15:48 -08:00
John Gross
cc91fa3653 Fix mod downloading, more descriptive sandbox error message 2019-10-26 11:38:38 -07:00
John Gross
52ef0b4d6d Add MySteamService wrapper, add UGC service to init, fix chat intercept 2019-10-24 14:35:06 -07:00
Brant Martin
9c2dc69e3c patch prep 2019-10-23 20:36:15 -04:00
John Gross
562a4554f3 Update instance manager for new config format 2019-09-21 12:19:14 -07:00
Brant Martin
43adecaf99 Publictest (#335)
* Fix compiler errors

* Fix Jenkins

* Build public test as Release

* Fix more things

* Oops

* Remove obsolete code

* Fix GameStatePatchShim
2019-08-22 13:25:53 -04:00
John Gross
fd4b49e0d5 Fix remote API load order 2019-07-11 13:26:43 -07:00
John Gross
570bc83a6d Fix remote API, file copying, entity manager sorting 2019-07-06 16:58:36 -07:00
Brant Martin
4f30a47c07 Handle conflicting connection attempts gracefully 2019-06-25 16:11:13 -04:00
Brant Martin
8015f8486c Add error handling to world view loading 2019-06-10 21:04:40 -04:00
Brant Martin
8dc542a31c Merge branch 'Patron' of https://github.com/TorchAPI/Torch into survival 2019-02-25 15:27:34 -05:00
Brant Martin
4dee127ce8 Merge branch 'playtest' of https://github.com/TorchAPI/Torch into survival 2019-02-25 15:27:14 -05:00
Tobias K
f265f7e773 Replace mod text box by separate tab with workshop support (#263)
* Implement ModList tab which fetches and displays mod information from the workshop.

* ModListEditor: Implement drag and drop ordering, adding, removing and saving.

* Add SteamWorkshopService to VCS

* Add missing file to SteamworkshopService project.

* ModlistControl: Implement checkbox for hiding/showing dependency mods
disable until config is loaded.
design improvements.

* Add documentation for the new classes.

* Comply to naming conventions.

* Update Torch.Server.csproj

* Fix Mod.IsDependency not being serialized when saving

* Remove superfluous update of mod meta data.
Remove commented section in ConfigControl.xaml.

* Optimized SteamworkshopService according to commit review.

* Move SteamWorkshopService to Torch.Utils.SteamworkshopTools

* Remove debug output.

* Don't break stack trace with custom exception in SteamWorkshopTools.

* User ViewModel base class for ModItemInfo instead of implementing INotifyProperty directly.

* Wrap ModListControl in ScrollViewer.

* Rename SteamWorkshopTools utility to WebAPI.

* Revert steamkit call to use dynamic typing for clarity :/

* Mark webAPI based method for downloading workshop content as obsolete.

* Update Torch project definition.

* Disable building Torch client

* Update readme

* Change init order to ensure paths are initialized for plugins

* Reorder exception logging to reduce duplication

* Use thread safe queues in MtObservableCollectionBase

* Revert "Change init order to ensure paths are initialized for plugins"

This reverts commit 3f803b8107.

* Fix layout of ModListControl

* Combine Invokes to reduce allocations

* Replace string comparisons by string.Equals / string.IsNullOrEmpty

* Replace string comparisons by string.Equals / string.IsNullOrEmpty

* Use MtObservableList for Modlist to avoid race conditions.
2019-02-02 06:26:55 -05:00
Brant Martin
61307ce584 Merge branch 'Patron' 2019-02-02 06:25:40 -05:00
John Gross
b66db19c0a Fix post world generation behavior 2019-01-17 15:07:50 -08:00
John Gross
4e2e58bb4c Merge branch 'master' into Patron 2019-01-16 21:17:47 -08:00
Brant Martin
8b7a07ffe7 Deprecate ReservedPlayers in Torch cfg
Add a scrollpanel to fix clipped controls
2019-01-10 21:35:48 -05:00
Brant Martin
fa1a968b8f Merge branch 'master' into Patron 2019-01-10 09:29:29 -05:00
N1Ran
3d8bf78213 Add Reserved slot and "Auto Detect Dependencies" to config ui plus Torch reserve management oversees all (#269)
* Add server description to config uI and adjusted the mod blocks to fit

* Added checkbox for "Auto detect dependencies" and Reserved players slot.

* Torch reserved slot management is now main and will scan sededi also to match steamid making new config ui addition usable
2019-01-10 09:28:35 -05:00
Brant Martin
471912759a Merge branch 'master' into Patron 2019-01-06 22:22:16 -05:00
Brant Martin
844d4be96a Rearrange client join auth again 2019-01-06 21:21:36 -05:00
Brant Martin
a059d18195 Add promote/demote buttons to player tab.
Add player promoted event to IMultiplayerManagerServer
2019-01-03 15:41:41 -05:00
Brant Martin
76637b130c Add ban and kick events 2018-12-16 20:53:52 -05:00
Brant Martin
faef000245 Fix Family Share banning. 2018-12-15 20:16:44 -05:00
Brant Martin
65bb71aabf Add reserved slots 2018-10-12 16:12:33 -04:00
a318aa87cf get remote ip fix (#254)
* get remote ip fix

* add GetIp fix to chat command
2018-08-27 22:40:30 -04:00
Brant Martin
355375e9db Add OnlineMode to session settings. Only allow admins to join an Offline game. 2018-08-20 20:06:32 -04:00
Brant Martin
9a0e7809cd Fix issue with TorchMod being added to the server config. (also removes TorchMod from any extant config to avoid Problems) 2018-07-20 10:05:08 -04:00
Brant Martin
94c25a70b3 Fix mods not showing up in UI 2018-07-19 21:08:41 -04:00
Brant Martin
0f06ee5688 Disable client IP stuff because it borked 2018-07-18 22:34:59 -04:00
Brant Martin
ec065ec329 Fix network intercept 2018-07-18 22:34:44 -04:00
Brant Martin
38d2f1b62e Fix for MP 2018-05-16 07:09:05 -04:00
John Gross
d87cc7f1e7 Truncate log in UI, add ability to cancel restart 2018-04-12 09:51:52 -07:00
John Gross
b2bf0229ed Revert FirstOrDefault change 2018-04-03 00:05:32 -07:00
John Gross
f03bfd2d7a Fix suppressed fatal error, make world config importing manual 2018-04-02 21:00:36 -07:00
Brant Martin
444da941c9 Tweak client join validation 2018-02-15 11:14:57 -05:00
Westin Miller
f19fd84f1d Fix empty group letting people in over cap 2018-02-12 14:41:50 -08:00