Commit Graph

332 Commits

Author SHA1 Message Date
John Gross
3e5b29c84d I think I actually fixed it 2019-06-06 17:07:25 -07:00
John Gross
5d19cc7cf1 I think I fixed it 2019-06-06 15:48:29 -07:00
Brant Martin
19995eba1a Update protobuf to 2.4 2019-06-06 15:54:05 -04:00
Brant Martin
990ed0f6bf Merge branch 'master' into PreRelease 2019-06-06 15:36:39 -04:00
Brant Martin
dc0a085d86 Merge branch 'master' into Patron 2019-06-06 15:36:32 -04:00
Brant Martin
0a852c49e8 Copy missing dll 2019-06-06 15:35:54 -04:00
Brant Martin
59588517d8 Merge branch 'master' into PreRelease 2019-06-06 15:15:44 -04:00
Brant Martin
3a7cbe48b8 Merge branch 'master' into Patron 2019-06-06 15:15:31 -04:00
Brant Martin
ed298cdfb0 Fix for update 2019-06-06 15:11:39 -04:00
Brant Martin
121846eeae Fix rare crash in entity view sorting 2019-06-03 19:56:29 -04:00
Brant Martin
7036a4da81 Enable deleting characters when there is no controller attached.
Increase !save timeout to 5 mintues
2019-06-02 11:15:16 -04:00
Brant Martin
91ceb0aa22 Implement ScrollContainerProperty to allow plugins to disable the default scrollviewer wrapper on their controls 2019-05-08 18:34:09 -04:00
John Gross
de12327ac2 Merge branch 'master' into Patron 2019-05-06 23:54:52 -07:00
John Gross
6f65b54883 stop 2019-05-06 23:54:02 -07:00
John Gross
c0ffd7e641 Merge branch 'master' into Patron 2019-05-06 18:59:12 -07:00
John Gross
b0c1ccf9b4 Add NLog-user.cfg to build output 2019-05-06 18:01:40 -07:00
Brant Martin
53ae9bc42d Remove debug code 2019-05-04 18:40:17 -04:00
Brant Martin
9813d6946a Refactor plugin loading. All active plugins must now be listed in torch.cfg 2019-05-03 21:39:56 -04:00
Brant Martin
8bc4c247e6 Enable the scrollbar on the config page 2019-04-22 15:55:02 -04:00
Brant Martin
92406a051a Add bulk editing of roles 2019-04-22 15:44:34 -04:00
Brant Martin
068b074de0 Add player display to main UI window. Ref TorchAPI/Essentials#106 2019-04-20 09:02:21 -04:00
Brant Martin
bb0ee3b861 Add editor for player promotion levels. Resolves #280 2019-04-19 21:30:10 -04:00
John Gross
93bb11c135 Fix crash on invalid command from UI 2019-04-19 11:23:04 -07:00
John Gross
2fd8c17525 Merge branch 'master' into Patron 2019-04-19 08:26:04 -07:00
John Gross
b974487fc4 Fix for command response in UI. How did this ever work? 2019-04-16 11:57:13 -07:00
John Gross
b4addcc125 Add nullchecks to player action buttons 2019-04-15 15:41:13 -07:00
Brant Martin
aaabfa2d01 Merge branch 'master' into Patron 2019-04-10 16:31:19 -04:00
John Gross
7d8838c0ee Add customizable server chat name and color 2019-04-08 19:46:58 -07:00
N1Ran
0e43eee2f3 Fix for the GUI entity count. Revert just the count from Sorted 2019-03-09 09:51:03 -05:00
Jimmacle
c6121ab590 Merge pull request #298 from TorchAPI/master
Update events/UI to reflect new chat
2019-03-08 12:58:45 -08:00
John Gross
72ceeffdad Update events/UI to reflect new chat 2019-03-05 11:31:00 -08:00
Brant Martin
0a5a70f583 csproj didn't update for some reason 2019-03-02 14:38:52 -05:00
Brant Martin
263a8229fa Enable hyperlinks.
Sanitize hyperlinks.
2019-03-02 12:14:32 -05:00
Brant Martin
651865f28a Implement plugin browser and downloader 2019-03-02 11:42:08 -05:00
John Gross
295bbd62b8 Fix window size shenanigans breaking the config 2019-02-28 13:44:14 -08:00
Brant Martin
df225a3d2f Add new config options 2019-02-27 17:05:15 -05:00
John Gross
fb3082094a Revert unnecessary playtest things 2019-02-25 12:47:25 -08: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
Brant Martin
3e341e02c8 Make Torch UI remember its last screen size/position. Fixes #260
(this is Jim's fault)
2019-02-25 14:06:38 -05:00
Brant Martin
a673848089 Implement a truly terrible bulk mod editing mode. 2019-02-25 13:59:13 -05:00
Brant Martin
642186678e Fix new world generator breaking with non-default instance paths #286 2019-02-25 12:55:04 -05:00
Brant Martin
967d8ce068 Add independent console option. Various random fixes 2019-02-20 20:20:09 -05:00
Brant Martin
2bb3aa84a7 Fix entity sorting 2019-02-20 20:19:46 -05:00
Brant Martin
82ddd3942b Remove mod textbox 2019-02-20 16:04:59 -05:00
Brant Martin
1c6eec61af Add basic, experimental entity sorting 2019-02-10 16:29:08 -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
Jimmacle
8f755a5cfc Update Initializer.cs 2019-01-31 11:45:11 -08:00
John Gross
63ac99f97a Revert "Change init order to ensure paths are initialized for plugins"
This reverts commit 3f803b8107.
2019-01-25 13:16:14 -08:00