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
a38246aaa4
Update logic for zone type checks
2023-02-06 16:47:50 -05:00
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
0b9b258224
ensure scrollable lists are centered in the visible viewport
2023-02-06 12:54:05 -08:00
fdf1d38b23
Merge branch 'cycle-hotkey-rev' of https://github.com/johncosker/dfhack into cycle-hotkey-rev
2023-02-06 15:13:13 -05:00
36391af27c
More cleanup
2023-02-06 15:12:47 -05:00
0769afc961
Merge branch 'develop' into cycle-hotkey-rev
2023-02-06 15:04:57 -05:00
39dc0ccc8a
Cleanup
2023-02-06 15:03:28 -05:00
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
fcb156ed43
add compatibility frames
2023-01-23 04:03:31 -08:00
9aaa55cd7f
add textures and frames for various use cases
2023-01-23 03:58:51 -08:00
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
a6b3de1afb
support scrolling to the beginning or end in Label
2023-01-23 02:16:07 -08:00
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
4559168005
update for multiple ownership
2023-01-22 22:59:25 +00:00
b15fcc93d2
remove assignments on zone destroy
2023-01-22 15:26:55 +00:00
c7ca9d0d7b
reverse squad iteration delete
2023-01-22 15:25:16 +00:00
f862e4a6b7
comment out SEC_SELECT in dialogs
2023-01-22 03:09:07 -08:00
598354d9d4
getbiometype naming, docs
2023-01-21 20:33:40 +00:00
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
3024c4a0df
update to remove ambiguity after structures change
2023-01-21 18:45:36 +00:00
1dbf01e5d1
Civzone interop style changes
2023-01-21 18:45:36 +00:00
8c68f54f50
update with squad removal support
2023-01-21 18:45:36 +00:00
bb16009f49
bump version to 50.05-alpha2
2023-01-20 17:13:28 -08:00
acf2b8b319
use newly narrowd relations vector
2023-01-20 14:30:48 -08:00
310940e1a2
Merge branch 'develop' into Autoclothing
2023-01-20 14:05:26 -08:00
8e6252fc2b
Small fixes to make things more clean.
2023-01-20 13:45:56 -08:00
25c3bf4a24
adjust to name change
2023-01-20 11:57:13 -08:00
b7f90d543e
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-20 19:47:11 +00:00
a1a4125fd9
properly react to lack of a mouse cursor
2023-01-20 09:31:44 -08:00
eae2cec22f
use keyboard cursor
...
and adapt to a "bad" cursor not being equal to -30000 anymore
2023-01-20 09:31:44 -08:00
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
Myk Taylor
DFHack-Urist via GitHub Actions
Myk
Taxi Service
Kelly Kinkade
silverflyone
20k
Kelvie Wong
Robob27
vallode
lethosor
Roxy
John Cosker
ElsaTheHobo
Ryan Williams
Rose
cjhammel