Commit Graph

4078 Commits (8d40ca8be68725c11dcaadbc95cb20084bd93649)

Author SHA1 Message Date
Myk 6433f87dd4
Merge pull request #2961 from myk002/myk_case_insensitive
make FilteredList searching case insensitive by default
2023-02-26 21:39:14 -08:00
Myk Taylor c513c246a5
more SDL wrapping for stonesense 2023-02-26 21:18:16 -08:00
Myk Taylor 851bb50dc8
add SDL_PushEvent shim for RemoteFortressReader 2023-02-26 21:18:08 -08:00
20k c38a288eee use insert_into_vector, tweak docs again 2023-02-27 02:15:26 +00:00
20k c0bd452c86 add a failure case check just in case 2023-02-27 02:06:36 +00:00
20k 3c1d3ce21c rework docs, comments, clean up unnecessary init 2023-02-27 01:45:10 +00:00
20k 0c9a9c8b9e cleanup remaining unk 2023-02-26 18:09:10 +00:00
20k e50f3dbb64 remove unnecessary init 2023-02-26 18:09:10 +00:00
20k 1eeefdd598 clean up a variety of unks 2023-02-26 18:05:42 +00:00
20k 2bd48f1f90 address some review comments 2023-02-26 18:05:35 +00:00
20k d84b118767 docs, rework, rename 2023-02-26 18:05:35 +00:00
20k 3912c6290f Military module start 2023-02-26 18:05:34 +00:00
20k ce3ee386fd makeSquad, updateRoomAssignments 2023-02-26 18:05:34 +00:00
Myk Taylor 656a26504a
make FilteredList searching case insensitive by default 2023-02-26 09:47:15 -08:00
Myk Taylor 2b59d6ee3d
make dfhack.job.attachJobItem available to Lua 2023-02-26 09:40:02 -08:00
Myk 3cddea9b61
Merge branch 'develop' into myk_clear_tile 2023-02-26 09:25:05 -08:00
Myk fced215ac2
Merge branch 'develop' into myk_no_disabled_click 2023-02-26 09:24:32 -08:00
Myk 0270766a6d
Merge branch 'develop' into myk_dynamic_tile 2023-02-26 09:24:04 -08:00
Myk e81a45a742
Merge pull request #2952 from myk002/myk_keep_focus
[Gui] don't prefix focus strings that are already properly marked
2023-02-26 09:23:42 -08:00
Myk bf64f1d985
Merge pull request #2948 from myk002/myk_interior_frame
Add standard interior frame to gui.lua
2023-02-26 09:23:09 -08:00
Myk ff464c4746
Merge pull request #2947 from myk002/myk_join_strings
[MiscUtils] add templated version of join_strings
2023-02-26 09:22:56 -08:00
Myk 098c538754
Merge pull request #2946 from myk002/myk_safety_first
[isSuitableMaterial] detect lack of fire and magma safety for vulnerable materials with high melting points
2023-02-26 09:22:38 -08:00
Myk c7f6ee57d7
Update library/Core.cpp 2023-02-25 11:00:51 -08:00
Kelly Kinkade 0a65c423ce a squirrel distracted me 2023-02-25 04:07:24 -06:00
Kelly Kinkade 87e06cf960 deoops 2023-02-25 02:42:28 -06:00
Kelly Kinkade cfa649b4ac clean up code for C++20 readiness
two change:

* remove use of `register` in `md5.cpp`
* remove use of `using namespace std` in `Core.cpp` (which causes an ambiguous name resolution error between `byte` and `std::byte`). while there are other ways to resolve this, `using namespace std` is a code smell anyway, so eliminating it is the best option
2023-02-24 20:52:49 -06:00
Myk Taylor f1d5551e51
fix on-map character rendering 2023-02-24 17:23:01 -08:00
Myk Taylor 88516a899a
allow map interface tiles to be cleared 2023-02-24 17:22:55 -08:00
Myk Taylor d7d3dcb0be
keep focus strings if they are already labeled
i.e. don't add a "dfhack/" prefix if the focus string already has the
string "dfhack" in it
2023-02-24 17:20:12 -08:00
Myk Taylor 1cacc526e3
allow token.tile to be a function 2023-02-24 17:16:30 -08:00
Myk Taylor 8b378735fa
don't fire HotkeyLabel if the label is disabled 2023-02-24 17:13:45 -08:00
Myk Taylor 75b1cd748a
convert otherwise unused THIN_FRAME to INTERIOR_FRAME
without a signature
2023-02-24 17:07:57 -08:00
Myk Taylor a684f294c5
add templated version of join_strings 2023-02-24 17:05:08 -08:00
Myk Taylor 30ea58374c
better detection of fire and magma safety 2023-02-24 16:57:44 -08:00
Myk Taylor 4bf0849d51
fix usage of squad equipment vector 2023-02-24 15:50:56 -08:00
Myk Taylor b8fdc985ec
bump version and changelog to 50.07-alpha2 2023-02-24 15:41:54 -08:00
DFHack-Urist via GitHub Actions f84299bc46 Auto-update submodules
library/xml: master
2023-02-24 23:31:20 +00:00
DFHack-Urist via GitHub Actions 1ed0a41dd1 Auto-update submodules
library/xml: master
scripts: master
2023-02-23 07:15:08 +00:00
Myk 3fa9babb48
Merge pull request #2911 from kelvie/label-hover
Usability: Show mouse hover on all clickable Labels/Lists
2023-02-22 20:39:02 -08:00
Kelvie Wong 3c24e67a9a Address additional PR comments
on_activate is likely to happen first so we shouldn't need to check the
other.
2023-02-22 17:22:04 -08:00
DFHack-Urist via GitHub Actions 81db7f09a2 Auto-update submodules
library/xml: master
2023-02-21 07:15:14 +00:00
DFHack-Urist via GitHub Actions 13e4d327f8 Auto-update submodules
library/xml: master
scripts: master
2023-02-19 03:34:02 +00:00
Kelvie Wong 697f15224c Address PR comments, and remove BG fill
BG fill eats up a lot of cycles anyway, and there's not a real tangible
benefit in all cases, as it relies on the text label being sized
appropriately (width-wise) to the container, or would otherwise require
padding.
2023-02-18 16:07:40 -08:00
Kelvie Wong 61227eeca1 Fix use of pens in render_text
If you ever pass in a number to `dc:pen` rather than a pen table, it
will assume the old pen's other attributes, such as `bg` and `bold`.

