e1f74ab068
Tweak to completely nil the key_back table for setText if not set
2023-02-06 14:53:26 -05:00
d09f8553a0
Delete makeown.lua
2023-02-06 13:34:31 -05:00
041909dfa7
Merge pull request #2822 from myk002/myk_rclick
...
prevent rclick from bleeding through (again)
2023-02-06 09:17:28 -08:00
448598e391
Merge pull request #2823 from myk002/myk_hotkey_guards
...
implement some Gui module hotkey guards
2023-02-06 09:17:18 -08:00
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
d7d6c5aea6
Backwards options for cycle hotkey working
2023-02-06 08:55:46 -05:00
9e318842a4
implement some Gui module hotkey guards
...
and clean up focus string matching logic
2023-02-06 00:58:57 -08:00
2ddd23e45d
prevent rclick from bleeding through (again)
2023-02-06 00:57:33 -08:00
526d7c1726
allow focus string generation to fall through unfocuses ZScreens
2023-02-05 18:01:46 -08:00
443fe5d813
Update library/Core.cpp
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-05 19:07:49 -05:00
c8d672eb05
Remove duplicate SquadEquipment entry
2023-02-05 19:04:21 -05:00
6657fb59e5
Fix pausing and warnings
2023-02-05 19:04:21 -05:00
2bf9b86c7b
Fix getCurFocus lua, use where appropriate in c++
2023-02-05 19:04:21 -05:00
36e4bba779
Fixup prefix matching
2023-02-05 19:04:21 -05:00
cece0bfca1
Remove unnecessary comment
2023-02-05 19:04:21 -05:00
14f1e4b52f
Per confirm pause maybe?
2023-02-05 19:04:21 -05:00
f7df51587c
More focus strings, correct docs
2023-02-05 19:04:21 -05:00
fdbe91e35b
Add the rest of the bottom modes
2023-02-05 19:04:21 -05:00
8f32f1ed7b
Fixup focusStrings->focusString
2023-02-05 19:04:21 -05:00
86b57380a6
fixup unnecessary changes, remove unnecessary stuff
2023-02-05 19:04:21 -05:00
dc40f7182c
Fix warning
2023-02-05 19:04:21 -05:00
085a308e99
Remove/readd comments
2023-02-05 19:04:21 -05:00
6e442a26ca
More WIP
2023-02-05 19:04:21 -05:00
a770a4cae4
WIP
2023-02-05 19:04:21 -05:00
3ca2521ce9
Merge pull request #2807 from Bumber64/patch-1
...
Update Units::isFortControlled
2023-02-05 15:43:31 -08:00
08d90de277
Merge branch 'DFHack:develop' into patch-1
2023-02-05 12:02:58 -08:00
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
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
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
0f78509328
agitated_wilderness_creature is in unit->flags4
2023-02-04 19:29:37 -08:00
c345acd417
Update Units::isFortControlled
...
Add check for `agitated_wilderness_creature`.
2023-02-04 18:48:41 -08:00
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
71deeb7a48
bump version to 50.05-alpha3.1
2023-02-03 15:48:09 -08:00
4a21b0843f
bump to 50.05-alpha3
2023-02-03 14:28:17 -08:00
81abd52313
include TRACE messages in the build
2023-02-03 12:25:44 -08:00
345b7d78cb
pass attributes through FilteredList
2023-02-03 00:09:10 -08:00
2316615763
react to double clicks on list items
2023-02-03 00:09:10 -08:00
49246a60f3
properly cast for unsigned comparisons
2023-02-02 23:57:52 -08:00
8c7be9a8c2
don't use negative plant indices
...
and clean up the Kitchen module a bit more
2023-02-02 23:33:24 -08:00
bb6824ec11
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-03 05:07:52 +00:00
2cf985be73
don't lose List scroll position when dragging
2023-02-02 19:42:41 -08:00
7d05a68c60
clean up changelog, update refs
2023-02-02 12:53:20 -08:00
a3f32e66ad
Merge pull request #2775 from myk002/myk_non_defocusable
...
add defocusable attribute to ZScreen
2023-02-01 17:53:21 -08:00
1debea59a8
Merge branch 'develop' into myk_non_defocusable
2023-02-01 17:51:04 -08:00
7fbd95896d
Merge branch 'develop' into myk_pause_forced
2023-02-01 17:50:45 -08:00
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
7468170751
Merge pull request #2771 from myk002/myk_seedwatch
...
update seedwatch
2023-02-01 17:49:57 -08:00
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
58be8cfd69
support offset text in graphics mode for pens
2023-02-01 17:39:32 -08:00
55d07a8cae
actually use the tile
2023-02-01 14:51:46 -08:00
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
88860f21ec
add defocusable attribute to ZScreen
2023-02-01 08:46:32 -08:00
aae5d5f411
reduce diff in Kitchen.h
2023-02-01 04:28:07 -08:00
be40d55e64
update seedwatch
2023-02-01 04:03:28 -08:00
5127f06571
expose new tiles to Lua
2023-01-31 23:55:30 -08:00
e442e23589
allow tile in Label tokens to be either pen or id
2023-01-31 23:54:27 -08:00
aa22917aeb
add new control panel textures
2023-01-31 23:52:30 -08:00
ab4c766817
Revert "allow tile list icons to be rendered properly"
...
This reverts commit 508777897b
2023-01-30 08:48:45 -08:00
4c17d79198
Auto-update submodules
...
library/xml: master
2023-01-30 02:28:17 +00:00
376526d512
Merge branch 'develop' into myk_no_stuck_df_viewscreens
2023-01-29 16:55:52 -08:00
274e995790
Merge pull request #2747 from myk002/myk_on_off
...
Add new on/off icons
2023-01-29 16:55:01 -08:00
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
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
1c6235633f
add dfhack.units.getCitizens()
2023-01-29 16:28:05 -08:00
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
4c455224f9
make initial pause configurable
2023-01-29 00:41:02 -08:00
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
c2d6debcd8
add on/off light textures and expose to lua
2023-01-29 00:35:29 -08:00
211d18717c
test against type instead of string
2023-01-28 23:34:56 -08:00
6dc74f201d
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-29 07:13:24 +00:00
2003efc21f
Merge branch 'develop' into myk_no_stuck_df_viewscreens
2023-01-28 12:03:50 -08:00
99d1ed6828
Merge branch 'develop' into myk_no_inception
2023-01-28 11:58:37 -08:00
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
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
114bc2a576
also lock down the world map
2023-01-28 08:57:24 -08:00
a931ca692d
Fix debug level typo
2023-01-28 08:21:13 -08:00
f12ca33c0b
ensure DF screens don't get "stuck" when DFHack tool windows are on top
2023-01-28 08:05:37 -08:00
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
9080af6948
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-27 22:27:41 +00:00
18a2827385
only mark the border corner as resizable if the window is resizable
2023-01-27 14:20:21 -08:00
22dd49ce38
remove "room" checking for buildings -- there is no room
2023-01-27 13:38:21 -08:00
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
5b83f30706
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-27 03:14:34 +00:00
2a8520fb9e
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-26 07:15:05 +00:00
be59083202
reduce spacing for CycleHotkeyLabel from 2 to 1
2023-01-25 22:59:29 -08:00
33132e5556
Auto-update submodules
...
library/xml: master
2023-01-25 19:41:45 +00:00
15ab59b12d
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-25 07:17:04 +00:00
c5f2588522
fix issues with clicks "falling through" scrollbars
2023-01-24 21:28:25 -08:00
4e35895cf4
fix build errors with channel-safely
2023-01-24 18:48:23 -08:00
018715f869
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-24 19:18:16 +00:00
83c89cfaa9
Merge pull request #2705 from myk002/myk_zscreen_redux
...
Implement new ZScreen semantics
2023-01-24 11:14:43 -08:00
0e03ac8e5b
don't use tabs in enable output
...
so they display nicely in gui/launcher
2023-01-23 23:50:08 -08:00
f39eb42889
remove references to pinnable
2023-01-23 19:34:48 -08:00
1c2f8eccbf
paint pause symbol for force-pause windows
2023-01-23 19:02:26 -08:00
0905943ecf
don't unfocus if mouse is not being passed through
2023-01-23 18:05:03 -08:00
4377065081
move pause restore to dismiss
...
and fix the condition
2023-01-23 17:46:03 -08:00
8b98ba5042
allow windows to be defocused instead of pinned
2023-01-23 17:40:16 -08:00
5ad6ce16e8
don't change definitions of deprecated frame styles
2023-01-23 16:00:10 -08:00
d0905a5e16
Merge pull request #2703 from myk002/myk_borders
...
Add new borders for various use cases
2023-01-23 11:20:28 -08:00
7329f6dee2
use new frame names
2023-01-23 04:16:38 -08:00
John Cosker
ElsaTheHobo
Myk
Myk Taylor
Rob Goodberry
Ryan Williams
TaxiService
DFHack-Urist via GitHub Actions