MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,524 Commits
1 Branch
0 Tags
40 MiB
Commit Graph

4267 Commits (1d356bf35123050c8ad8c382b2cecd085965aece)

Author SHA1 Message Date
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
Robob27 212026861f WIP list fix 2023-02-15 19:29:45 -05: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
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
Robob27 fdbe91e35b Add the rest of the bottom modes 2023-02-05 19:04:21 -05:00
Robob27 8f32f1ed7b Fixup focusStrings->focusString 2023-02-05 19:04:21 -05:00
Robob27 86b57380a6 fixup unnecessary changes, remove unnecessary stuff 2023-02-05 19:04:21 -05:00
Robob27 dc40f7182c Fix warning 2023-02-05 19:04:21 -05:00
Robob27 085a308e99 Remove/readd comments 2023-02-05 19:04:21 -05:00
Robob27 6e442a26ca More WIP 2023-02-05 19:04:21 -05:00
Robob27 a770a4cae4 WIP 2023-02-05 19:04:21 -05:00
Myk 3ca2521ce9
Merge pull request #2807 from Bumber64/patch-1 
Update Units::isFortControlled
 2023-02-05 15:43:31 -08:00
Ryan Williams 08d90de277
Merge branch 'DFHack:develop' into patch-1 2023-02-05 12:02:58 -08:00
TaxiService b6196e91e4
increase min scrollbar height to 2 (from 1) 
rationale:
- vanilla scrollbars dont get shorter than 2.
- 2-tall 'bars are easier to click on than 1-tall 'bars.
- this avoids having to make short custom graphics for 1-tall tiles, which most of the time look terrible...