To workaround this, we just never pass in a number, and always call
`to_pen` aka `dfhack.pen.parse` first.
2023-02-18 16:07:40 -08:00
Kelvie Wong 94ae9973cf Re-add the invert_color function
As requested, but it's not used anymore.
2023-02-18 16:07:40 -08:00
Kelvie Wong 3e8d0f0f1e Properly reverse BG/FG and apply per letter
This puts pen creation deeper into the loop in render_text.

Lists are current coloured completely wrong, though, and need
fixing (and probably anywhere else where disabled is set).
2023-02-18 16:07:40 -08:00
Kelvie Wong 0897ca913a Support mouse-hover on lists as well 2023-02-18 16:07:40 -08:00
Kelvie Wong 0b48471607 Invert brightness of the background as well
This required some tinkering.
2023-02-18 16:07:40 -08:00
Kelvie Wong 2d68b21547 Show mouse hover on HotkeyLabels
Labels show the hover colour when on_click is set, HotkeyLabels should
also do the same when they are clickable.
2023-02-18 16:07:40 -08:00
Robob27 4167c2e652 Add key_back, rename switch_tab_key to key 2023-02-16 02:56:52 -05:00
Robob27 5154eb181a Add Tab/TabBar to widgets 2023-02-16 02:51:09 -05:00
Myk 00428a9140
Merge pull request #2910 from silverflyone/develop
Not all stockpile items being returned for getStockpileContents.
2023-02-15 23:33:39 -08:00
DFHack-Urist via GitHub Actions 36935056ea Auto-update submodules
library/xml: master
scripts: master
2023-02-16 07:15:08 +00:00
silverflyone 3ad66d5c2f
Merge branch 'develop' into develop 2023-02-16 15:05:23 +11:00
DFHack-Urist via GitHub Actions 39f13b642f Auto-update submodules
library/xml: master
scripts: master
2023-02-15 07:15:04 +00:00
silverflyone d8afb6c682 Update Buildings.cpp
Changed the StockpileIterator::operator++ to checks block based on <= 16 rather than <16. Previously it was not returning items at stockpile tiles at the block boundary. Identified as part of combine.lua changes.
2023-02-15 15:31:50 +11:00
Myk 805d68017f
Merge pull request #2905 from myk002/myk_mouse
prevent mouse clicks from bleeding through when a window is dismissed
2023-02-14 06:46:43 -08:00
DFHack-Urist via GitHub Actions 66229bb669 Auto-update submodules
library/xml: master
scripts: master
2023-02-14 07:15:30 +00:00
Myk Taylor bc76fd02e2
prevent mouse clicks from bleeding through when a window is dismissed 2023-02-13 17:35:02 -08:00
Kelvie Wong f8d94afb7d Add getSelectedCivZone to dfhack.gui
Mostly helpful for my own automation in my custom lua scripts.

Tested it with barracks, meeting areas, and pastures.
2023-02-13 15:22:33 -08:00
Myk Taylor 6202b29c56
adapt autolabor to new split game structure 2023-02-13 13:39:28 -08:00
DFHack-Urist via GitHub Actions 2fe0d8932e Auto-update submodules
library/xml: master
scripts: master
2023-02-13 21:29:24 +00:00
Myk Taylor e5072a4f64
check for settings in the ATTRS, not the args 2023-02-13 09:28:14 -08:00
Myk Taylor 853859e119
refine ZScreen behavior around pausing, update docs 2023-02-13 09:09:39 -08:00
Myk 8dd938c5a6
Merge pull request #2891 from robob27/filteredlist-on-change
Add edit_on_change to FilteredList
2023-02-12 18:41:41 -08:00
DFHack-Urist via GitHub Actions 2a04abb1cb Auto-update submodules
library/xml: master
scripts: master
2023-02-12 22:47:20 +00:00
Robob27 7651f6a91e Add edit_on_change to FilteredList 2023-02-12 17:44:19 -05: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