Commit Graph

445 Commits

Author SHA1 Message Date
Will Berry
6203d5ab85 Merge pull request #43 from wdberry/picker-dollies-blocklist-implementation
Prevent Picker Dollies from moving Cybernetic Combinator
2023-03-14 13:28:43 -04:00
Will Berry
8194e9695b Remove GUI button if exists and GUI disabled 2023-03-14 13:18:11 -04:00
mamoniot
634fe010c2 updated date 2023-03-14 12:46:15 -04:00
mamoniot
6bae0ca154 Merge branch 'experimental' of github.com:mamoniot/project-cybersyn into experimental 2023-03-14 12:45:58 -04:00
mamoniot
16ba3d2faf added changelog entry 2023-03-14 12:45:55 -04:00
Will Berry
028263e46b Prevent Picker Dollies from moving Cybernetic Combinator 2023-03-14 09:06:49 -04:00
Will Berry
bfefc4f525 Merge pull request #42 from wdberry/gui-trains-tab
Migrate GUI development branch
2023-03-13 19:19:09 -04:00
Will Berry
33ab98db59 Change GUI enable setting to off by default for opt-in 2023-03-13 19:13:21 -04:00
Monica Moniot
f30ce4e08f Merge pull request #41 from matthew-sharp/threshold-override
Provider threshold override fixes
2023-03-13 18:21:08 -04:00
mamoniot
5d9d8ca442 Merge branch 'experimental' of github.com:mamoniot/project-cybersyn into experimental 2023-03-13 17:37:49 -04:00
mamoniot
0fc9f40d14 fixed SE compat bug 2023-03-13 17:36:46 -04:00
Will Berry
6cc96b9506 Merge pull request #40 from wdberry/make-gui-work
Fully Functional Stations & Inventory Tabs in Manager
2023-03-13 16:53:34 -04:00
mamoniot
7ee238ca6f fixed type info 2023-03-13 16:44:52 -04:00
Will Berry
e97d0ed95a Merge branch 'make-gui-work' into gui-trains-tab 2023-03-13 15:33:32 -04:00
Will Berry
25e7622c09 Merge remote-tracking branch 'origin/experimental' into make-gui-work 2023-03-13 15:32:09 -04:00
mamoniot
9e485a2de0 fixed bug where stations had nil network flags 2023-03-13 15:23:23 -04:00
Matt Sharp
9c5909844e Provider threshold override fixes
* Use override threshold only if smaller than requester
* Select train based off overriden threshold
2023-03-12 08:04:01 +11:00
Will Berry
9275d14a46 Merge branch 'make-gui-work' into gui-trains-tab 2023-03-10 20:36:33 -05:00
Will Berry
c75ba3a517 re-implemented item search via choose-elem-button for exact matching regardless of locale 2023-03-10 20:20:44 -05:00
Will Berry
3aa3eb970a Allow partial match on train item search 2023-03-10 19:42:23 -05:00
Will Berry
a9d4a22310 Merge branch 'make-gui-work' into gui-trains-tab 2023-03-10 19:38:31 -05:00
Will Berry
0cd1292ed6 appears successful 2023-03-10 19:37:31 -05:00
Will Berry
4be0ab2004 Fix invalid reference 2023-03-10 19:25:49 -05:00
Will Berry
726b8162be Potential item search implementation 2023-03-10 13:57:28 -05:00
Will Berry
6a89b5162c Merge branch 'make-gui-work' into gui-trains-tab 2023-03-10 13:30:35 -05:00
Will Berry
681358705f fix invalid reference 2023-03-10 13:29:59 -05:00
Will Berry
efeb2d5c8b Fix invalid reference 2023-03-10 13:29:22 -05:00
Will Berry
de9b2c0571 Merge branch 'make-gui-work' into gui-trains-tab 2023-03-10 13:06:08 -05:00
Will Berry
42c1285dba Prevent crash for attempting to move camera to a surface different than the camera is currently on 2023-03-10 13:05:55 -05:00
Will Berry
a16a5fc015 Add logic from upstream to only refresh train tab if selected and allow for query limt 2023-03-10 12:48:43 -05:00
Will Berry
23d65bdabe Merge branch 'make-gui-work' into gui-trains-tab 2023-03-10 12:42:44 -05:00
Will Berry
458ef89f58 Add query limit per-player setting to limit results in Stations/Trains GUI tabs 2023-03-10 12:39:39 -05:00
Will Berry
9343d06620 Only refresh open tab and exclude virtual signals from provided/requested on stations tab 2023-03-10 10:19:30 -05:00
Will Berry
8d182cbc3b Fix invalid train object reference by validating train is valid before adding it to the list 2023-03-10 09:33:26 -05:00
Will Berry
fd3d62ea9d Trains tab initial testing 2023-03-09 16:45:14 -05:00
Will Berry
118f8c9eb2 Added startup mod setting to disable/enable manager in the event it causes crashes or UPS issues so that it can be "optional" 2023-03-09 14:47:50 -05:00
Will Berry
c178555343 Reverted the half-baked remote interface and added a command instead to recreate the window 2023-03-09 14:32:17 -05:00
Will Berry
5342e80183 Removed manager window from being recreated every open and close and added remote interface to manually rebuild it for people who have already run the migration that initializes it 2023-03-09 13:45:43 -05:00
Will Berry
7aeab43598 Changed default for network filter to be nothing rather than network each 2023-03-09 13:24:23 -05:00
Will Berry
547bb93390 Fix crash condition on station with non-virtual signal for network 2023-03-09 12:59:37 -05:00
Will Berry
7d60f9412a Attempt to fix reported crash __cybersyn__/scripts/gui/stations.lua:110: bad argument #2 of 3 to 'btest' (number expected, got nil) 2023-03-09 12:09:16 -05:00
Will Berry
c55a5fc79d Add mod setting, add click handlers for station tab 2023-03-09 11:27:54 -05:00
Will Berry
38770b67bd fix incorrect default signal name 2023-03-08 12:53:04 -05:00
Will Berry
838f6f50b2 attempt to fix reported crash 2023-03-08 12:04:20 -05:00
Will Berry
4927539d75 Everything but configurable mod settings should be good to go, potential release candidate. 2023-03-07 16:38:08 -05:00
Will Berry
d5fb6417fa Minor refactoring, fixed localization for EN on GUI, added incompatibility with LtnManager due to potential issues with collisions, renamed some LtnManager references in code. 2023-03-07 11:34:09 -05:00
Will Berry
732d63d65b Modify GUI tick rate to 10s from 1s and refactor some of the stations code with improvements from inventory 2023-03-06 13:02:50 -05:00
Will Berry
af5f606cbb MVP Stations and Inventory tabs 2023-03-06 12:47:09 -05:00
Will Berry
7e745232bc BEHOLD, the magical duplicating inventory 2023-03-05 23:07:13 -05:00
Will Berry
f8756efbae missed staging file 2023-03-05 15:37:39 -05:00