cons:
- short scrollbars are cool : (
 2023-02-05 19:00:38 +01:00
TaxiService 30a1f2f924
de-hardcoding scrollbar spritesheet definitions 
added a new variable "SBSO", and redefined all scrollbar tile definitions as this variable + an offset.
this could make it easier to switch scrollbar graphics from within the game, if necessary.
 2023-02-05 18:56:51 +01:00
Ryan Williams 1eb67ab239
Update Gui::resetDwarfmodeView 
* Set `plotinfo->main.mode` again now that alignment is fixed
* Left note about unidentified global
* DF resets the whole `selection_rect` struct
* Comments for `ANNOUNCE_LINE_DURATION` and `ANNOUNCE_DISPLAY_TIME` constants reflect the default 50 GFPS
 2023-02-04 19:56:37 -08:00
Ryan Williams 0f78509328
agitated_wilderness_creature is in unit->flags4 2023-02-04 19:29:37 -08:00
Ryan Williams c345acd417
Update Units::isFortControlled 
Add check for `agitated_wilderness_creature`.
 2023-02-04 18:48:41 -08:00
TaxiService de04cf04e0
wrong scrollbar sprites mapping fix (issue #2777) 
i've taken a crack at it, and this seems to fix this "issue" i filed here: https://github.com/DFHack/dfhack/issues/2777

https://i.imgur.com/aFnq80M.mp4
 2023-02-04 15:18:26 +01:00
Myk Taylor 71deeb7a48
bump version to 50.05-alpha3.1 2023-02-03 15:48:09 -08:00
Myk Taylor 4a21b0843f
bump to 50.05-alpha3 2023-02-03 14:28:17 -08:00
Myk Taylor 81abd52313
include TRACE messages in the build 2023-02-03 12:25:44 -08:00
Myk Taylor 345b7d78cb
pass attributes through FilteredList 2023-02-03 00:09:10 -08:00
Myk Taylor 2316615763
react to double clicks on list items 2023-02-03 00:09:10 -08:00
Myk Taylor 49246a60f3
properly cast for unsigned comparisons 2023-02-02 23:57:52 -08:00
Myk Taylor 8c7be9a8c2
don't use negative plant indices 
and clean up the Kitchen module a bit more
 2023-02-02 23:33:24 -08:00
DFHack-Urist via GitHub Actions bb6824ec11 Auto-update submodules 
library/xml: master
scripts: master
 2023-02-03 05:07:52 +00:00
Myk Taylor 2cf985be73
don't lose List scroll position when dragging 2023-02-02 19:42:41 -08:00
Myk Taylor 7d05a68c60
clean up changelog, update refs 2023-02-02 12:53:20 -08:00
Myk a3f32e66ad
Merge pull request #2775 from myk002/myk_non_defocusable 
add defocusable attribute to ZScreen
 2023-02-01 17:53:21 -08:00
Myk 1debea59a8
Merge branch 'develop' into myk_non_defocusable 2023-02-01 17:51:04 -08:00
Myk 7fbd95896d
Merge branch 'develop' into myk_pause_forced 2023-02-01 17:50:45 -08:00
Myk 21f93173c3
Merge pull request #2778 from myk002/myk_halfsies 
support offset text in graphics mode for pens
 2023-02-01 17:50:24 -08:00
Myk 7468170751
Merge pull request #2771 from myk002/myk_seedwatch 
update seedwatch
 2023-02-01 17:49:57 -08:00
Myk 6513b591bd
Merge pull request #2768 from myk002/myk_textures 
add textures used by new gui/control-panel
 2023-02-01 17:49:48 -08:00
Myk Taylor 58be8cfd69
support offset text in graphics mode for pens 2023-02-01 17:39:32 -08:00
Myk Taylor 55d07a8cae
actually use the tile 2023-02-01 14:51:46 -08:00
Myk Taylor 6ae771ecb4
display PAUSE FORCED instead of a pause icon 
if the window is forcing the game to pause. the icon looked too
clickable
 2023-02-01 14:01:29 -08:00
Myk Taylor 88860f21ec
add defocusable attribute to ZScreen 2023-02-01 08:46:32 -08:00
Myk Taylor aae5d5f411
reduce diff in Kitchen.h 2023-02-01 04:28:07 -08:00
Myk Taylor be40d55e64
update seedwatch 2023-02-01 04:03:28 -08:00
Myk Taylor 5127f06571
expose new tiles to Lua 2023-01-31 23:55:30 -08:00
Myk Taylor e442e23589
allow tile in Label tokens to be either pen or id 2023-01-31 23:54:27 -08:00
Myk Taylor aa22917aeb
add new control panel textures 2023-01-31 23:52:30 -08:00
Myk Taylor ab4c766817
Revert "allow tile list icons to be rendered properly" 
This reverts commit 508777897b.
the fix was incorrect. the icon should be set to the pen when it is
not a string, the icon_pen is only for when it is a string
 2023-01-30 08:48:45 -08:00
DFHack-Urist via GitHub Actions 4c17d79198 Auto-update submodules 
library/xml: master
 2023-01-30 02:28:17 +00:00
Myk 376526d512
Merge branch 'develop' into myk_no_stuck_df_viewscreens 2023-01-29 16:55:52 -08:00
Myk 274e995790
Merge pull request #2747 from myk002/myk_on_off 
Add new on/off icons
 2023-01-29 16:55:01 -08:00
Myk 0f07ac5a30
Merge pull request #2748 from myk002/myk_initial_pause 
make initial pause configurable for DFHack windows
 2023-01-29 16:54:50 -08:00
Myk edb2859ad4
Merge pull request #2749 from myk002/myk_no_auto_refresh 
don't autorefresh the enableable tools list
 2023-01-29 16:54:38 -08:00
Myk Taylor 1c6235633f
add dfhack.units.getCitizens() 2023-01-29 16:28:05 -08:00
Myk Taylor 8d4990b8fd
don't autorefresh the enableable tools list 
it just takes too long (>1s) to refresh every time.
manual refresh with script_manager.reload() is still available for devs
who need it
 2023-01-29 00:55:49 -08:00
Myk Taylor 4c455224f9
make initial pause configurable 2023-01-29 00:41:02 -08:00
Myk f420b4b77e
Merge pull request #2744 from myk002/myk_no_inception 
Solve the inception problem: prevent screens (e.g. gui/launcher) from hanging when they attempt to dismiss and show themselves simultaneously
 2023-01-29 00:38:17 -08:00
Myk Taylor c2d6debcd8
add on/off light textures and expose to lua 2023-01-29 00:35:29 -08:00
Myk Taylor 211d18717c
test against type instead of string 2023-01-28 23:34:56 -08:00
DFHack-Urist via GitHub Actions 6dc74f201d Auto-update submodules 
library/xml: master
scripts: master
 2023-01-29 07:13:24 +00:00
Myk 2003efc21f
Merge branch 'develop' into myk_no_stuck_df_viewscreens 2023-01-28 12:03:50 -08:00
Myk 99d1ed6828
Merge branch 'develop' into myk_no_inception 2023-01-28 11:58:37 -08:00
Myk 255307890b
Merge pull request #2735 from myk002/myk_resizable 
only mark the border corner as resizable if the window is resizable
 2023-01-28 11:55:39 -08:00
Myk 5f90756677
Merge pull request #2734 from myk002/myk_tiletypes 
Expose tiletype setting from the tiletypes plugin to lua
 2023-01-28 11:55:04 -08:00
Myk Taylor 114bc2a576
also lock down the world map 2023-01-28 08:57:24 -08:00
Myk Taylor a931ca692d
Fix debug level typo 2023-01-28 08:21:13 -08:00
Myk Taylor f12ca33c0b
ensure DF screens don't get "stuck" when DFHack tool windows are on top 2023-01-28 08:05:37 -08:00
Myk Taylor 863ca2ca65
solve the inception problem 
where hideGuard smashes the viewscreen stack with multiple insertions
for the same screen
 2023-01-28 08:02:46 -08:00
DFHack-Urist via GitHub Actions 9080af6948 Auto-update submodules 
library/xml: master
scripts: master
 2023-01-27 22:27:41 +00:00
Myk Taylor 18a2827385
only mark the border corner as resizable if the window is resizable 2023-01-27 14:20:21 -08:00
Myk Taylor 22dd49ce38
remove "room" checking for buildings -- there is no room 2023-01-27 13:38:21 -08:00
Myk Taylor c6f4a7ee42
inhibit _MOUSE_L globally once _MOUSE_L_DOWN is handled 
so the _MOUSE_L doesn't bleed through to the underlying viewscreen
 2023-01-27 13:36:01 -08:00
DFHack-Urist via GitHub Actions 5b83f30706 Auto-update submodules 
library/xml: master
scripts: master
 2023-01-27 03:14:34 +00:00
DFHack-Urist via GitHub Actions 2a8520fb9e Auto-update submodules 
library/xml: master
scripts: master
 2023-01-26 07:15:05 +00:00
Myk Taylor be59083202
reduce spacing for CycleHotkeyLabel from 2 to 1 2023-01-25 22:59:29 -08:00
DFHack-Urist via GitHub Actions 33132e5556 Auto-update submodules 
library/xml: master
 2023-01-25 19:41:45 +00:00
DFHack-Urist via GitHub Actions 15ab59b12d Auto-update submodules 
library/xml: master
scripts: master
 2023-01-25 07:17:04 +00:00
Myk Taylor c5f2588522
fix issues with clicks "falling through" scrollbars 2023-01-24 21:28:25 -08:00
Myk Taylor 4e35895cf4
fix build errors with channel-safely 2023-01-24 18:48:23 -08:00
DFHack-Urist via GitHub Actions 018715f869 Auto-update submodules 
library/xml: master
scripts: master
 2023-01-24 19:18:16 +00:00
Myk 83c89cfaa9
Merge pull request #2705 from myk002/myk_zscreen_redux 
Implement new ZScreen semantics
 2023-01-24 11:14:43 -08:00
Myk Taylor 0e03ac8e5b
don't use tabs in enable output 
so they display nicely in gui/launcher
 2023-01-23 23:50:08 -08:00
Myk Taylor f39eb42889
remove references to pinnable 2023-01-23 19:34:48 -08:00
Myk Taylor 1c2f8eccbf
paint pause symbol for force-pause windows 2023-01-23 19:02:26 -08:00
Myk Taylor 0905943ecf
don't unfocus if mouse is not being passed through 2023-01-23 18:05:03 -08:00
Myk Taylor 4377065081
move pause restore to dismiss 
and fix the condition
 2023-01-23 17:46:03 -08:00
Myk Taylor 8b98ba5042
allow windows to be defocused instead of pinned 2023-01-23 17:40:16 -08:00
Myk Taylor 5ad6ce16e8
don't change definitions of deprecated frame styles 2023-01-23 16:00:10 -08:00
Myk d0905a5e16
Merge pull request #2703 from myk002/myk_borders 
Add new borders for various use cases
 2023-01-23 11:20:28 -08:00
Myk Taylor 7329f6dee2
use new frame names 2023-01-23 04:16:38 -08:00
Myk Taylor fcb156ed43
add compatibility frames 2023-01-23 04:03:31 -08:00
Myk Taylor 9aaa55cd7f
add textures and frames for various use cases 2023-01-23 03:58:51 -08:00
Myk Taylor d34238918e
move helpdb from autorefresh to explicit refresh 
this greatly speeds up the launch time of `gui/launcher`
 2023-01-23 02:30:51 -08:00
Myk Taylor a6b3de1afb
support scrolling to the beginning or end in Label 2023-01-23 02:16:07 -08:00
Myk d82a795ef4
Merge pull request #2681 from 20k/develop 
More civzone <-> building work, add removing zones with associated squads support
 2023-01-22 17:14:24 -08:00
20k 4559168005 update for multiple ownership 2023-01-22 22:59:25 +00:00
20k b15fcc93d2 remove assignments on zone destroy 2023-01-22 15:26:55 +00:00
20k c7ca9d0d7b reverse squad iteration delete 2023-01-22 15:25:16 +00:00
Myk Taylor f862e4a6b7
comment out SEC_SELECT in dialogs 2023-01-22 03:09:07 -08:00
20k 598354d9d4 getbiometype naming, docs 2023-01-21 20:33:40 +00:00
20k 9054efd7c8 Update miscutils to support member pointer to a variable defined in the base when passing in a derived type 2023-01-21 19:15:28 +00:00
20k 3024c4a0df update to remove ambiguity after structures change 2023-01-21 18:45:36 +00:00
20k 1dbf01e5d1 Civzone interop style changes 2023-01-21 18:45:36 +00:00
20k 8c68f54f50 update with squad removal support 2023-01-21 18:45:36 +00:00
Myk Taylor bb16009f49
bump version to 50.05-alpha2 2023-01-20 17:13:28 -08:00
Myk Taylor acf2b8b319
use newly narrowd relations vector 2023-01-20 14:30:48 -08:00
Myk 310940e1a2
Merge branch 'develop' into Autoclothing 2023-01-20 14:05:26 -08:00
Rose 8e6252fc2b Small fixes to make things more clean. 2023-01-20 13:45:56 -08:00
Myk Taylor 25c3bf4a24
adjust to name change 2023-01-20 11:57:13 -08:00
DFHack-Urist via GitHub Actions b7f90d543e Auto-update submodules 
library/xml: master
scripts: master
 2023-01-20 19:47:11 +00:00
Myk Taylor a1a4125fd9
properly react to lack of a mouse cursor 2023-01-20 09:31:44 -08:00
Myk Taylor eae2cec22f
use keyboard cursor 
and adapt to a "bad" cursor not being equal to -30000 anymore
 2023-01-20 09:31:44 -08:00
Myk Taylor 4183bace4d
update autodump, only commands, add hotkeys 2023-01-20 09:31:44 -08:00
Myk d201cf0182
Merge pull request #2662 from 20k/develop 
Zone <-> building interactions
 2023-01-20 09:30:52 -08:00
Myk 116f9bf8e6
Merge pull request #2641 from myk002/myk_buildingplan 
minimal implementation of buildingplan
 2023-01-20 09:28:26 -08:00
20k 4d9c411358 fix flag 2023-01-19 23:33:03 +00:00
20k 8b7c8d83b5 remove save fixup 
Add notifyCivzoneModified
 2023-01-19 21:55:20 +00:00
cjhammel c05b7526b1
Update Units.cpp 
fixes renamed value
 2023-01-19 15:12:24 -05:00
20k d5610ab859 zone <-> building interop 2023-01-19 16:39:41 +00:00
DFHack-Urist via GitHub Actions d52aff8ff3 Auto-update submodules 
library/xml: master
scripts: master
 2023-01-19 07:14:40 +00:00
Rose f9ac987367 Added bounds checking to various creature name functions in the Units module. 2023-01-18 20:52:58 -08:00
DFHack-Urist via GitHub Actions 452d44d985 Auto-update submodules 
library/xml: master
scripts: master
 2023-01-18 23:55:29 +00:00
Myk Taylor d6b69ca8fc
move useful functions from uicommon to MiscUtils 2023-01-16 23:46:47 -08:00
Myk Taylor 3958d37684
update changelog and submodules for 50.05-alpha1 2023-01-16 16:56:31 -08:00
lethosor 9c36c3978f
Update xml, scripts 2023-01-16 16:06:00 -05:00
Myk 95d7db2bb4
Merge pull request #2622 from myk002/myk_datasave 
adjust to new directory layouts
 2023-01-16 11:05:33 -08:00
Myk Taylor 762cd46d14
look for init.d directories in the root instead of raw/ 2023-01-15 23:28:01 -08:00
Myk Taylor 50cc6d965d
update to new save directory structure 2023-01-15 23:13:58 -08:00
Myk Taylor fb5675ef1b
keep windows on the screen when the DF window is resized 2023-01-15 20:41:48 -08:00
Myk Taylor 20f865eba0
don't reset scroll pos when window is resized or moved 2023-01-15 15:59:09 -08:00
Myk Taylor d14a3b2c83
ensure the untested warning doesn't bork on bad scripts 2023-01-15 00:49:48 -08:00
DFHack-Urist via GitHub Actions f82acec9d4 Auto-update submodules 
library/xml: master
 2023-01-14 09:26:48 +00:00
Myk 977946e5bc
Merge pull request #2603 from myk002/myk_resizingpanel 
give more control over the resizing dimensions of ResizingPanels
 2023-01-14 01:10:26 -08:00
Myk fc6a8fb00b
Merge pull request #2601 from myk002/myk_dwarfmode 
pull the useful bits out of guidm.MenuOverlay and make them available
 2023-01-14 01:09:57 -08:00
Myk 2a84bb61db
Merge pull request #2599 from myk002/myk_hotspot_hotfoot 
update behavior of hotspot menu
 2023-01-14 01:09:35 -08:00
Myk 3b40621324
Merge pull request #2595 from myk002/myk_textures 
add some more icon textures we can use
 2023-01-14 01:09:23 -08:00
Myk Taylor f19ae16c9d
give more control over the resizing dimensions of ResizingPanels 2023-01-14 01:00:38 -08:00
Rose 0e021e392d Added a report to autoclothing, as well as some changes to DFHack::Units to enable it. 2023-01-13 21:20:01 -08:00
Myk Taylor e450af74aa
pull the useful bits out of MenuOverlay 2023-01-13 17:05:23 -08:00
Myk Taylor 4f88d27e08
cancel EditField editing on r-click 2023-01-13 17:05:08 -08:00
Myk Taylor 21d160c478
terminology change: locked -> pinned 2023-01-13 16:07:27 -08:00
Myk Taylor 6c6c4e159f
add reminder why we can't clear mouse_lbut 2023-01-13 12:17:51 -08:00
DFHack-Urist via GitHub Actions f6372b97d1 Auto-update submodules 
library/xml: master
scripts: master
 2023-01-13 07:14:32 +00:00
Myk Taylor 508777897b
allow tile list icons to be rendered properly 2023-01-12 22:30:47 -08:00
Myk Taylor 478b5ada39
expose icons texpos to Lua 2023-01-12 22:17:39 -08:00
Myk Taylor ac06508d92
add some more icon textures we can use 
contributed by TaxiService on the DFHack Discord server
 2023-01-12 21:04:41 -08:00
Myk 68e373100b
Merge pull request #2591 from myk002/myk_penn 
support foreground and background writing from pens
 2023-01-12 21:00:38 -08:00
Myk Taylor c98e389ac8
move untested warning back to run_script 
so we don't waste our warning on the initial env scans
 2023-01-12 14:15:43 -08:00
Myk Taylor 52a39438f7
don't make EditField's transparent 
this is actually a very old bug, but now that I know how transparency
works, it's obvious how to fix this
 2023-01-12 12:47:43 -08:00
Myk Taylor 15998f2ebe
add gui.TRANSPARENT_PEN for clearing the UI layer 2023-01-12 12:44:50 -08:00
Myk Taylor 079d5e4178
support foreground and background writing from pens 2023-01-12 12:30:07 -08:00
Myk Taylor 88f158921f
move warning to run_script_with_env 2023-01-11 19:48:15 -08:00
Myk Taylor 679e91d2e7
warn against running untested scripts 
but allow after the first try
 2023-01-10 23:21:30 -08:00
Myk Taylor 1d0f6b3a95
more careful bounds checking for screen tiles 2023-01-10 19:40:13 -08:00
Myk Taylor 353117d484
fix a crash in Screen when read or paint tile indices are negative 2023-01-10 19:05:04 -08:00
Myk Taylor 7cf703ef23
turn down Ruby support 2023-01-09 23:59:55 -08:00
Myk 17bcdb1f56
Merge pull request #2583 from arekatir/develop 
Remove os.execute and io.popen
 2023-01-09 23:53:32 -08:00
DFHack-Urist via GitHub Actions 7a9dd02bbd Auto-update submodules 
library/xml: master
scripts: master
 2023-01-10 07:51:40 +00:00
Myk c26ed36893
Merge pull request #2577 from myk002/myk_get_any 
get rudimentary getAny(Unit|Item|Building) working
 2023-01-09 23:50:02 -08:00
Myk e1b63d8600
Merge pull request #2576 from myk002/myk_pin 
use an actual pin texture for ZScreen pins
 2023-01-09 23:49:50 -08:00
DFHack-Urist via GitHub Actions c6472560c6 Auto-update submodules 
library/xml: master
scripts: master
 2023-01-10 07:14:21 +00:00
pre-commit-ci[bot] 8ad1cafb07 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-01-10 04:52:00 +00:00
arekatir d725b813c7
Remove os.execute and io.popen 2023-01-09 23:04:43 -05:00
Myk Taylor fecc733192
detect clicks on part of pin that sticks up 2023-01-09 12:52:26 -08:00
Myk Taylor f39684dbfd
pass getAny calls through ZScreens 2023-01-09 09:35:55 -08:00
Myk Taylor f8728a4388
get rudimentary getAny(Unit|Item|Building) working 2023-01-09 01:39:48 -08:00
Myk Taylor 2234328a91
use an actual pin texture for ZScreen pins 2023-01-09 00:47:13 -08:00
DFHack-Urist via GitHub Actions 3e11a31070 Auto-update submodules 
library/xml: master
 2023-01-09 07:15:10 +00:00
Myk Taylor 92489ef27d
get things to compile with the recent structure updates 2023-01-08 11:33:14 -08:00
DFHack-Urist via GitHub Actions f78267351d Auto-update submodules 
library/xml: master
 2023-01-08 18:45:17 +00:00
Myk a983326dd6
Merge pull request #2569 from myk002/myk_set_option 
add CycleHotkeyLabel:setOption()
 2023-01-08 04:48:28 -08:00
DFHack-Urist via GitHub Actions 0684b4a9ba Auto-update submodules 
library/xml: master
scripts: master
 2023-01-08 07:13:26 +00:00
Myk f9cc43728f
Merge pull request #2567 from RosaryMala/develop 
Remote Fortress Reader updates
 2023-01-07 16:30:31 -08:00
Rose 95223d8197 Got archery target direction back, and cleaned up a few things. 2023-01-07 14:37:44 -08:00
Myk Taylor 72d5760ff6
add CycleHotkeyLabel:setOption() 2023-01-07 01:00:40 -08:00
Myk f20180de47
Merge pull request #2568 from ab9rf/5005-persistence 
fix persistence
 2023-01-06 21:50:20 -08:00
Kelly Kinkade 51bb5589de change order of state change event processing 
this will cause persistent data storage to load _before_ `SC_WORLD_LOADED` events are sent to scripts and plugins
 2023-01-06 21:55:42 -06:00
Kelly Kinkade 3e4861b54b fix persistence for changed file structure 
`data/save` -> `save`
 2023-01-06 21:24:01 -06:00
Myk fe9d1e186e
Merge pull request #2562 from myk002/myk_greenify 
allow color options for CycleHotkeyLabel
 2023-01-06 19:10:39 -08:00
Myk Taylor 093eac3eb2
use a black background for non-top ZScreen titles 2023-01-06 18:58:08 -08:00
Myk Taylor 810430f1a2
make windows lockable (can ignore r-click and esc) 2023-01-06 18:48:53 -08:00
Myk Taylor 1f5ae4165f
return self from raise, update docs 2023-01-06 15:43:08 -08:00
Myk Taylor fccefd1155
don't pass through handled r-clicks 2023-01-06 15:43:08 -08:00
Myk Taylor f43358002d
Allow dialogs to close on r-click 2023-01-06 15:43:08 -08:00
Myk Taylor 574be3fe73
provide a useful default impl of isMouseOver 2023-01-06 15:42:40 -08:00
Myk Taylor f15e9e3577
don't revert to plain strings for pens 2023-01-06 15:42:30 -08:00
Myk Taylor e111a73763
allow color options for CycleHotkeyLabel 
and use the option to render `On` in green for ToggleHotkeyLabel
 2023-01-06 15:42:27 -08:00
Myk Taylor 6f46ae672e
add Gui::getDFViewscreen and Lua binding 2023-01-06 12:17:36 -08:00
DFHack-Urist via GitHub Actions 1540e7c294 Auto-update submodules 
library/xml: master
scripts: master
 2023-01-06 07:13:54 +00:00
DFHack-Urist via GitHub Actions f4d059ea3d Auto-update submodules 
library/xml: master
scripts: master
 2023-01-06 02:43:42 +00:00
Myk a59f1518c1
Merge pull request #2556 from myk002/myk_zscreen 
framework for passthru, z-order swapping windows
 2023-01-05 18:41:57 -08:00
DFHack-Urist via GitHub Actions 9eb5165ebe Auto-update submodules 
library/xml: master
 2023-01-06 02:11:27 +00:00
Myk Taylor 1934014659
framework for passthru, z-order swapping windows 2023-01-05 18:07:38 -08:00
Myk Taylor 3969262e44
update submodule refs 2023-01-05 17:50:49 -08:00
Myk Taylor 845391f4e6
fix overzealous "ui" -> "plotinfo" replacement 
some comments were just talking about the UI..
 2023-01-05 17:46:30 -08:00
Myk Taylor c4a2bdd08e
update lua too 2023-01-05 17:35:33 -08:00
Myk Taylor 5e5775f5e3
rename globals according to structures update 2023-01-05 17:11:01 -08:00
Myk a5b11065db
Merge pull request #2547 from lethosor/codegen-stl-map-stub+v50 
[v50] Add read-only container_identity for std::map
 2023-01-05 15:35:27 -08:00
Myk Taylor 412531bf03
really fix the format string this time 2023-01-04 21:29:45 -08:00
Myk Taylor 9cbcd81f63
fix format strings for vars that were size_t 2023-01-04 21:24:52 -08:00
Myk Taylor c70c4131bd
don't include dfhack-config/ in release tarball 
create it at runtime
move files around so no dfhack-owned files are in there
 2023-01-04 19:41:58 -08:00
Myk b62cfa3699
Merge pull request #2552 from myk002/myk_mouse 
Get correct mouse button down behavior in Lua without overwriting enabler fields
 2023-01-04 19:39:43 -08:00