Myk Taylor
0ef1a475e4
allow code to be generated even when the library isn't being built
2023-08-04 16:43:58 -07:00
lethosor
47b4773786
df.new(): catch errors thrown by allocate()
...
This can include DFHack::Error::VTableMissing exceptions if the vtable of a
member field is unknown.
Fixes #3627
2023-08-04 17:22:20 -04:00
DFHack-Urist via GitHub Actions
f507bd7e38
Auto-update submodules
...
library/xml: master
2023-08-04 20:22:58 +00:00
Myk Taylor
a6de9a21fa
enable most core tests
2023-08-04 10:11:28 -07:00
DFHack-Urist via GitHub Actions
1cf3f62237
Auto-update submodules
...
library/xml: master
2023-08-04 17:10:51 +00:00
DFHack-Urist via GitHub Actions
4c2e7721e1
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-04 07:12:54 +00:00
lethosor
5c4175e3c3
Update xml
2023-08-02 22:58:09 -04:00
lethosor
8b786b4344
Forward-declare types only used in DataIdentity.cpp
2023-08-02 00:15:27 -04:00
lethosor
2f42745175
Add identity_traits<condition_variable>, add macro for opaque identities
2023-08-02 00:15:27 -04:00
lethosor
eb12ff17f6
Refactor: move static identity_traits to their own file, simplify field defs
...
DataStaticsFields.cpp used to contain identity_traits specializations for
primitive and opaque STL types, as well as macros used for the generated struct
field definitions. Only one of these were actually used in any compilation unit,
and the identity_traits definitions were hidden behind a guard to prevent them
from being compiled at all when building the struct field definitions.
Now, the identity_traits specializations live in their own file,
DataIdentity.cpp (matching their declarations, which live in DataIdentity.h).
This speeds up build times because modifying these specializations no longer
requires rebuilding all of the field definitions unnecessarily.
2023-08-02 00:15:26 -04:00
lethosor
d0250ae426
Update allocator_try_assign() to match behavior of fstream allocator for non-copyable types
...
Looks like the choice we have made here previously is to return NULL if
attempting to allocate types that we cannot allocate.
2023-08-02 00:15:26 -04:00
lethosor
6fbb22e912
Add missing instantion for identity_traits<std::mutex>, refactor code shared with fstream identity
2023-08-02 00:15:26 -04:00
lethosor
7c4d9364a2
Make allocator_fn compile for non-copy-assignable types like std::mutex
2023-08-02 00:15:26 -04:00
lethosor
e5bc4b3221
Add identity for std::mutex
2023-08-02 00:15:25 -04:00
DFHack-Urist via GitHub Actions
a299f0b5fb
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-01 06:33:09 +00:00
lethosor
9984dfef6e
Merge remote-tracking branch 'lethosor/fix-linux-plugins-cxx11abi' into develop
2023-08-01 00:51:24 -04:00
lethosor
9f168214dd
Merge remote-tracking branch 'lethosor/fix-textures-cleanup-segfault' into develop
2023-08-01 00:35:19 -04:00
lethosor
73f96209da
Fix mangling of `plugin_globals` with GCC's C++11 ABI
...
Without being declared with `extern "C"`, `plugin_globals` is mangled, with a
`cxx11` suffix.
We can't add `extern "C"` to the `DFhackDataExport` macro because GCC does not
allow initializing any `extern` variables inline, including `extern "C"`.
2023-08-01 00:33:20 -04:00
lethosor
6e54210a66
Merge remote-tracking branch 'lethosor/fix-global-crash' into develop
2023-08-01 00:22:01 -04:00
lethosor
e2ca506e23
Fix off-by-one error in Textures::cleanup()
...
In a ASCII-only configuration, I was seeing `textures.raws.size() == 164` and
`texpos_end == 164`. This resulted in reading one item past the end of the
vector.
This may not be occurring in configurations with graphics enabled, or
Windows/WINE may be more permissive.
2023-08-01 00:13:09 -04:00
lethosor
95753f618c
memscan: check for new Linux executable name
2023-08-01 00:10:46 -04:00
lethosor
e55984c529
Fix startup crashes when global addresses are missing
...
Useful for initial research. Can be tested with `DFHACK_NO_GLOBALS=1`
2023-08-01 00:05:02 -04:00
Myk
53c90affa1
Merge pull request #3602 from plule/feat/suspended-icon
...
Add a separate icon for jobs suspended by suspendmanager
2023-07-31 17:31:26 -07:00
Myk
17ca9e0132
Update Textures.h
2023-07-31 17:20:38 -07:00
Myk Taylor
6a50ae42ce
more deduplication of installed files
2023-07-29 00:35:12 -07:00
Myk Taylor
a9df9f92d9
update for 50.09-r2
2023-07-21 18:50:15 -07:00
Myk Taylor
77d0fb297c
convert tabs to spaces when getting clipboard text
...
this avoids tab characters being translated to "?" when converted to
cp437
2023-07-21 15:03:06 -07:00
Myk
65fc79c5e2
Merge branch 'develop' into myk_dwarfvet
2023-07-21 14:23:13 -07:00
Myk Taylor
dff4816287
update dwarfvet
2023-07-21 04:12:56 -07:00
Myk Taylor
462ee0cba7
generalize mod directory scanning
2023-07-20 17:43:57 -07:00
Myk
24500dbafd
Merge pull request #3582 from myk002/myk_living
...
Units: don't include dead citizens in the getCitizens list
2023-07-19 08:22:46 -07:00
Myk Taylor
19643111e0
move SUPPRESS_DUPLICATE_KEYBOARD_EVENTS pref into cpp
2023-07-19 00:38:37 -07:00
Myk Taylor
0d81f5ce6e
don't include dead citizens in the citizens list
2023-07-18 23:09:19 -07:00
Myk Taylor
2d2ecf6f0d
add TextButton
2023-07-16 20:24:39 -07:00
Myk
2cd226d879
Merge pull request #3566 from myk002/myk_pasture
...
[zone] initial implementation of pasture assignment screen
2023-07-16 14:36:57 -07:00
Myk Taylor
5fb299c6df
expand egg-laying filter to the entire race, not just the unit
2023-07-16 12:30:12 -07:00
Myk Taylor
39612f0d5a
trade a bin if any contents can be traded
...
the new trade screens will make it easy to filter out unwanted items
later
2023-07-16 12:15:51 -07:00
DFHack-Urist via GitHub Actions
04b0c16f0f
Auto-update submodules
...
library/xml: master
2023-07-16 07:13:50 +00:00
DFHack-Urist via GitHub Actions
e2a91ed3bb
Auto-update submodules
...
library/xml: master
2023-07-13 07:14:52 +00:00
Myk Taylor
6fc86d715b
simplify retrieval of setting property
2023-07-09 15:50:56 -07:00
Myk Taylor
7a618fd113
make event suppression configurable
2023-07-08 18:39:38 -07:00
Myk Taylor
f987bca8f9
prevent DF interface events for handled hotkeys
2023-07-08 17:23:00 -07:00
Kelly Kinkade
1fba8b16f5
replace `dts:make_unique` with `std::make_unique`
...
2014 here we come!
2023-07-07 21:38:15 -05:00
Kelly Kinkade
0ac05197c6
fix an ambiguity in def'n of operator==
...
this resolve an error that arises when compiling with msvc 1936 which was previously ignored due to a bug in the compiler
2023-07-07 17:21:25 -05:00
Myk Taylor
734de0dcd1
make EditField ignore Ctrl-A until we get Home key support
2023-07-07 14:49:10 -07:00
Myk Taylor
6a8522ab5e
generalize dfhack.items.isRequestedTradeGood
2023-07-06 03:27:05 -07:00
Myk Taylor
b938891e11
add dfhack.items.isRequestedTradeGood
2023-07-06 03:24:36 -07:00
Myk Taylor
c45dcdd7b0
implement sell_prices adjustments
2023-07-06 03:24:16 -07:00
Myk Taylor
2aeb86ba8f
implement trade agreement buy prices
2023-07-06 03:24:16 -07:00
Myk Taylor
c2e647b79b
fix item prices and algorithm
...
adjust prices according to race WAR affinity
2023-07-06 03:24:15 -07:00
Myk Taylor
9849885df6
Revert "generalize dfhack.items.isRequestedTradeGood"
...
This reverts commit aa6d28bab6
.
2023-07-06 03:23:17 -07:00
Myk Taylor
aa6d28bab6
generalize dfhack.items.isRequestedTradeGood
2023-07-06 03:21:36 -07:00
Myk
79dbcf0461
Merge pull request #3524 from myk002/myk_copypaste
...
support copy/paste from system clipboard
2023-07-05 23:09:08 -07:00
Myk
785405b281
Update DFSDL.cpp
2023-07-05 22:34:25 -07:00
Myk
50b3cecfcf
Merge pull request #3481 from myk002/myk_cpp20
...
get compiling with c++-20
2023-07-05 22:28:59 -07:00
Myk
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
Myk Taylor
c587cad471
generalize to civ roles as well
2023-07-05 17:37:49 -07:00
Myk
8e7d7fefc0
Merge pull request #3527 from myk002/myk_no_extra_keys
...
filter out spurious STRING keybindings
2023-07-05 12:10:51 -07:00
Myk Taylor
43ea9b94c3
move clipboard wrappers into DFSDL module (but not in the namespace)
2023-07-05 12:08:18 -07:00
Myk Taylor
0bbb72b44f
Revert "add new linkage dependency on dfhack"
...
This reverts commit ae545aa1d6
.
2023-07-05 11:46:33 -07:00
Myk Taylor
125e4c623b
avoid inducing link dependency on dfhack
2023-07-05 11:07:51 -07:00
Myk Taylor
e3d3affdbc
Revert "add new linkage dependency on dfhack"
...
This reverts commit 9ddb3813c1
.
2023-07-05 10:25:07 -07:00
DFHack-Urist via GitHub Actions
ba974aff98
Auto-update submodules
...
library/xml: master
scripts: master
2023-07-04 07:15:34 +00:00
Myk Taylor
cbdb56a1ac
port API for unit lookup by noble role from quickfort
2023-07-03 13:47:43 -07:00
Myk Taylor
9ddb3813c1
add new linkage dependency on dfhack
2023-07-03 12:34:49 -07:00
Myk Taylor
e7f5b1f949
move command_result enum from Export to Core
2023-07-03 11:53:46 -07:00
Myk Taylor
f111b69f2f
Merge branch 'develop' into myk_cpp20
2023-07-03 11:49:54 -07:00
Myk Taylor
5a36a0fcbd
ensure we can still inject strings with simulateInput
2023-07-03 11:44:33 -07:00
Myk Taylor
ae545aa1d6
add new linkage dependency on dfhack
2023-07-03 11:18:14 -07:00
Myk Taylor
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
Myk Taylor
fdf2430fc4
filter out spurious STRING keybindings
...
that don't match actual SDL string input
2023-07-03 09:09:52 -07:00
Myk Taylor
07e8edcdca
ensure changing text fires the on_change event
2023-07-02 19:27:07 -07:00
Myk Taylor
c660a12502
differentiate between choosing merchant screen and default trade screen
2023-07-02 19:09:15 -07:00
Myk Taylor
d39440d33b
migrate markForTrade logic from logistics to core
2023-07-02 19:05:50 -07:00
Myk Taylor
acd03486a9
add some more detail to the focus strings for buildings
2023-07-02 19:05:50 -07:00
Myk Taylor
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
Myk Taylor
175c249d29
support copy/paste from system clipboard
2023-07-02 18:04:06 -07:00
DFHack-Urist via GitHub Actions
b5fd877b84
Auto-update submodules
...
library/xml: master
scripts: master
2023-07-01 07:13:51 +00:00
Myk Taylor
09027543df
update to 50.09-r1
2023-06-26 16:31:18 -07:00
Myk Taylor
e308d3204a
Merge branch 'develop' into sdl2
2023-06-26 16:04:50 -07:00
Myk Taylor
164a889479
update xml ref
2023-06-26 16:02:05 -07:00
Kent Gustavsson
09148698c8
add counter for socket accept fails
...
Signed-off-by: Kent Gustavsson <kent@minoris.se>
2023-06-26 22:47:21 +02:00
Kent Gustavsson
ccae8bc77b
add error output on failing to accept connection
...
Signed-off-by: Kent Gustavsson <kent@minoris.se>
2023-06-26 22:47:21 +02:00
Kent Gustavsson
dfd453ae05
fix so failed accept doesn't terminate the server
...
Signed-off-by: Kent Gustavsson <kent@minoris.se>
2023-06-26 22:47:21 +02:00
Myk
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
Myk Taylor
b5f4cef187
differentiate trade request screen from other diplomacy screens
2023-06-26 02:29:36 -07:00
DFHack-Urist via GitHub Actions
9b74492919
Auto-update submodules
...
library/xml: master
scripts: master
2023-06-26 07:15:49 +00:00
Myk Taylor
d54c13121b
use new icons from RafaelKB
2023-06-25 18:56:37 -07:00
Myk Taylor
8235680ff0
add unsuspend map textures
2023-06-25 18:40:04 -07:00
Myk Taylor
78448f438d
don't leak warning suppression out of protobuf
2023-06-25 17:53:16 -07:00
Myk Taylor
8f1efcd8a3
remove need to ignore warnings for dfhack-dependent targets
2023-06-25 17:44:06 -07:00
Kelly Kinkade
f2dc910b28
update for 50.09sdl2-3
2023-06-24 20:10:27 -05:00
Myk Taylor
20e425dc4f
update to newest df sdl beta
2023-06-23 14:50:06 -07:00
Myk
b958727655
Update Textures.cpp
2023-06-23 14:36:26 -07:00
Myk
e101a6d9dc
Update Textures.h
2023-06-23 14:36:26 -07:00
Myk Taylor
f7bef53b42
prefer symbols to descriptions for hotkey names
2023-06-23 14:36:18 -07:00
Myk Taylor
840a2b3525
ensure DFHack screens get all string input
2023-06-23 14:36:18 -07:00
Taxi Service
3e2940ef8f
attempt to set optional tilesize arguments for load_texture()
2023-06-23 14:35:45 -07:00
Myk Taylor
a48344fd24
get keybindings working again
2023-06-23 14:31:14 -07:00
Myk Taylor
52151b0e98
remove SDL functions that don't exist anymore
2023-06-23 14:31:14 -07:00
Myk Taylor
4e48ce64f1
get things mostly ported to SDL2
2023-06-23 14:31:12 -07:00
Myk Taylor
eff1755675
bump to 50.08-r4
2023-06-23 10:59:21 -07:00
DFHack-Urist via GitHub Actions
fab840d90e
Auto-update submodules
...
library/xml: master
scripts: master
2023-06-21 23:22:38 +00:00
Myk Taylor
b571e5b52b
don't diplay orders overlay on subscreens
2023-06-19 16:48:07 -07:00
Myk Taylor
8a079e1ae7
get compiling on windows
2023-06-17 22:14:11 -07:00
Myk Taylor
2efef75b4e
re-constify
2023-06-17 10:46:56 -07:00
Myk Taylor
9dba18124e
attach compile options to dfhack that allow protobuf headers to be included
2023-06-17 10:44:38 -07:00
DFHack-Urist via GitHub Actions
538103b90f
Auto-update submodules
...
library/xml: master
2023-06-17 17:19:00 +00:00
DFHack-Urist via GitHub Actions
a487e98913
Auto-update submodules
...
library/xml: master
scripts: master
2023-06-09 07:13:44 +00:00
Myk Taylor
25530d6e7b
guide update - first draft
2023-06-08 12:40:33 -07:00
DFHack-Urist via GitHub Actions
873000df80
Auto-update submodules
...
library/xml: master
scripts: master
2023-06-08 07:13:15 +00:00
Myk Taylor
394db656e6
remove obsolete BUILD_DEVEL option and logic
2023-06-06 17:49:15 -07:00
Myk Taylor
b4a804ca0c
bump to 50.08-r3
2023-06-05 17:42:35 -07:00
Myk Taylor
4a2b97105c
only initialize steam if launched from steam
2023-06-05 14:18:55 -07:00
Myk Taylor
ecf82471cf
update for 50.08-r2
2023-06-01 11:20:08 -07:00
Myk Taylor
5c914280c3
change dynamic_cast -> virtual_cast
2023-06-01 10:53:08 -07:00
Myk Taylor
974a6155c0
reinstated Buildings.setOwner
2023-05-31 18:48:08 -07:00
DFHack-Urist via GitHub Actions
7dad5be7dc
Auto-update submodules
...
library/xml: master
2023-05-29 07:13:57 +00:00
Myk
0c5339982a
Merge pull request #3424 from myk002/myk_ensure_keys
...
add ensure_keys utility function
2023-05-28 20:36:48 -07:00
Myk Taylor
8b3eef699f
adjust findCivzonesAt to v50 semantics
2023-05-27 05:37:31 -07:00
Myk Taylor
0918fbb004
add ensure_keys utility function
2023-05-27 03:16:51 -07:00
DFHack-Urist via GitHub Actions
27ee0ae396
Auto-update submodules
...
library/xml: master
2023-05-27 07:12:17 +00:00
Myk
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
Myk
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
Myk Taylor
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
DFHack-Urist via GitHub Actions
44340dfb75
Auto-update submodules
...
library/xml: master
scripts: master
plugins/stonesense: master
2023-05-24 07:12:57 +00:00
DFHack-Urist via GitHub Actions
4ba2c807b2
Auto-update submodules
...
library/xml: master
scripts: master
2023-05-23 22:26:06 +00:00
Myk Taylor
f6d9af5725
also set focus on shift-scrolling
2023-05-23 15:20:09 -07:00
Myk Taylor
6f49a0eb3d
allow dragging by frame edge for non-resizable windows
2023-05-23 15:17:01 -07:00
Myk Taylor
f3ce805960
scroll mouse wheel to focus window under cursor
2023-05-23 12:26:44 -07:00
Myk Taylor
848556158b
update HEADs
2023-05-21 09:45:37 -07:00
Myk
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
Myk
a969ff2aea
Merge branch 'develop' into develop
2023-05-20 04:55:50 -07:00
Myk Taylor
9dffba6843
amend #2914 so lists don't jump around on resize
2023-05-20 04:38:03 -07:00
Myk Taylor
8c01f3efe0
don't relaunch launchdf if it's already running
2023-05-20 02:59:41 -07:00
Myk Taylor
a5a6b70a51
launch DFHack through steam if DF is run from steam
2023-05-20 02:59:39 -07:00
Myk
57d2edc84e
Update widgets.lua
2023-05-19 12:12:52 -07:00
Myk
bd7ac0453b
Merge branch 'develop' into list-setselected-fix
2023-05-19 12:05:30 -07:00
Taxi Service
c52b1cc950
reverted to just renaming FRAMES in gui.lua
2023-05-18 12:46:21 +02:00
Taxi Service
90fe6e7ae3
swapped any instance of 'border' being after 'xyz', everywhere
2023-05-18 11:30:21 +02:00
Taxi Service
eb742a603d
renamed XYZ_FRAME to FRAME_XYZ
2023-05-18 11:22:58 +02:00
Myk
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
Myk
7c2216e196
Merge pull request #3373 from myk002/myk_gamey
...
[autolabor] adjust usage to game structure reunification
2023-05-17 11:38:29 -07:00
Myk
5268de8dd8
Merge branch 'develop' into myk_classic
2023-05-17 11:27:33 -07:00
Myk
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
Myk
20c6062b51
Merge pull request #3388 from myk002/myk_tab_defaults
...
give widgets.TabBar default hotkeys
2023-05-17 11:23:17 -07:00
Myk Taylor
aa6baae834
update structures ref
2023-05-17 11:14:00 -07:00
Myk
f265767d7a
Merge branch 'develop' into myk_remote_server
2023-05-17 10:21:02 -07:00
Myk Taylor
899422aaf8
give widgets.TabBar default hotkeys
2023-05-16 17:26:16 -07:00
Myk Taylor
11361975f9
look up texpos values instead of assuming they're constant
2023-05-16 17:14:36 -07:00
Myk Taylor
217be6b58d
make full text search configurable for list filters
2023-05-16 12:36:58 -07:00
Myk Taylor
f05fe33307
fix crash on malformed json (again)
2023-05-16 11:26:47 -07:00
Myk Taylor
a62993b90b
add DFHACK_DISABLE env var
2023-05-15 18:15:46 -07:00
Myk Taylor
1a703c344f
support disabling DFHack with --disable-dfhack
2023-05-15 17:41:28 -07:00
Myk Taylor
8f5c454b39
add focus strings for new_region
2023-05-03 15:52:01 -07:00
Myk Taylor
ad5a0d41f5
only show the terminal if requested
2023-05-03 14:34:48 -07:00
Myk Taylor
bebf3584ba
maybe fix terminal in foreground issue
2023-05-03 14:15:36 -07:00
Myk Taylor
d21a6c6432
update symbols for 50.08 itch and classic
2023-05-02 14:34:45 -07:00
Taxi Service
ef0c8950bd
renamed val_gap to option_gap, updated docs/changelog
2023-05-02 16:46:46 +02:00
TaxiService
f181b50a30
Merge branch 'develop' into cyclehotkey2
2023-05-02 08:22:10 +02:00
Myk Taylor
3f51f24f91
fix errors when dragging a scrollbar and the mouse leaves the window
2023-04-30 17:12:43 -07:00
Taxi Service
cfcb1cd937
make val_sep useful if label_below == true
2023-04-30 10:18:15 +02:00
Myk Taylor
923f84b2f2
bump to 50.08-r1
2023-04-29 18:58:34 -07:00
Myk Taylor
f61d25bdeb
bump to 50.08-r1
2023-04-29 18:46:13 -07:00
Myk
b1ae39764b
Merge branch '5008-beta1' into myk_nosdlreal
2023-04-26 15:48:13 -07:00
Myk Taylor
6d3e5f3a1a
Merge branch 'develop' into 5008-beta1
2023-04-26 12:34:01 -07:00
Taxi Service
48ffad2f71
added and attributes to
2023-04-26 01:02:38 +02:00
Myk Taylor
e4d84e50e8
Merge branch 'develop' into 5008-beta1
2023-04-24 15:43:32 -07:00
Myk Taylor
65d7b290a3
add ZScreenModal class for modal dialogs
2023-04-24 14:32:33 -07:00
Myk Taylor
73b5e37f67
simplify loops with foreach syntax
2023-04-24 14:28:47 -07:00
Myk Taylor
5a4dec35f1
reorder template declarations so we can push vectors of maps
2023-04-24 14:28:21 -07:00
Myk
2a410f7570
Merge pull request #3294 from myk002/myk_title_version
...
add DFHack title version overlay
2023-04-24 14:13:53 -07:00
Myk Taylor
6203894c99
add title screen focus string detection
2023-04-24 08:03:11 -07:00
Myk Taylor
b5459faffe
format version string in help the same way
2023-04-23 18:20:50 -07:00
Kelly Kinkade
2b8b6a62e0
update structures
2023-04-21 08:31:17 -05:00
Taxi Service
8371aa0b8b
renamed Slider to RangeSlider, and added draft of Lua API.rst entry
2023-04-20 13:24:47 +02:00
Taxi Service
ae2bdfad5f
moved Slider class from filterselection.lua to widgets.lua
2023-04-19 11:28:57 +02:00
Kelly Kinkade
f45291780e
update structures
2023-04-18 23:19:05 -05:00
Kelly Kinkade
f477b82ea9
Merge remote-tracking branch 'upstream/develop' into 5008-beta1
2023-04-18 23:05:06 -05:00
Myk Taylor
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
Kelly Kinkade
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
DFHack-Urist via GitHub Actions
c30c59c261
Auto-update submodules
...
library/xml: master
scripts: master
2023-04-18 07:13:59 +00:00
Myk Taylor
e9f6695ace
infrastructure for hiding armok tools
2023-04-17 09:39:15 -07:00
Myk Taylor
b26d6a90ca
update structures head
2023-04-17 01:06:06 -07:00
Myk Taylor
a7aded65e4
match new gems category
2023-04-17 01:04:03 -07:00
Myk Taylor
d1d521fbdb
infrastructure for hiding the terminal console on startup
2023-04-16 22:34:29 -07:00
Myk
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
DFHack-Urist via GitHub Actions
051baa4e6e
Auto-update submodules
...
library/xml: master
2023-04-15 07:12:55 +00:00
Kelly Kinkade
ce6adabbdc
sync library/xml to 50.08-beta
2023-04-14 05:52:24 -05:00
Myk Taylor
5ace09fad0
use the World module for the data read
2023-04-14 01:38:38 -07:00
Myk Taylor
52b869d908
don't read cur_savegame.save_dir when invalid
2023-04-14 01:31:06 -07:00
Myk Taylor
b9d95c5a0b
bump version to 50.08-rc1
2023-04-13 18:53:11 -07:00
Myk Taylor
f13548a47d
continue to ship SDL.dll until DF moves to SDL2
2023-04-13 01:16:22 -07:00
Myk Taylor
48c3a2c987
document which thread each call is coming from
2023-04-13 00:40:10 -07:00
Myk Taylor
6c577fbe26
don't initialize Core from the main thread
...
that's too early
2023-04-13 00:27:20 -07:00
Myk Taylor
275513319c
remove last reference to SDLReal
2023-04-12 23:14:03 -07:00
Myk Taylor
9f605d6396
call DF's stubs for SDL semaphore functions
2023-04-12 21:48:02 -07:00
Myk Taylor
21784568bd
migrate from SDL interposing to the hooks API
2023-04-12 21:34:16 -07:00
Myk Taylor
f7e3973da8
bump to 50.07-r1, scrub changelog
2023-04-12 01:45:42 -07:00
DFHack-Urist via GitHub Actions
766ec620b5
Auto-update submodules
...
library/xml: master
plugins/stonesense: master
2023-04-11 19:06:51 +00:00
Myk Taylor
63b9599405
update xml head
2023-04-11 10:15:24 -07:00
Myk Taylor
460b1e8eaf
adjust code to new tree root type
2023-04-11 10:14:28 -07:00
Myk Taylor
17373dcffd
constify!
2023-04-10 04:35:34 -07:00
Myk Taylor
836a3edcb9
add some more logging
2023-04-10 04:35:34 -07:00
Kelly Kinkade
ce017ee4a8
properly callIs SteamRunningOnSteamDeck
2023-04-10 04:35:34 -07:00
Myk Taylor
e4777d2688
add shutdown and cleanup logic
2023-04-10 04:35:34 -07:00
Myk Taylor
f0d19c9363
add note about dfhooks
2023-04-10 04:35:34 -07:00
Myk Taylor
6a7446780b
hide terminal console when running on steam deck
2023-04-10 04:35:34 -07:00
Myk Taylor
07c83d3bf3
allow getval to take and pass params
2023-04-10 03:37:10 -07:00
DFHack-Urist via GitHub Actions
bd00bb8faf
Auto-update submodules
...
library/xml: master
2023-04-10 07:13:21 +00:00
Myk Taylor
83017e8b8f
give active mods a chance to reattach their hooks
2023-04-07 00:48:04 -07:00
Myk
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
silverflyone
4aa5e9d17b
Merge branch 'develop' of https://github.com/silverflyone/dfhack into develop
2023-04-05 12:23:20 +10:00
silverflyone
37d6a05aea
Merge branch 'develop' into develop
2023-04-05 11:49:38 +10:00
silverflyone
2bd24efa4b
Merge branch 'develop' of https://github.com/silverflyone/dfhack into develop
2023-04-05 11:49:30 +10:00
silverflyone
0cebad1078
Update Buildings.cpp
...
Removed extra min/max checks.
2023-04-05 11:49:14 +10:00
DFHack-Urist via GitHub Actions
d12938fb23
Auto-update submodules
...
library/xml: master
scripts: master
2023-04-04 07:13:18 +00:00
Myk Taylor
cf847109ce
read mods from all mod dirs and only use most recent versions
2023-04-03 15:59:42 -07:00
Taxi Service
824f7ed038
clean up Items.cpp quality symbols definitions
2023-04-04 00:08:01 +02:00
Taxi Service
7c63ea9394
added BOLD_FRAME and INTERIOR_MEDIUM_FRAME
2023-04-03 20:13:57 +02:00
silverflyone
c6fc55f98f
Merge branch 'DFHack:develop' into develop
2023-04-04 03:45:23 +10:00
silverflyone
181f0bdf72
Update Buildings.cpp
...
Boundary checks added.
2023-04-04 03:27:32 +10:00
silverflyone
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
TaxiService
8d8a4abd13
reverted loss of readability
2023-04-02 02:33:09 +02:00
TaxiService
e3bab1eb6b
simplifying character definition even more
...
removed those pesky superfluous consts and casts...
2023-04-01 23:40:45 +02:00
TaxiService
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
TaxiService
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
Myk Taylor
38d4eea7ac
bump to 50.07-beta2
2023-03-31 05:02:02 -07:00
Myk Taylor
147b0ba84a
fix and extend Labels/CycleHotkeyLabels
2023-03-28 23:36:49 -07:00
Myk Taylor
63772fd808
ensure rclicks don't bleed through for dialogs
2023-03-27 03:51:45 -07:00
Myk Taylor
0ba4225d85
support showing a different tile on hover for Labels
2023-03-25 15:19:24 -07:00
Myk Taylor
42b18d001b
refresh overlay and helpdb on new world to pick up mod content
2023-03-25 12:56:54 -07:00
Myk Taylor
e7f8fbb235
apparaently the macro expansion has an ambiguous else
2023-03-25 12:56:53 -07:00
Myk Taylor
76bacee238
dynamically add mod scripts to the script path
2023-03-25 12:56:48 -07:00
Myk Taylor
2627820bfa
untested -> unavailable
2023-03-25 12:35:01 -07:00
Myk
a532012a01
Merge pull request #3090 from myk002/myk_autounsuspend_turndown
...
turn down autounsuspend gracefully
2023-03-25 12:34:32 -07:00
Myk Taylor
a1c2df23c5
fix vscode lint warning
2023-03-24 23:55:54 -07:00
Myk Taylor
2bc92042a5
allow enable to interpret aliases
2023-03-24 23:25:24 -07:00
Myk Taylor
fe0590503f
mark tiles with magma or deep water as "not free"
2023-03-24 15:05:17 -07:00
DFHack-Urist via GitHub Actions
0f8478df17
Auto-update submodules
...
library/xml: master
scripts: master
2023-03-24 07:13:34 +00:00
Kelly Kinkade
95f6e6e5be
tailor: fix material overrun issue
...
properly track materials required for already-queued jobs
fixes #3056
2023-03-23 16:23:06 -05:00
Myk
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
Myk Taylor
03e44f1e7f
fix initial extended/retracted position for upright spike traps
2023-03-23 00:25:29 -07:00
DFHack-Urist via GitHub Actions
29c17b407c
Auto-update submodules
...
library/xml: master
2023-03-23 07:13:59 +00:00
DFHack-Urist via GitHub Actions
5ed1e4ece7
Auto-update submodules
...
library/xml: master
scripts: master
2023-03-22 07:13:59 +00:00
DFHack-Urist via GitHub Actions
df93aceb9d
Auto-update submodules
...
library/xml: master
2023-03-21 00:54:38 +00:00
Myk Taylor
779b9bfb6a
bump to 50.07-beta1
2023-03-17 10:08:16 -07:00
Myk Taylor
c47f068769
add Lua::Push for sets
2023-03-15 00:28:18 -07:00
DFHack-Urist via GitHub Actions
96c7c952cf
Auto-update submodules
...
library/xml: master
scripts: master
2023-03-14 07:16:34 +00:00
Myk Taylor
a5de0fef3e
bump to 50.07-alpha3
2023-03-11 13:56:55 -08:00
Myk Taylor
9b7860125d
ensure elements in deepest dir are added to output list
2023-03-11 02:01:50 -08:00
DFHack-Urist via GitHub Actions
2818f23349
Auto-update submodules
...
library/xml: master
scripts: master
2023-03-10 07:15:52 +00:00
20k
18160da82e
rework to be allocation free, cleanup
2023-03-09 19:36:48 +00:00
DFHack-Urist via GitHub Actions
fcfe7e4ef8
Auto-update submodules
...
library/xml: master
scripts: master
2023-03-08 07:15:19 +00:00
DFHack-Urist via GitHub Actions
26a257eb8c
Auto-update submodules
...
library/xml: master
2023-03-07 07:14:18 +00:00
20k
5a7debfc77
cleanup, linux fix
2023-03-06 17:04:11 +00:00
20k
5cc6293407
fix unused variable on linux
2023-03-06 17:04:10 +00:00
20k
084d28b0ae
Reworked heap debugging + tools implementation
2023-03-06 17:04:10 +00:00
Myk Taylor
0562dc5234
constify some MaterialInfo methods
2023-03-05 18:16:49 -08:00
Myk Taylor
028bbca07b
allow vectors to be read from indices other than 1
2023-03-05 16:32:05 -08:00
Myk Taylor
d3ef96cc05
allow MaterialInfo structs to be sorted
2023-03-05 16:32:05 -08:00
Myk Taylor
a5d22705e8
add label_below attribute
2023-02-27 04:13:05 -08:00
Myk Taylor
df0c7c27cb
adjust to structures change
2023-02-26 22:04:22 -08:00
DFHack-Urist via GitHub Actions
87ba0d270c
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-27 05:49:22 +00:00
Myk
663b014eae
Merge pull request #2682 from 20k/squadwork
...
makeSquad, updateRoomAssignments
2023-02-26 21:40:33 -08:00
Myk
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
Myk Taylor
c513c246a5
more SDL wrapping for stonesense
2023-02-26 21:18:16 -08:00
Myk Taylor
851bb50dc8
add SDL_PushEvent shim for RemoteFortressReader
2023-02-26 21:18:08 -08:00
20k
c38a288eee
use insert_into_vector, tweak docs again
2023-02-27 02:15:26 +00:00
20k
c0bd452c86
add a failure case check just in case
2023-02-27 02:06:36 +00:00
20k
3c1d3ce21c
rework docs, comments, clean up unnecessary init
2023-02-27 01:45:10 +00:00
20k
0c9a9c8b9e
cleanup remaining unk
2023-02-26 18:09:10 +00:00
20k
e50f3dbb64
remove unnecessary init
2023-02-26 18:09:10 +00:00
20k
1eeefdd598
clean up a variety of unks
2023-02-26 18:05:42 +00:00
20k
2bd48f1f90
address some review comments
2023-02-26 18:05:35 +00:00
20k
d84b118767
docs, rework, rename
2023-02-26 18:05:35 +00:00
20k
3912c6290f
Military module start
2023-02-26 18:05:34 +00:00
20k
ce3ee386fd
makeSquad, updateRoomAssignments
2023-02-26 18:05:34 +00:00
Myk Taylor
656a26504a
make FilteredList searching case insensitive by default
2023-02-26 09:47:15 -08:00
Myk Taylor
2b59d6ee3d
make dfhack.job.attachJobItem available to Lua
2023-02-26 09:40:02 -08:00
Myk
3cddea9b61
Merge branch 'develop' into myk_clear_tile
2023-02-26 09:25:05 -08:00
Myk
fced215ac2
Merge branch 'develop' into myk_no_disabled_click
2023-02-26 09:24:32 -08:00
Myk
0270766a6d
Merge branch 'develop' into myk_dynamic_tile
2023-02-26 09:24:04 -08:00
Myk
e81a45a742
Merge pull request #2952 from myk002/myk_keep_focus
...
[Gui] don't prefix focus strings that are already properly marked
2023-02-26 09:23:42 -08:00
Myk
bf64f1d985
Merge pull request #2948 from myk002/myk_interior_frame
...
Add standard interior frame to gui.lua
2023-02-26 09:23:09 -08:00
Myk
ff464c4746
Merge pull request #2947 from myk002/myk_join_strings
...
[MiscUtils] add templated version of join_strings
2023-02-26 09:22:56 -08:00
Myk
098c538754
Merge pull request #2946 from myk002/myk_safety_first
...
[isSuitableMaterial] detect lack of fire and magma safety for vulnerable materials with high melting points
2023-02-26 09:22:38 -08:00
Myk
c7f6ee57d7
Update library/Core.cpp
2023-02-25 11:00:51 -08:00
Kelly Kinkade
0a65c423ce
a squirrel distracted me
2023-02-25 04:07:24 -06:00
Kelly Kinkade
87e06cf960
deoops
2023-02-25 02:42:28 -06:00
Kelly Kinkade
cfa649b4ac
clean up code for C++20 readiness
...
two change:
* remove use of `register` in `md5.cpp`
* remove use of `using namespace std` in `Core.cpp` (which causes an ambiguous name resolution error between `byte` and `std::byte`). while there are other ways to resolve this, `using namespace std` is a code smell anyway, so eliminating it is the best option
2023-02-24 20:52:49 -06:00
Myk Taylor
f1d5551e51
fix on-map character rendering
2023-02-24 17:23:01 -08:00
Myk Taylor
88516a899a
allow map interface tiles to be cleared
2023-02-24 17:22:55 -08:00
Myk Taylor
d7d3dcb0be
keep focus strings if they are already labeled
...
i.e. don't add a "dfhack/" prefix if the focus string already has the
string "dfhack" in it
2023-02-24 17:20:12 -08:00
Myk Taylor
1cacc526e3
allow token.tile to be a function
2023-02-24 17:16:30 -08:00
Myk Taylor
8b378735fa
don't fire HotkeyLabel if the label is disabled
2023-02-24 17:13:45 -08:00
Myk Taylor
75b1cd748a
convert otherwise unused THIN_FRAME to INTERIOR_FRAME
...
without a signature
2023-02-24 17:07:57 -08:00
Myk Taylor
a684f294c5
add templated version of join_strings
2023-02-24 17:05:08 -08:00
Myk Taylor
30ea58374c
better detection of fire and magma safety
2023-02-24 16:57:44 -08:00
Myk Taylor
4bf0849d51
fix usage of squad equipment vector
2023-02-24 15:50:56 -08:00