c25b6e642e
Merge pull request #3533 from myk002/myk_noble
...
port API for unit lookup by noble role from quickfort
2023-07-05 19:34:29 -07:00
c587cad471
generalize to civ roles as well
2023-07-05 17:37:49 -07:00
8e7d7fefc0
Merge pull request #3527 from myk002/myk_no_extra_keys
...
filter out spurious STRING keybindings
2023-07-05 12:10:51 -07:00
43ea9b94c3
move clipboard wrappers into DFSDL module (but not in the namespace)
2023-07-05 12:08:18 -07:00
0bbb72b44f
Revert "add new linkage dependency on dfhack"
...
This reverts commit ae545aa1d6
2023-07-05 11:46:33 -07:00
125e4c623b
avoid inducing link dependency on dfhack
2023-07-05 11:07:51 -07:00
e3d3affdbc
Revert "add new linkage dependency on dfhack"
...
This reverts commit 9ddb3813c1
2023-07-05 10:25:07 -07:00
ba974aff98
Auto-update submodules
...
library/xml: master
scripts: master
2023-07-04 07:15:34 +00:00
cbdb56a1ac
port API for unit lookup by noble role from quickfort
2023-07-03 13:47:43 -07:00
9ddb3813c1
add new linkage dependency on dfhack
2023-07-03 12:34:49 -07:00
e7f5b1f949
move command_result enum from Export to Core
2023-07-03 11:53:46 -07:00
f111b69f2f
Merge branch 'develop' into myk_cpp20
2023-07-03 11:49:54 -07:00
5a36a0fcbd
ensure we can still inject strings with simulateInput
2023-07-03 11:44:33 -07:00
ae545aa1d6
add new linkage dependency on dfhack
2023-07-03 11:18:14 -07:00
9ca96567a5
move conversion logic to MiscUtils
...
but keep minimal wrappers in SDL module so we don't leak memory
2023-07-03 11:05:58 -07:00
fdf2430fc4
filter out spurious STRING keybindings
...
that don't match actual SDL string input
2023-07-03 09:09:52 -07:00
07e8edcdca
ensure changing text fires the on_change event
2023-07-02 19:27:07 -07:00
c660a12502
differentiate between choosing merchant screen and default trade screen
2023-07-02 19:09:15 -07:00
d39440d33b
migrate markForTrade logic from logistics to core
2023-07-02 19:05:50 -07:00
acd03486a9
add some more detail to the focus strings for buildings
2023-07-02 19:05:50 -07:00
18a9a7d1fa
allow invalid options to default to the first option
...
and make the range slider move the other slider if it would become
invalid
2023-07-02 19:05:47 -07:00
175c249d29
support copy/paste from system clipboard
2023-07-02 18:04:06 -07:00
b5fd877b84
Auto-update submodules
...
library/xml: master
scripts: master
2023-07-01 07:13:51 +00:00
09027543df
update to 50.09-r1
2023-06-26 16:31:18 -07:00
e308d3204a
Merge branch 'develop' into sdl2
2023-06-26 16:04:50 -07:00
164a889479
update xml ref
2023-06-26 16:02:05 -07:00
d9d0482386
Merge pull request #3501 from myk002/myk_diplomacy
...
[Gui] differentiate trade request screen from other diplomacy screens
2023-06-26 11:46:25 -07:00
b5f4cef187
differentiate trade request screen from other diplomacy screens
2023-06-26 02:29:36 -07:00
9b74492919
Auto-update submodules
...
library/xml: master
scripts: master
2023-06-26 07:15:49 +00:00
d54c13121b
use new icons from RafaelKB
2023-06-25 18:56:37 -07:00
8235680ff0
add unsuspend map textures
2023-06-25 18:40:04 -07:00
78448f438d
don't leak warning suppression out of protobuf
2023-06-25 17:53:16 -07:00
8f1efcd8a3
remove need to ignore warnings for dfhack-dependent targets
2023-06-25 17:44:06 -07:00
f2dc910b28
update for 50.09sdl2-3
2023-06-24 20:10:27 -05:00
20e425dc4f
update to newest df sdl beta
2023-06-23 14:50:06 -07:00
b958727655
Update Textures.cpp
2023-06-23 14:36:26 -07:00
e101a6d9dc
Update Textures.h
2023-06-23 14:36:26 -07:00
f7bef53b42
prefer symbols to descriptions for hotkey names
2023-06-23 14:36:18 -07:00
840a2b3525
ensure DFHack screens get all string input
2023-06-23 14:36:18 -07:00
3e2940ef8f
attempt to set optional tilesize arguments for load_texture()
2023-06-23 14:35:45 -07:00
a48344fd24
get keybindings working again
2023-06-23 14:31:14 -07:00
52151b0e98
remove SDL functions that don't exist anymore
2023-06-23 14:31:14 -07:00
4e48ce64f1
get things mostly ported to SDL2
2023-06-23 14:31:12 -07:00
eff1755675
bump to 50.08-r4
2023-06-23 10:59:21 -07:00
fab840d90e
Auto-update submodules
...
library/xml: master
scripts: master
2023-06-21 23:22:38 +00:00
b571e5b52b
don't diplay orders overlay on subscreens
2023-06-19 16:48:07 -07:00
8a079e1ae7
get compiling on windows
2023-06-17 22:14:11 -07:00
2efef75b4e
re-constify
2023-06-17 10:46:56 -07:00
9dba18124e
attach compile options to dfhack that allow protobuf headers to be included
2023-06-17 10:44:38 -07:00
538103b90f
Auto-update submodules
...
library/xml: master
2023-06-17 17:19:00 +00:00
a487e98913
Auto-update submodules
...
library/xml: master
scripts: master
2023-06-09 07:13:44 +00:00
25530d6e7b
guide update - first draft
2023-06-08 12:40:33 -07:00
873000df80
Auto-update submodules
...
library/xml: master
scripts: master
2023-06-08 07:13:15 +00:00
394db656e6
remove obsolete BUILD_DEVEL option and logic
2023-06-06 17:49:15 -07:00
b4a804ca0c
bump to 50.08-r3
2023-06-05 17:42:35 -07:00
4a2b97105c
only initialize steam if launched from steam
2023-06-05 14:18:55 -07:00
ecf82471cf
update for 50.08-r2
2023-06-01 11:20:08 -07:00
5c914280c3
change dynamic_cast -> virtual_cast
2023-06-01 10:53:08 -07:00
974a6155c0
reinstated Buildings.setOwner
2023-05-31 18:48:08 -07:00
7dad5be7dc
Auto-update submodules
...
library/xml: master
2023-05-29 07:13:57 +00:00
0c5339982a
Merge pull request #3424 from myk002/myk_ensure_keys
...
add ensure_keys utility function
2023-05-28 20:36:48 -07:00
8b3eef699f
adjust findCivzonesAt to v50 semantics
2023-05-27 05:37:31 -07:00
0918fbb004
add ensure_keys utility function
2023-05-27 03:16:51 -07:00
27ee0ae396
Auto-update submodules
...
library/xml: master
2023-05-27 07:12:17 +00:00
2efeead96e
Merge pull request #3414 from myk002/myk_scroll_to_focus
...
scroll mouse wheel to focus window under cursor
2023-05-25 17:18:52 -07:00
906b1570b9
Merge pull request #3417 from myk002/myk_draggable_frame
...
allow dragging by frame edge for non-resizable windows
2023-05-25 17:18:40 -07:00
87775317a5
don't throw if json is unreadable
...
just act like the file didn't exist (unless strict is set)
2023-05-24 12:41:02 -07:00
44340dfb75
Auto-update submodules
...
library/xml: master
scripts: master
plugins/stonesense: master
2023-05-24 07:12:57 +00:00
4ba2c807b2
Auto-update submodules
...
library/xml: master
scripts: master
2023-05-23 22:26:06 +00:00
f6d9af5725
also set focus on shift-scrolling
2023-05-23 15:20:09 -07:00
6f49a0eb3d
allow dragging by frame edge for non-resizable windows
2023-05-23 15:17:01 -07:00
f3ce805960
scroll mouse wheel to focus window under cursor
2023-05-23 12:26:44 -07:00
848556158b
update HEADs
2023-05-21 09:45:37 -07:00
731db4b584
Merge pull request #3403 from myk002/myk_relaunch
...
launch DFHack through steam if DF is run from steam
2023-05-20 14:32:14 -07:00
a969ff2aea
Merge branch 'develop' into develop
2023-05-20 04:55:50 -07:00
9dffba6843
amend #2914 so lists don't jump around on resize
2023-05-20 04:38:03 -07:00
8c01f3efe0
don't relaunch launchdf if it's already running
2023-05-20 02:59:41 -07:00
a5a6b70a51
launch DFHack through steam if DF is run from steam
2023-05-20 02:59:39 -07:00
57d2edc84e
Update widgets.lua
2023-05-19 12:12:52 -07:00
bd7ac0453b
Merge branch 'develop' into list-setselected-fix
2023-05-19 12:05:30 -07:00
c52b1cc950
reverted to just renaming FRAMES in gui.lua
2023-05-18 12:46:21 +02:00
90fe6e7ae3
swapped any instance of 'border' being after 'xyz', everywhere
2023-05-18 11:30:21 +02:00
eb742a603d
renamed XYZ_FRAME to FRAME_XYZ
2023-05-18 11:22:58 +02:00
c38e5e65e6
Merge pull request #3387 from myk002/myk_classic
...
Dynamically look up texture values instead of assuming they're constant
2023-05-17 11:52:41 -07:00
7c2216e196
Merge pull request #3373 from myk002/myk_gamey
...
[autolabor] adjust usage to game structure reunification
2023-05-17 11:38:29 -07:00
5268de8dd8
Merge branch 'develop' into myk_classic
2023-05-17 11:27:33 -07:00
29ece9ce3f
Merge pull request #3381 from myk002/myk_substring_filter
...
make full text search configurable for list filters
2023-05-17 11:26:45 -07:00
20c6062b51
Merge pull request #3388 from myk002/myk_tab_defaults
...
give widgets.TabBar default hotkeys
2023-05-17 11:23:17 -07:00
aa6baae834
update structures ref
2023-05-17 11:14:00 -07:00
f265767d7a
Merge branch 'develop' into myk_remote_server
2023-05-17 10:21:02 -07:00
899422aaf8
give widgets.TabBar default hotkeys
2023-05-16 17:26:16 -07:00
11361975f9
look up texpos values instead of assuming they're constant
2023-05-16 17:14:36 -07:00
217be6b58d
make full text search configurable for list filters
2023-05-16 12:36:58 -07:00
f05fe33307
fix crash on malformed json (again)
2023-05-16 11:26:47 -07:00
a62993b90b
add DFHACK_DISABLE env var
2023-05-15 18:15:46 -07:00
1a703c344f
support disabling DFHack with --disable-dfhack
2023-05-15 17:41:28 -07:00
8f5c454b39
add focus strings for new_region
2023-05-03 15:52:01 -07:00
ad5a0d41f5
only show the terminal if requested
2023-05-03 14:34:48 -07:00
bebf3584ba
maybe fix terminal in foreground issue
2023-05-03 14:15:36 -07:00
d21a6c6432
update symbols for 50.08 itch and classic
2023-05-02 14:34:45 -07:00
ef0c8950bd
renamed val_gap to option_gap, updated docs/changelog
2023-05-02 16:46:46 +02:00
f181b50a30
Merge branch 'develop' into cyclehotkey2
2023-05-02 08:22:10 +02:00
3f51f24f91
fix errors when dragging a scrollbar and the mouse leaves the window
2023-04-30 17:12:43 -07:00
cfcb1cd937
make val_sep useful if label_below == true
2023-04-30 10:18:15 +02:00
923f84b2f2
bump to 50.08-r1
2023-04-29 18:58:34 -07:00
f61d25bdeb
bump to 50.08-r1
2023-04-29 18:46:13 -07:00
b1ae39764b
Merge branch '5008-beta1' into myk_nosdlreal
2023-04-26 15:48:13 -07:00
6d3e5f3a1a
Merge branch 'develop' into 5008-beta1
2023-04-26 12:34:01 -07:00
48ffad2f71
added and attributes to
2023-04-26 01:02:38 +02:00
e4d84e50e8
Merge branch 'develop' into 5008-beta1
2023-04-24 15:43:32 -07:00
65d7b290a3
add ZScreenModal class for modal dialogs
2023-04-24 14:32:33 -07:00
73b5e37f67
simplify loops with foreach syntax
2023-04-24 14:28:47 -07:00
5a4dec35f1
reorder template declarations so we can push vectors of maps
2023-04-24 14:28:21 -07:00
2a410f7570
Merge pull request #3294 from myk002/myk_title_version
...
add DFHack title version overlay
2023-04-24 14:13:53 -07:00
6203894c99
add title screen focus string detection
2023-04-24 08:03:11 -07:00
b5459faffe
format version string in help the same way
2023-04-23 18:20:50 -07:00
2b8b6a62e0
update structures
2023-04-21 08:31:17 -05:00
8371aa0b8b
renamed Slider to RangeSlider, and added draft of Lua API.rst entry
2023-04-20 13:24:47 +02:00
ae2bdfad5f
moved Slider class from filterselection.lua to widgets.lua
2023-04-19 11:28:57 +02:00
f45291780e
update structures
2023-04-18 23:19:05 -05:00
f477b82ea9
Merge remote-tracking branch 'upstream/develop' into 5008-beta1
2023-04-18 23:05:06 -05:00
649d72e658
add missed NO_LOGIC_SCREEN to the list
...
adopt_region also kills the top viewscreen on transition
2023-04-18 08:28:00 -07:00
ed87075cb8
cmake minimum version 3.21
...
forced by this being the lowest version that supports vs 2022
2023-04-18 05:41:08 -05:00
c30c59c261
Auto-update submodules
...
library/xml: master
scripts: master
2023-04-18 07:13:59 +00:00
e9f6695ace
infrastructure for hiding armok tools
2023-04-17 09:39:15 -07:00
b26d6a90ca
update structures head
2023-04-17 01:06:06 -07:00
a7aded65e4
match new gems category
2023-04-17 01:04:03 -07:00
d1d521fbdb
infrastructure for hiding the terminal console on startup
2023-04-16 22:34:29 -07:00
828a9eb6c9
Merge pull request #3228 from myk002/myk_rawfolder
...
don't read cur_savegame.save_dir when invalid
2023-04-15 17:08:13 -07:00
051baa4e6e
Auto-update submodules
...
library/xml: master
2023-04-15 07:12:55 +00:00
ce6adabbdc
sync library/xml to 50.08-beta
2023-04-14 05:52:24 -05:00
5ace09fad0
use the World module for the data read
2023-04-14 01:38:38 -07:00
52b869d908
don't read cur_savegame.save_dir when invalid
2023-04-14 01:31:06 -07:00
b9d95c5a0b
bump version to 50.08-rc1
2023-04-13 18:53:11 -07:00
f13548a47d
continue to ship SDL.dll until DF moves to SDL2
2023-04-13 01:16:22 -07:00
48c3a2c987
document which thread each call is coming from
2023-04-13 00:40:10 -07:00
6c577fbe26
don't initialize Core from the main thread
...
that's too early
2023-04-13 00:27:20 -07:00
275513319c
remove last reference to SDLReal
2023-04-12 23:14:03 -07:00
9f605d6396
call DF's stubs for SDL semaphore functions
2023-04-12 21:48:02 -07:00
21784568bd
migrate from SDL interposing to the hooks API
2023-04-12 21:34:16 -07:00
f7e3973da8
bump to 50.07-r1, scrub changelog
2023-04-12 01:45:42 -07:00
766ec620b5
Auto-update submodules
...
library/xml: master
plugins/stonesense: master
2023-04-11 19:06:51 +00:00
63b9599405
update xml head
2023-04-11 10:15:24 -07:00
460b1e8eaf
adjust code to new tree root type
2023-04-11 10:14:28 -07:00
17373dcffd
constify!
2023-04-10 04:35:34 -07:00
836a3edcb9
add some more logging
2023-04-10 04:35:34 -07:00
ce017ee4a8
properly callIs SteamRunningOnSteamDeck
2023-04-10 04:35:34 -07:00
e4777d2688
add shutdown and cleanup logic
2023-04-10 04:35:34 -07:00
f0d19c9363
add note about dfhooks
2023-04-10 04:35:34 -07:00
6a7446780b
hide terminal console when running on steam deck
2023-04-10 04:35:34 -07:00
07c83d3bf3
allow getval to take and pass params
2023-04-10 03:37:10 -07:00
bd00bb8faf
Auto-update submodules
...
library/xml: master
2023-04-10 07:13:21 +00:00
83017e8b8f
give active mods a chance to reattach their hooks
2023-04-07 00:48:04 -07:00
30bb3d7050
Merge pull request #3168 from myk002/myk_script_paths
...
read mods from all mod dirs and only use most recent versions
2023-04-05 15:54:24 -07:00
4aa5e9d17b
Merge branch 'develop' of https://github.com/silverflyone/dfhack into develop
2023-04-05 12:23:20 +10:00
37d6a05aea
Merge branch 'develop' into develop
2023-04-05 11:49:38 +10:00
2bd24efa4b
Merge branch 'develop' of https://github.com/silverflyone/dfhack into develop
2023-04-05 11:49:30 +10:00
0cebad1078
Update Buildings.cpp
...
Removed extra min/max checks.
2023-04-05 11:49:14 +10:00
d12938fb23
Auto-update submodules
...
library/xml: master
scripts: master
2023-04-04 07:13:18 +00:00
cf847109ce
read mods from all mod dirs and only use most recent versions
2023-04-03 15:59:42 -07:00
824f7ed038
clean up Items.cpp quality symbols definitions
2023-04-04 00:08:01 +02:00
7c63ea9394
added BOLD_FRAME and INTERIOR_MEDIUM_FRAME
2023-04-03 20:13:57 +02:00
c6fc55f98f
Merge branch 'DFHack:develop' into develop
2023-04-04 03:45:23 +10:00
181f0bdf72
Update Buildings.cpp
...
Boundary checks added.
2023-04-04 03:27:32 +10:00
f8de51aba3
Update Buildings.cpp
...
Fixes #3159 .
Valid map coordinates from (0, 0, 0) to (world->map.x_count - 1, world->map.y_count - 1, world->map.z_count - 1).
Stockpile coords (x1, y1, z) to (x2, y2, z) may lie outside of this region.
Use min of (0, 0) and max of (world->map.x_count - 1, world->map.y_count - 1) when iterating the block.
2023-04-04 03:08:43 +10:00
8d8a4abd13
reverted loss of readability
2023-04-02 02:33:09 +02:00
e3bab1eb6b
simplifying character definition even more
...
removed those pesky superfluous consts and casts...
2023-04-01 23:40:45 +02:00
3a6893de53
attempt to increase code readability
...
following lethosor and myk's suggestions, each symbol now is its own constant with a descriptive name.
...will it work though?
2023-04-01 16:43:05 +02:00
18f1b5c675
attempt#2 to fix masterwork/exceptional/decorated symbols
...
this time we're using a couple of `static_cast<char>(...)` thingies
2023-03-31 17:33:23 +02:00
38d4eea7ac
bump to 50.07-beta2
2023-03-31 05:02:02 -07:00
147b0ba84a
fix and extend Labels/CycleHotkeyLabels
2023-03-28 23:36:49 -07:00
63772fd808
ensure rclicks don't bleed through for dialogs
2023-03-27 03:51:45 -07:00
0ba4225d85
support showing a different tile on hover for Labels
2023-03-25 15:19:24 -07:00
42b18d001b
refresh overlay and helpdb on new world to pick up mod content
2023-03-25 12:56:54 -07:00
e7f8fbb235
apparaently the macro expansion has an ambiguous else
2023-03-25 12:56:53 -07:00
76bacee238
dynamically add mod scripts to the script path
2023-03-25 12:56:48 -07:00
2627820bfa
untested -> unavailable
2023-03-25 12:35:01 -07:00
a532012a01
Merge pull request #3090 from myk002/myk_autounsuspend_turndown
...
turn down autounsuspend gracefully
2023-03-25 12:34:32 -07:00
a1c2df23c5
fix vscode lint warning
2023-03-24 23:55:54 -07:00
2bc92042a5
allow enable to interpret aliases
2023-03-24 23:25:24 -07:00
fe0590503f
mark tiles with magma or deep water as "not free"
2023-03-24 15:05:17 -07:00
0f8478df17
Auto-update submodules
...
library/xml: master
scripts: master
2023-03-24 07:13:34 +00:00
95f6e6e5be
tailor: fix material overrun issue
...
properly track materials required for already-queued jobs
fixes #3056
2023-03-23 16:23:06 -05:00
a2ce8a2774
Merge pull request #3075 from myk002/myk_spikey
...
fix initial extended/retracted position for upright spike traps
2023-03-23 02:23:45 -07:00
03e44f1e7f
fix initial extended/retracted position for upright spike traps
2023-03-23 00:25:29 -07:00
29c17b407c
Auto-update submodules
...
library/xml: master
2023-03-23 07:13:59 +00:00
5ed1e4ece7
Auto-update submodules
...
library/xml: master
scripts: master
2023-03-22 07:13:59 +00:00
df93aceb9d
Auto-update submodules
...
library/xml: master
2023-03-21 00:54:38 +00:00
779b9bfb6a
bump to 50.07-beta1
2023-03-17 10:08:16 -07:00
c47f068769
add Lua::Push for sets
2023-03-15 00:28:18 -07:00
96c7c952cf
Auto-update submodules
...
library/xml: master
scripts: master
2023-03-14 07:16:34 +00:00
a5de0fef3e
bump to 50.07-alpha3
2023-03-11 13:56:55 -08:00
9b7860125d
ensure elements in deepest dir are added to output list
2023-03-11 02:01:50 -08:00
2818f23349
Auto-update submodules
...
library/xml: master
scripts: master
2023-03-10 07:15:52 +00:00
18160da82e
rework to be allocation free, cleanup
2023-03-09 19:36:48 +00:00
fcfe7e4ef8
Auto-update submodules
...
library/xml: master
scripts: master
2023-03-08 07:15:19 +00:00
26a257eb8c
Auto-update submodules
...
library/xml: master
2023-03-07 07:14:18 +00:00
5a7debfc77
cleanup, linux fix
2023-03-06 17:04:11 +00:00
5cc6293407
fix unused variable on linux
2023-03-06 17:04:10 +00:00
084d28b0ae
Reworked heap debugging + tools implementation
2023-03-06 17:04:10 +00:00
0562dc5234
constify some MaterialInfo methods
2023-03-05 18:16:49 -08:00
028bbca07b
allow vectors to be read from indices other than 1
2023-03-05 16:32:05 -08:00
d3ef96cc05
allow MaterialInfo structs to be sorted
2023-03-05 16:32:05 -08:00
a5d22705e8
add label_below attribute
2023-02-27 04:13:05 -08:00
df0c7c27cb
adjust to structures change
2023-02-26 22:04:22 -08:00
87ba0d270c
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-27 05:49:22 +00:00
663b014eae
Merge pull request #2682 from 20k/squadwork
...
makeSquad, updateRoomAssignments
2023-02-26 21:40:33 -08:00
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
c513c246a5
more SDL wrapping for stonesense
2023-02-26 21:18:16 -08:00
851bb50dc8
add SDL_PushEvent shim for RemoteFortressReader
2023-02-26 21:18:08 -08:00
c38a288eee
use insert_into_vector, tweak docs again
2023-02-27 02:15:26 +00:00
c0bd452c86
add a failure case check just in case
2023-02-27 02:06:36 +00:00
3c1d3ce21c
rework docs, comments, clean up unnecessary init
2023-02-27 01:45:10 +00:00
0c9a9c8b9e
cleanup remaining unk
2023-02-26 18:09:10 +00:00
e50f3dbb64
remove unnecessary init
2023-02-26 18:09:10 +00:00
1eeefdd598
clean up a variety of unks
2023-02-26 18:05:42 +00:00
2bd48f1f90
address some review comments
2023-02-26 18:05:35 +00:00
d84b118767
docs, rework, rename
2023-02-26 18:05:35 +00:00
3912c6290f
Military module start
2023-02-26 18:05:34 +00:00
ce3ee386fd
makeSquad, updateRoomAssignments
2023-02-26 18:05:34 +00:00
656a26504a
make FilteredList searching case insensitive by default
2023-02-26 09:47:15 -08:00
2b59d6ee3d
make dfhack.job.attachJobItem available to Lua
2023-02-26 09:40:02 -08:00
3cddea9b61
Merge branch 'develop' into myk_clear_tile
2023-02-26 09:25:05 -08:00
fced215ac2
Merge branch 'develop' into myk_no_disabled_click
2023-02-26 09:24:32 -08:00
0270766a6d
Merge branch 'develop' into myk_dynamic_tile
2023-02-26 09:24:04 -08:00
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
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
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
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
c7f6ee57d7
Update library/Core.cpp
2023-02-25 11:00:51 -08:00
0a65c423ce
a squirrel distracted me
2023-02-25 04:07:24 -06:00
87e06cf960
deoops
2023-02-25 02:42:28 -06:00
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
f1d5551e51
fix on-map character rendering
2023-02-24 17:23:01 -08:00
88516a899a
allow map interface tiles to be cleared
2023-02-24 17:22:55 -08:00
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
1cacc526e3
allow token.tile to be a function
2023-02-24 17:16:30 -08:00
8b378735fa
don't fire HotkeyLabel if the label is disabled
2023-02-24 17:13:45 -08:00
75b1cd748a
convert otherwise unused THIN_FRAME to INTERIOR_FRAME
...
without a signature
2023-02-24 17:07:57 -08:00
a684f294c5
add templated version of join_strings
2023-02-24 17:05:08 -08:00
30ea58374c
better detection of fire and magma safety
2023-02-24 16:57:44 -08:00
4bf0849d51
fix usage of squad equipment vector
2023-02-24 15:50:56 -08:00
b8fdc985ec
bump version and changelog to 50.07-alpha2
2023-02-24 15:41:54 -08:00
f84299bc46
Auto-update submodules
...
library/xml: master
2023-02-24 23:31:20 +00:00
1ed0a41dd1
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-23 07:15:08 +00:00
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
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
81db7f09a2
Auto-update submodules
...
library/xml: master
2023-02-21 07:15:14 +00:00
13e4d327f8
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-19 03:34:02 +00:00
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
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
94ae9973cf
Re-add the invert_color function
...
As requested, but it's not used anymore.
2023-02-18 16:07:40 -08:00
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
0897ca913a
Support mouse-hover on lists as well
2023-02-18 16:07:40 -08:00
0b48471607
Invert brightness of the background as well
...
This required some tinkering.
2023-02-18 16:07:40 -08:00
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
4167c2e652
Add key_back, rename switch_tab_key to key
2023-02-16 02:56:52 -05:00
5154eb181a
Add Tab/TabBar to widgets
2023-02-16 02:51:09 -05:00
00428a9140
Merge pull request #2910 from silverflyone/develop
...
Not all stockpile items being returned for getStockpileContents.
2023-02-15 23:33:39 -08:00
36935056ea
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-16 07:15:08 +00:00
3ad66d5c2f
Merge branch 'develop' into develop
2023-02-16 15:05:23 +11:00
212026861f
WIP list fix
2023-02-15 19:29:45 -05:00
39f13b642f
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-15 07:15:04 +00:00
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
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
66229bb669
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-14 07:15:30 +00:00
bc76fd02e2
prevent mouse clicks from bleeding through when a window is dismissed
2023-02-13 17:35:02 -08:00
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
6202b29c56
adapt autolabor to new split game structure
2023-02-13 13:39:28 -08:00
2fe0d8932e
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-13 21:29:24 +00:00
e5072a4f64
check for settings in the ATTRS, not the args
2023-02-13 09:28:14 -08:00
853859e119
refine ZScreen behavior around pausing, update docs
2023-02-13 09:09:39 -08:00
8dd938c5a6
Merge pull request #2891 from robob27/filteredlist-on-change
...
Add edit_on_change to FilteredList
2023-02-12 18:41:41 -08:00
2a04abb1cb
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-12 22:47:20 +00:00
7651f6a91e
Add edit_on_change to FilteredList
2023-02-12 17:44:19 -05:00
50e9ad93f3
Merge pull request #2869 from robob27/moar-units-checks
...
Add isGeldable, isMarkedForGelding and isPet
2023-02-12 01:27:37 -08:00
6b4c1e7787
Auto-update submodules
...
library/xml: master
2023-02-12 01:53:03 +00:00
65f38ec75c
Add isGeldable, isMarkedForGelding, isPet
2023-02-11 05:44:45 -05:00
5100a7ea40
bump to 50.07-alpha1
2023-02-10 10:26:37 -08:00
c8b5f66429
Merge branch 'develop' into detect-manual-save
2023-02-10 08:23:02 -08:00
960bfaca86
fix annotation parsing
...
ref: #2857
2023-02-10 08:15:44 -08:00
533ccee099
Detect manual save
2023-02-10 02:55:36 -05:00
e160bd0607
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-10 07:15:13 +00:00
991c6d89e8
Fix annotation parse error
2023-02-09 23:50:11 +01:00
7cc3c08926
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-09 05:14:15 +00:00
252a05ba11
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-09 00:02:46 +00:00
8bd9853597
make gcc happy
2023-02-08 14:16:11 -08:00
1787d2435c
Merge branch 'develop' into hotkeylabel-enhancements
2023-02-08 12:37:16 -08:00
cd12f95849
add const & to Push overloads; remove circular def
2023-02-08 12:15:19 -08:00
201fec6873
Merge pull request #2837 from robob27/case-insensitive-filterlist
...
Add case_sensitive attr to FilteredList
2023-02-08 11:18:31 -08:00
b950b56926
Add methods to HotkeyLabel
2023-02-08 13:00:13 -05:00
54560bc5db
Don't duplicate regex
2023-02-08 03:39:43 -05:00
c1b9de87d2
Add case_sensitive attr to FilteredList
2023-02-08 03:39:43 -05:00
d0b4b1a4a5
Auto-update submodules
...
library/xml: master
2023-02-08 07:36:55 +00:00
468e9875e5
Update DFHack version to 50.07-alpha0, update xml
2023-02-08 00:00:31 -05:00
ef81a91181
only realign out-of-alignment list positions
2023-02-07 14:12:52 -08:00
b2ecb8aaab
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-07 20:53:12 +00:00
df5184d751
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-07 07:14:45 +00:00
826f918954
remove isHospital as hospitals are no longer civzones
2023-02-06 19:11:00 -05:00
ca5a17a799
explanatory comment for magic number
2023-02-06 19:09:47 -05:00
Myk
Myk Taylor
DFHack-Urist via GitHub Actions
Kelly Kinkade
Taxi Service
silverflyone
20k
Kelvie Wong
Robob27
vallode
lethosor
Roxy