Commit Graph

424 Commits

Author SHA1 Message Date
Brant Martin
72be1b8dbf Merge branch 'master' of https://github.com/TorchAPI/Torch 2018-10-08 18:00:55 -04:00
Brant Martin
1d7b642c50 Tweak network reflection. Should fix #259 2018-10-08 18:00:40 -04:00
John Gross
831722dd84 Add remote API support 2018-09-28 21:48:24 -07:00
Brant Martin
ee3dd0b5bd Fix network injection (Keen broke it) 2018-09-27 10:28:18 -04:00
Brant Martin
7480847677 Add game version to !ver command 2018-09-18 10:42:46 -04:00
Brant Martin
0ff715af1b Remove server password when password field is blank. 2018-08-30 10:07:02 -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
74b00d3ab1 Add server password to config UI 2018-08-23 06:38:20 -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
John Gross
016203d2bc Merge pull request #251 from TorchAPI/plugin-asm-resolve
Fix assembly resolving.
2018-08-15 19:10:26 -07:00
Westin Miller
b65efa2968 Fixed error message 2018-08-15 19:07:27 -07:00
Westin Miller
4fc5f10bad Ignore resource assemblies 2018-08-14 16:33:02 -07:00
Westin Miller
f8e9d68ceb Don't unregister plugin assembly resolver. 2018-08-13 19:33:38 -07:00
Brant Martin
65e8d62391 Copy Keen's minidump on crash system. 2018-08-07 08:18:31 -04:00
Westin Miller
93fa82201a Merge pull request #242 from TorchAPI/eq-patcher-locals
Allow prefixes and suffixes to declare shared locals
2018-07-27 07:35:37 -07:00
Westin Miller
71930182dd Allow prefixes and suffixes to declare shared locals 2018-07-27 07:15:55 -07:00
Brant Martin
8764540d3b Set TorchUI window title with InstanceName setting (in torch.cfg) 2018-07-26 23:24:40 -04:00
Brant Martin
6a6676c1cb Revert "Collection editor improvements. Allows reordering of elements, and actually updates the list when content changes."
This reverts commit 14e16a959f.
2018-07-24 21:17:08 -04:00
John Gross
5bf91f1891 Improve UI layout, add flags enum editor to PropertyGrid 2018-07-24 12:51:13 -07:00
Brant Martin
14e16a959f Collection editor improvements. Allows reordering of elements, and actually updates the list when content changes. 2018-07-23 21:50:42 -04:00
John Gross
3b72724966 Update session settings 2018-07-22 10:14:06 -07: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
John Gross
4901120be4 Fix online player list reflection 2018-07-19 14:32:28 -07:00
John Gross
21e45b5e45 Hotfix for assembly loading issues 2018-07-19 11:57:30 -07:00
John Gross
b829e90edb Merge pull request #238 from TorchAPI/experiment
MP Update
2018-07-19 10:18:49 -07:00
Brant Martin
fbf7fa6176 Merge branch 'experiment' of https://github.com/TorchAPI/Torch into experiment 2018-07-18 22:35:23 -04:00
Brant Martin
2b413ef609 Fix mod settings 2018-07-18 22:35:11 -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
c9a5472282 Merge branch 'master' into experiment 2018-07-18 20:24:15 -04:00
Brant Martin
b12199c65b Revert "Let Jenkins download the new branch so the build doesn't blow up"
This reverts commit 4c34a653bd.
2018-07-18 19:38:04 -04:00
Brant Martin
b4ac097910 Revert "SteamCMD is trash"
This reverts commit ebc8b7a7fd.
2018-07-18 19:35:23 -04:00
Brant Martin
aae4ec97a9 Revert "STEAM PLEASE"
This reverts commit 06eca83ff9.
2018-07-18 19:35:22 -04:00
Brant Martin
45d931b351 Revert "I don't even know anymore"
This reverts commit 63f504feb7.
2018-07-18 19:35:20 -04:00
Brant Martin
f53c9660fe Revert "TRY THINGS UNTIL IT WORKS"
This reverts commit b89b61496b.
2018-07-18 19:35:18 -04:00
Brant Martin
c889854818 Minor fixes to client mod 2018-07-18 19:25:08 -04:00
Brant Martin
b8b0a0fcce Make PropertyGrid controls immune from scrollbar wrapping (caused by #218) 2018-07-08 18:25:06 -04:00
Brant Martin
b3f9d7e5c7 Make description box in property grids not clip 2018-07-08 17:46:53 -04:00
Brant Martin
94b457d9c0 Merge pull request #236 from TorchAPI/client-mod
Client mod
2018-07-06 15:30:39 -04:00
Brant Martin
0c58655708 Merge branch 'master' into client-mod 2018-07-06 15:28:15 -04:00
Brant Martin
ba98e0a15a Stop Equinox complaining about session download patch not being static 2018-07-03 18:34:09 -04:00
Brant Martin
5496ad1198 Make get-only collections editable in propertygrid 2018-07-03 14:47:36 -04:00
Brant Martin
7bad6149b5 Refactor ObjectCollectionEditor so it's embeddable in a propertygrid.
Make the listbox actually update when items are added/removed.
2018-07-03 14:47:19 -04:00
Westin Miller
378905268d Update Jenkinsfile
This time remove the correct one.
2018-07-02 08:40:09 -07:00
Westin Miller
f56a700fea Update Jenkinsfile
Remove the client build package.  It was broken anyways.
2018-07-02 08:38:21 -07:00
Brant Martin
736176ce27 Fix custom control type in property grids 2018-07-02 11:27:43 -04:00
John Gross
96d749c512 Merge pull request #234 from SinZ163/fix-231
Disable "Import World Config" button when there are no worlds available
2018-07-01 09:33:14 -07:00
Trent Monahan
17514c89ad Disable ImportWorldConfig when there are no worlds to import 2018-07-01 15:46:07 +10:00
Brant Martin
8b08f2b747 Enable multiline editing of string values in propertygrids 2018-06-23 03:21:45 -04:00