Commit Graph

3962 Commits (766738e10277bd165f3f4f45aa43fe5e3f82aa6d)

Author SHA1 Message Date
DFHack-Urist via GitHub Actions 2a04abb1cb Auto-update submodules
library/xml: master
scripts: master
2023-02-12 22:47:20 +00:00
Myk 50e9ad93f3
Merge pull request #2869 from robob27/moar-units-checks
Add isGeldable, isMarkedForGelding and isPet
2023-02-12 01:27:37 -08:00
DFHack-Urist via GitHub Actions 6b4c1e7787 Auto-update submodules
library/xml: master
2023-02-12 01:53:03 +00:00
Robob27 65f38ec75c Add isGeldable, isMarkedForGelding, isPet 2023-02-11 05:44:45 -05:00
Myk Taylor 5100a7ea40
bump to 50.07-alpha1 2023-02-10 10:26:37 -08:00
Myk c8b5f66429
Merge branch 'develop' into detect-manual-save 2023-02-10 08:23:02 -08:00
Myk Taylor 960bfaca86
fix annotation parsing
ref: #2857
2023-02-10 08:15:44 -08:00
Robob27 533ccee099 Detect manual save 2023-02-10 02:55:36 -05:00
DFHack-Urist via GitHub Actions e160bd0607 Auto-update submodules
library/xml: master
scripts: master
2023-02-10 07:15:13 +00:00
vallode 991c6d89e8 Fix annotation parse error 2023-02-09 23:50:11 +01:00
DFHack-Urist via GitHub Actions 7cc3c08926 Auto-update submodules
library/xml: master
scripts: master
2023-02-09 05:14:15 +00:00
DFHack-Urist via GitHub Actions 252a05ba11 Auto-update submodules
library/xml: master
scripts: master
2023-02-09 00:02:46 +00:00
Myk Taylor 8bd9853597
make gcc happy 2023-02-08 14:16:11 -08:00
Myk 1787d2435c
Merge branch 'develop' into hotkeylabel-enhancements 2023-02-08 12:37:16 -08:00
Myk Taylor cd12f95849
add const & to Push overloads; remove circular def 2023-02-08 12:15:19 -08:00
Myk 201fec6873
Merge pull request #2837 from robob27/case-insensitive-filterlist
Add case_sensitive attr to FilteredList
2023-02-08 11:18:31 -08:00
Robob27 b950b56926 Add methods to HotkeyLabel 2023-02-08 13:00:13 -05:00
Robob27 54560bc5db Don't duplicate regex 2023-02-08 03:39:43 -05:00
Robob27 c1b9de87d2 Add case_sensitive attr to FilteredList 2023-02-08 03:39:43 -05:00
DFHack-Urist via GitHub Actions d0b4b1a4a5 Auto-update submodules
library/xml: master
2023-02-08 07:36:55 +00:00
lethosor 468e9875e5
Update DFHack version to 50.07-alpha0, update xml 2023-02-08 00:00:31 -05:00
Myk Taylor ef81a91181
only realign out-of-alignment list positions 2023-02-07 14:12:52 -08:00
DFHack-Urist via GitHub Actions b2ecb8aaab Auto-update submodules
library/xml: master
scripts: master
2023-02-07 20:53:12 +00:00
DFHack-Urist via GitHub Actions df5184d751 Auto-update submodules
library/xml: master
scripts: master
2023-02-07 07:14:45 +00:00
Roxy 826f918954 remove isHospital as hospitals are no longer civzones 2023-02-06 19:11:00 -05:00
Roxy ca5a17a799 explanatory comment for magic number 2023-02-06 19:09:47 -05:00
Roxy a38246aaa4 Update logic for zone type checks 2023-02-06 16:47:50 -05:00
Myk c0358d642d
Merge pull request #2833 from myk002/myk_list_recenter
ensure scrollable lists are centered in the visible viewport
2023-02-06 12:57:43 -08:00
Myk Taylor 0b9b258224
ensure scrollable lists are centered in the visible viewport 2023-02-06 12:54:05 -08:00
John Cosker fdf1d38b23 Merge branch 'cycle-hotkey-rev' of https://github.com/johncosker/dfhack into cycle-hotkey-rev 2023-02-06 15:13:13 -05:00
John Cosker 36391af27c More cleanup 2023-02-06 15:12:47 -05:00
John Cosker 0769afc961
Merge branch 'develop' into cycle-hotkey-rev 2023-02-06 15:04:57 -05:00
John Cosker 39dc0ccc8a Cleanup 2023-02-06 15:03:28 -05:00
John Cosker e1f74ab068 Tweak to completely nil the key_back table for setText if not set 2023-02-06 14:53:26 -05:00
ElsaTheHobo d09f8553a0 Delete makeown.lua 2023-02-06 13:34:31 -05:00
Myk 041909dfa7
Merge pull request #2822 from myk002/myk_rclick
prevent rclick from bleeding through (again)
2023-02-06 09:17:28 -08:00
Myk 448598e391
Merge pull request #2823 from myk002/myk_hotkey_guards
implement some Gui module hotkey guards
2023-02-06 09:17:18 -08:00
Myk 99f84fa175
Merge pull request #2811 from TaxiService/patch-3
increase min scrollbar height to 2 (from 1)
2023-02-06 08:10:08 -08:00
John Cosker d7d6c5aea6 Backwards options for cycle hotkey working 2023-02-06 08:55:46 -05:00
Myk Taylor 9e318842a4
implement some Gui module hotkey guards
and clean up focus string matching logic
2023-02-06 00:58:57 -08:00
Myk Taylor 2ddd23e45d
prevent rclick from bleeding through (again) 2023-02-06 00:57:33 -08:00
Myk Taylor 526d7c1726
allow focus string generation to fall through unfocuses ZScreens 2023-02-05 18:01:46 -08:00
Rob Goodberry 443fe5d813
Update library/Core.cpp
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-05 19:07:49 -05:00
Robob27 c8d672eb05 Remove duplicate SquadEquipment entry 2023-02-05 19:04:21 -05:00
Robob27 6657fb59e5 Fix pausing and warnings 2023-02-05 19:04:21 -05:00
Robob27 2bf9b86c7b Fix getCurFocus lua, use where appropriate in c++ 2023-02-05 19:04:21 -05:00
Robob27 36e4bba779 Fixup prefix matching 2023-02-05 19:04:21 -05:00
Robob27 cece0bfca1 Remove unnecessary comment 2023-02-05 19:04:21 -05:00
Robob27 14f1e4b52f Per confirm pause maybe? 2023-02-05 19:04:21 -05:00
Robob27 f7df51587c More focus strings, correct docs 2023-02-05 19:04:21 -05:00