4183bace4d
update autodump, only commands, add hotkeys
2023-01-20 09:31:44 -08:00
d201cf0182
Merge pull request #2662 from 20k/develop
...
Zone <-> building interactions
2023-01-20 09:30:52 -08:00
116f9bf8e6
Merge pull request #2641 from myk002/myk_buildingplan
...
minimal implementation of buildingplan
2023-01-20 09:28:26 -08:00
4d9c411358
fix flag
2023-01-19 23:33:03 +00:00
8b7c8d83b5
remove save fixup
...
Add notifyCivzoneModified
2023-01-19 21:55:20 +00:00
c05b7526b1
Update Units.cpp
...
fixes renamed value
2023-01-19 15:12:24 -05:00
d5610ab859
zone <-> building interop
2023-01-19 16:39:41 +00:00
d52aff8ff3
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-19 07:14:40 +00:00
f9ac987367
Added bounds checking to various creature name functions in the Units module.
2023-01-18 20:52:58 -08:00
452d44d985
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-18 23:55:29 +00:00
d6b69ca8fc
move useful functions from uicommon to MiscUtils
2023-01-16 23:46:47 -08:00
3958d37684
update changelog and submodules for 50.05-alpha1
2023-01-16 16:56:31 -08:00
9c36c3978f
Update xml, scripts
2023-01-16 16:06:00 -05:00
95d7db2bb4
Merge pull request #2622 from myk002/myk_datasave
...
adjust to new directory layouts
2023-01-16 11:05:33 -08:00
762cd46d14
look for init.d directories in the root instead of raw/
2023-01-15 23:28:01 -08:00
50cc6d965d
update to new save directory structure
2023-01-15 23:13:58 -08:00
fb5675ef1b
keep windows on the screen when the DF window is resized
2023-01-15 20:41:48 -08:00
20f865eba0
don't reset scroll pos when window is resized or moved
2023-01-15 15:59:09 -08:00
d14a3b2c83
ensure the untested warning doesn't bork on bad scripts
2023-01-15 00:49:48 -08:00
f82acec9d4
Auto-update submodules
...
library/xml: master
2023-01-14 09:26:48 +00:00
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
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
2a84bb61db
Merge pull request #2599 from myk002/myk_hotspot_hotfoot
...
update behavior of hotspot menu
2023-01-14 01:09:35 -08:00
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
f19ae16c9d
give more control over the resizing dimensions of ResizingPanels
2023-01-14 01:00:38 -08:00
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
e450af74aa
pull the useful bits out of MenuOverlay
2023-01-13 17:05:23 -08:00
4f88d27e08
cancel EditField editing on r-click
2023-01-13 17:05:08 -08:00
21d160c478
terminology change: locked -> pinned
2023-01-13 16:07:27 -08:00
6c6c4e159f
add reminder why we can't clear mouse_lbut
2023-01-13 12:17:51 -08:00
f6372b97d1
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-13 07:14:32 +00:00
508777897b
allow tile list icons to be rendered properly
2023-01-12 22:30:47 -08:00
478b5ada39
expose icons texpos to Lua
2023-01-12 22:17:39 -08:00
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
68e373100b
Merge pull request #2591 from myk002/myk_penn
...
support foreground and background writing from pens
2023-01-12 21:00:38 -08:00
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
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
15998f2ebe
add gui.TRANSPARENT_PEN for clearing the UI layer
2023-01-12 12:44:50 -08:00
079d5e4178
support foreground and background writing from pens
2023-01-12 12:30:07 -08:00
88f158921f
move warning to run_script_with_env
2023-01-11 19:48:15 -08:00
679e91d2e7
warn against running untested scripts
...
but allow after the first try
2023-01-10 23:21:30 -08:00
1d0f6b3a95
more careful bounds checking for screen tiles
2023-01-10 19:40:13 -08:00
353117d484
fix a crash in Screen when read or paint tile indices are negative
2023-01-10 19:05:04 -08:00
7cf703ef23
turn down Ruby support
2023-01-09 23:59:55 -08:00
17bcdb1f56
Merge pull request #2583 from arekatir/develop
...
Remove os.execute and io.popen
2023-01-09 23:53:32 -08:00
7a9dd02bbd
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-10 07:51:40 +00:00
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
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
c6472560c6
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-10 07:14:21 +00:00
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
d725b813c7
Remove os.execute and io.popen
2023-01-09 23:04:43 -05:00
fecc733192
detect clicks on part of pin that sticks up
2023-01-09 12:52:26 -08:00
f39684dbfd
pass getAny calls through ZScreens
2023-01-09 09:35:55 -08:00
f8728a4388
get rudimentary getAny(Unit|Item|Building) working
2023-01-09 01:39:48 -08:00
2234328a91
use an actual pin texture for ZScreen pins
2023-01-09 00:47:13 -08:00
3e11a31070
Auto-update submodules
...
library/xml: master
2023-01-09 07:15:10 +00:00
92489ef27d
get things to compile with the recent structure updates
2023-01-08 11:33:14 -08:00
f78267351d
Auto-update submodules
...
library/xml: master
2023-01-08 18:45:17 +00:00
a983326dd6
Merge pull request #2569 from myk002/myk_set_option
...
add CycleHotkeyLabel:setOption()
2023-01-08 04:48:28 -08:00
0684b4a9ba
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-08 07:13:26 +00:00
f9cc43728f
Merge pull request #2567 from RosaryMala/develop
...
Remote Fortress Reader updates
2023-01-07 16:30:31 -08:00
95223d8197
Got archery target direction back, and cleaned up a few things.
2023-01-07 14:37:44 -08:00
72d5760ff6
add CycleHotkeyLabel:setOption()
2023-01-07 01:00:40 -08:00
f20180de47
Merge pull request #2568 from ab9rf/5005-persistence
...
fix persistence
2023-01-06 21:50:20 -08:00
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
3e4861b54b
fix persistence for changed file structure
...
`data/save` -> `save`
2023-01-06 21:24:01 -06:00
fe9d1e186e
Merge pull request #2562 from myk002/myk_greenify
...
allow color options for CycleHotkeyLabel
2023-01-06 19:10:39 -08:00
093eac3eb2
use a black background for non-top ZScreen titles
2023-01-06 18:58:08 -08:00
810430f1a2
make windows lockable (can ignore r-click and esc)
2023-01-06 18:48:53 -08:00
1f5ae4165f
return self from raise, update docs
2023-01-06 15:43:08 -08:00
fccefd1155
don't pass through handled r-clicks
2023-01-06 15:43:08 -08:00
f43358002d
Allow dialogs to close on r-click
2023-01-06 15:43:08 -08:00
574be3fe73
provide a useful default impl of isMouseOver
2023-01-06 15:42:40 -08:00
f15e9e3577
don't revert to plain strings for pens
2023-01-06 15:42:30 -08:00
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
6f46ae672e
add Gui::getDFViewscreen and Lua binding
2023-01-06 12:17:36 -08:00
1540e7c294
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-06 07:13:54 +00:00
f4d059ea3d
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-06 02:43:42 +00:00
a59f1518c1
Merge pull request #2556 from myk002/myk_zscreen
...
framework for passthru, z-order swapping windows
2023-01-05 18:41:57 -08:00
9eb5165ebe
Auto-update submodules
...
library/xml: master
2023-01-06 02:11:27 +00:00
1934014659
framework for passthru, z-order swapping windows
2023-01-05 18:07:38 -08:00
3969262e44
update submodule refs
2023-01-05 17:50:49 -08:00
845391f4e6
fix overzealous "ui" -> "plotinfo" replacement
...
some comments were just talking about the UI..
2023-01-05 17:46:30 -08:00
c4a2bdd08e
update lua too
2023-01-05 17:35:33 -08:00
5e5775f5e3
rename globals according to structures update
2023-01-05 17:11:01 -08:00
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
412531bf03
really fix the format string this time
2023-01-04 21:29:45 -08:00
9cbcd81f63
fix format strings for vars that were size_t
2023-01-04 21:24:52 -08:00
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
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
78be3a6463
Merge pull request #2548 from myk002/myk_logo
...
Display DFHack logo for the hotkeys overlay widget
2023-01-04 19:06:05 -08:00
4e51e02924
move SDL shims to a new DFSDL module
2023-01-04 17:15:32 -08:00
5d04b9c4cb
add Textures module and load DFHack logo
...
undocumented for now since it's internal. in the future, perhaps this
could morph into a dynamic texture loading facility for tools
2023-01-04 13:30:18 -08:00
9fd3ef7b4b
correct mouse down behavior without hosing enabler
...
before, we inhibited multiple mouse button down events by overwriting
the values in enabler. now we keep state internally and inhibit multiple
events on our own.
also add events and state tracking for middle mouse button
2023-01-03 14:52:49 -08:00
55cdaea636
refactor EditField text insertion
2023-01-03 12:57:02 -08:00
a0343b06a6
adjust text wrap to new scrollbar width
2023-01-03 00:56:07 -08:00
fa2da54852
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-03 07:13:58 +00:00
feeefcf149
Add read-only container_identity for std::map
2023-01-03 01:16:42 -05:00
6361b0a3a4
Merge pull request #2543 from myk002/myk_prep_for_quietust
...
prep for Quietust's structure updates
2023-01-02 20:42:48 -08:00
35ce361b09
Merge pull request #2542 from myk002/myk_dwarfmode_dims
...
clear out obsolete area map and menu logic from the Gui module
2023-01-02 20:42:30 -08:00
24235694f2
Merge pull request #2539 from myk002/myk_screen_write
...
implement Screen::paintTile for both modes and readTile for graphics mode
2023-01-02 20:41:35 -08:00
3ccf6034b9
Merge pull request #2538 from myk002/myk_script_paths
...
add dfhack-config/scripts to default script paths
2023-01-02 20:41:13 -08:00
da63d6294b
ensure the scrollbar midpoint is always rendered
...
this mimics the vanilla scrollbar behavior (and looks better)
2023-01-01 17:55:06 -08:00
218fbdbd45
prep for Quietust's structure updates
2023-01-01 01:03:42 -08:00
aa091ed37e
overwrite anchored textures where we actually touch their anchor
2023-01-01 00:45:14 -08:00
7d5d2d0a9b
clear out obsolete area map and menu logic
...
in particular, return the correct map dimensions in getDwarfmodeDims()
2022-12-31 22:49:30 -08:00
a6294c24fb
implement Screen::paintTile and readTile
2022-12-31 21:16:42 -08:00
5232e2b04e
add dfhack-config/scripts to default script paths
2022-12-30 23:30:11 -08:00
bf995a0968
Merge pull request #2533 from myk002/myk_lua_input
...
adjust Lua widgets to new input scheme
2022-12-30 22:37:12 -08:00
a7dd14d699
Merge pull request #2535 from myk002/myk_smart_refresh
...
only do a full refresh when needed
2022-12-30 22:36:42 -08:00
cf65f48aa0
don't use defunct MENU_CONFIRM keybinding
2022-12-30 22:35:08 -08:00
21f137644f
remove trailing whitespace
2022-12-30 22:35:08 -08:00
3a76fc086f
fix keyboard movement of Panel widgets
2022-12-30 22:35:08 -08:00
6871bc20c4
use new KEYBOARD interface keys in move delta
2022-12-30 22:35:08 -08:00
04f2d555c6
implement context-aware mouse wheel scrolling
2022-12-30 22:35:08 -08:00
38b525bdb5
adapt lua library widgets to new keyboard keybindings
2022-12-30 22:35:08 -08:00
1d7a7c8a49
Don't leave artifats behind when dimissing mboxes
2022-12-30 22:20:50 -08:00
dd0cc087d5
Revert "consolidate full refresh logic in widgets.Panel"
...
This reverts commit 33787473f0
2022-12-30 22:13:53 -08:00
bf9db8e223
Merge pull request #2534 from myk002/myk_scrollbar
...
skin our scrollbars to look and hover like DF's
2022-12-30 21:51:25 -08:00
33787473f0
consolidate full refresh logic in widgets.Panel
2022-12-30 20:44:15 -08:00
88dcdfd158
move trigger code from Window to Panel
...
where the drag/resize code actually is. Panels can be dragged around the
parent screen without them being a Window
2022-12-30 20:01:09 -08:00
70a0f4a718
only do a full refresh when needed
...
this significantly reduces CPU utilization when DFHack-owned screens are
visible.
2022-12-30 17:06:41 -08:00
7d91f9262d
respect tile colors in pens
2022-12-30 05:36:41 -08:00
3aac79fe4f
skin our scrollbars to look and hover like DF's
2022-12-30 05:33:17 -08:00
83a8e9a45a
render bright colors correctly
2022-12-30 03:30:01 -08:00
1265d531d5
only keep the anchor flag if it's already there
2022-12-30 00:53:44 -08:00
f45eac993a
use semantically clearer div rather than bit shift
2022-12-29 22:18:35 -08:00
a4c11de4fb
returns correct mouse pos when in ascii
2022-12-29 00:01:40 -08:00
371f5be050
fix signedness of comparison var
2022-12-28 23:31:06 -08:00
cff603e243
allow Labels to write tile textures
2022-12-28 23:16:13 -08:00
d7b67e9528
remove cached USE_GRAPHICS from gui.lua
...
it's no longer constant
2022-12-28 16:27:44 -08:00
fc523f12fe
expose and document dfhack.screen.getMousePixels()
2022-12-28 16:05:27 -08:00
07f8fad787
implement Gui::getMousePos and Gui::getDepthAt
2022-12-28 16:00:10 -08:00
ada96e616a
Merge pull request #2521 from myk002/myk_hooks
...
Prepare for the hook API
2022-12-27 19:47:38 -08:00
e2a4eeb422
write textures and chars to the map
2022-12-27 17:00:50 -08:00
99ffe769fa
rendering the parent now involves a full refresh
...
in order to get the background
2022-12-27 15:23:34 -08:00
033eb2aefd
use default background colors
...
and ensure texpos_lower doesn't peek through
2022-12-27 15:05:13 -08:00
75afa88790
use tiles for our default frame
2022-12-27 14:40:35 -08:00
69c9e3ffb7
render tiles if given in the pen; otherwise text
...
this commit also smooths out many conflicts with other layers, but the
anchor layer still gives us trouble. it will overwrite us unless we
cover the upper left tile of the anchor graphic, and then the entire
anchor graphic will disappear. not ideal, but it's a start
2022-12-27 14:39:03 -08:00
4f9f8ebcf6
fix unused return value warning
2022-12-26 10:26:22 -08:00
4789637625
implement new dfhooks API
2022-12-25 18:15:55 -08:00
e2425b5c7c
Auto-update submodules
...
library/xml: master
scripts: master
2022-12-25 07:13:11 +00:00
7625dc132e
Auto-update submodules
...
library/xml: master
scripts: master
2022-12-24 07:13:19 +00:00
6a61c750e9
widgets.render_text(): error early if key is invalid
...
This helps identify _which_ key is invalid - otherwise, getKeyDisplay()
complains that it was called with `nil`, which is less helpful.
2022-12-23 13:17:26 -05:00
12804a10a6
Fix Gui/Screen to work with g_src changes ( dfhack/df-structures#487 )
2022-12-23 00:36:09 -05:00
07a0e6e511
Auto-update submodules
...
library/xml: master
2022-12-22 19:38:45 +00:00
52c1e49197
get the text rendering back
2022-12-21 22:13:05 -08:00
48a9e1c518
more new var names
2022-12-22 05:16:40 +00:00
93c875fb56
adjust to new variable names
2022-12-21 14:07:36 -08:00
839e927f9b
comment out problematic code from Renderer
2022-12-21 14:06:58 -08:00
010b18c0e4
hide "offset" tiles that we occlude
2022-12-20 20:10:14 -08:00
106b55397a
comment out problematic code in Core
2022-12-20 19:04:30 -08:00
6c5b7d9458
Auto-update submodules
...
library/xml: master
2022-12-21 02:44:29 +00:00
663e1dd541
ascii is now in color
2022-12-20 16:33:11 -08:00
d7f51e5ed8
basic text drawing
2022-12-20 11:00:49 -08:00
7f91cf6e2a
more instrumentation for eventmanager
2022-12-20 09:49:35 -08:00
999d602e79
instrument eventmanager a bit
2022-12-19 13:43:57 -08:00
d04e30406f
Auto-update submodules
...
library/xml: master
2022-12-17 23:58:29 +00:00
eef6dcb08c
Merge pull request #2504 from ab9rf/develop
...
initial 50.03 alpha branch - into the breach we go
2022-12-17 15:51:16 -06:00
607a4b34d4
update structures
2022-12-17 15:09:08 -06:00
57e599a4d9
comment out barracks reference
...
barracks appears to have gone away in 50.03
2022-12-17 13:07:37 -06:00
5cd60e10f0
comment out problematic code in Gui.cpp
2022-12-16 14:47:43 -06:00
003b74bf73
absorb Putnam's work on the windows hooks
2022-12-16 14:47:43 -06:00
768c95ecb6
absorb Putnam's work on Screen
2022-12-16 14:47:43 -06:00
ccc9e976e2
comment out problematic code in Screen.cpp
2022-12-16 14:47:43 -06:00
55351951f0
comment out problematic code in Items.cpp
2022-12-16 14:47:43 -06:00
93b8479e94
comment out problematic code in Buildings.cpp
2022-12-16 14:47:43 -06:00
7fae0fe44f
structures
2022-12-15 21:19:40 -06:00
9587dd42f8
structures update
2022-12-15 19:56:17 -06:00
e6d8f06965
update structures
2022-12-15 19:27:52 -06:00
42203b13f4
Merge pull request #2500 from myk002/myk_panel_drag
...
Support resizing for DFHack Panel widgets
2022-12-15 14:36:33 -08:00
a07d8c3b15
updates to do test builds of 50.03
2022-12-15 03:35:57 -06:00
06346c6269
implement double clicking on the title to maximize
...
also double click on a maximized window to jump to the minimum size
the location of the window isn't guaranteed to be the same after
maximizing and un-maximizing, but we could implement that if there is
call for it.
2022-12-14 19:03:38 -08:00
434e9322cc
fix error in error message formatting
2022-12-14 17:51:07 -08:00
4c6daf30d9
add widgets.Window and fix paint_frame offset
2022-12-14 12:04:29 -08:00
12e62c7f9d
highlight anchor point when resizing with keyboard
2022-12-14 10:34:06 -08:00
c030704705
implement panel resizing
2022-12-14 10:34:04 -08:00
99b599e9ab
add docs for panel dragging
2022-12-13 13:01:49 -08:00
3f43f72731
fix the math
2022-12-13 12:39:17 -08:00
38a3bec953
dragging logic
2022-12-12 18:07:05 -08:00
0b80bd41b0
partial update to build with vs2022
2022-12-12 03:06:36 -06:00
ffd646462a
ensure `enable` doesn't miss newly-added scripts
...
and add some more documentation
2022-12-10 22:13:38 -08:00
e88b1fdfe5
move script-manager into core
2022-12-10 21:59:51 -08:00
0362d76b39
list enableable scripts in the `enable` builtin
2022-12-10 21:59:51 -08:00
facdb61e42
explicitly declare namespaces and proto versions
2022-12-10 18:06:53 -08:00
6c562a3fed
fix apparent typo in Materials scanning
2022-12-09 09:21:50 -08:00
dec6d3d379
Revert "update google protobuf to 3.21.10"
...
This reverts commit 9dabf51ac7
2022-12-07 11:59:48 -08:00
9dabf51ac7
update google protobuf to 3.21.10
2022-12-07 11:59:15 -08:00
e1330a602e
Auto-update submodules
...
library/xml: master
scripts: master
2022-12-06 07:14:43 +00:00
2b87307e11
allow visible and active to be dynamic properties
2022-12-04 15:46:19 -08:00
08b579cf44
Auto-update submodules
...
library/xml: master
scripts: master
2022-12-02 17:45:32 +00:00
0836962007
Rename [xyz]CategoryActionTimers to [xyz]GroupActionTimers in action timer API
2022-12-01 23:24:04 +00:00
ae532e1452
Rename affectedActionTypeCategory to affectedActionTypeGroup in action timer API
2022-12-01 23:22:02 +00:00
76cdbfbc5c
Rename affectedActionCategory to affectedActionTypeCategory in action timer API
2022-12-01 23:19:10 +00:00
f06f17b59c
Rename affectedActionTypes to affectedActionCategory in action timer API
2022-12-01 23:17:57 +00:00
aa2cf44c4b
Use lambdas to violate DRY less in action timer API
2022-12-01 13:34:54 +00:00
a925c34413
Rename [xyz]ActionTimer functions to [xyz]ActionTimers
2022-12-01 13:34:54 +00:00
f863b9807a
Add action timer API input validation
2022-12-01 13:34:54 +00:00
cc40b80456
Protect against integer overflow when subtracting with action timer API
2022-12-01 13:34:54 +00:00
6148307e9b
Change != 0 to > 0 in action timer API core functions
2022-12-01 13:34:54 +00:00
Myk Taylor
Myk
20k
cjhammel
DFHack-Urist via GitHub Actions
Rose
lethosor
pre-commit-ci[bot]
arekatir
Kelly Kinkade
Tachytaenius