47666e12cd
terminal -> console for consistency
...
followup to #3723
2023-09-06 18:09:07 -04:00
31fbd0dab5
bump to 50.09-r3
2023-09-06 13:43:11 -07:00
7d128adada
Auto-update submodules
...
library/xml: master
scripts: master
2023-09-05 08:10:07 +00:00
cbe4f53823
add focus string details for orders context
2023-09-03 12:50:12 -07:00
1d6ae37a66
fix and reinstate heat safety filter
2023-09-03 11:54:32 -07:00
b8fc6e210f
add note about handling bags
2023-09-03 07:12:30 -07:00
b489fceaea
clarify error message about the terminal
2023-09-02 03:22:10 -07:00
874fb5535b
fix spacing around messagebox text when a scrollbar is involved
2023-09-02 02:41:26 -07:00
940d25accb
Merge pull request #3711 from myk002/myk_instrument_textures
...
[Textures] instrument textures module
2023-08-31 18:14:18 -07:00
40bfb6b8ff
Hack to force GCC to invoke cancel_job() through DF's vtable
...
GCC appears to be optimizing the call to `cancel_job()` to use the stub in
*DFHack's* job_handler vtable, which is a no-op. Lua was unaffected because it
invokes vmethods through method pointers (without knowing the target instance at
compile time), so use a similar approach here for now.
As mentioned by @ab9rf on Discord, we should pursue an alternative like asking
Bay12 to expose the relevant code through a global `std::function` instead of a
vmethod.
2023-08-31 17:42:16 -04:00
088fa9a35c
instrument textures module and clean up gui
2023-08-31 10:53:43 -07:00
5d7649837c
Merge pull request #3704 from shevernitskiy/create-delete-textures
...
create and delete textures
2023-08-30 03:42:27 -07:00
8a015f7f87
review
2023-08-30 07:38:21 +03:00
a8bf8a04ae
add in value for units contained in cages
2023-08-28 15:42:56 -07:00
423bba2c24
pass getAnyStockpile and getAnyCivZone through ZScreens
2023-08-28 13:27:46 -07:00
4b0219e225
fix stupid linux build again
2023-08-28 10:56:08 +03:00
51baa0d674
fix linux build
2023-08-28 10:46:59 +03:00
6f11812729
create and delete textures
2023-08-28 10:00:39 +03:00
3ce2909309
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-28 06:20:58 +00:00
a740c6628e
Merge pull request #3663 from shevernitskiy/dynamic-texture-loading
...
feat: dynamic texture loading
2023-08-27 22:45:52 -07:00
4fb6b09b30
move textures to separate lua module
2023-08-28 06:58:30 +03:00
6c5163af9e
adjust adopt region reset step
2023-08-27 22:28:03 +03:00
432e415a13
Auto-update submodules
...
library/xml: master
2023-08-21 07:47:25 +00:00
1763a16831
add training check functions to Units
2023-08-20 10:08:25 -07:00
a1d6098446
Auto-update submodules
...
library/xml: master
2023-08-19 09:21:39 +00:00
89ddc4b798
Auto-update submodules
...
library/xml: master
2023-08-17 06:06:58 +00:00
c1945f7b54
fix build err in gcc
2023-08-17 06:32:26 +03:00
8401d5c72a
Auto-update submodules
...
library/xml: master
2023-08-16 07:12:45 +00:00
25038648c0
remove unused variable
2023-08-15 21:11:06 +03:00
d40843de7e
Merge pull request #3676 from myk002/myk_focus
...
higher granularity for unit viewsheet focus strings
2023-08-14 17:33:05 -07:00
7a4aaf8bc9
normalize characters in search text and match keys for FilteredLists
2023-08-14 16:39:28 -07:00
5cafffaaf6
typos
2023-08-14 13:04:38 +03:00
0e725be046
support closure as tile arg to get texpos
2023-08-14 12:07:27 +03:00
fa3c2222e6
higher granularity for unit viewsheet focus strings
2023-08-13 23:54:18 -07:00
900a2c65ba
invalid texpos is nil for lua
2023-08-14 09:02:37 +03:00
91f4c3d561
mirgate preloaded assets to lua
2023-08-14 08:17:57 +03:00
1409af67de
expose api to lua
2023-08-13 20:09:12 +03:00
296a34834c
expose and use casteFlagSet
2023-08-13 00:20:08 -07:00
71e5901214
Merge pull request #3672 from myk002/myk_gui
...
[orders] prevent overlay from appearing on the new workorder page
2023-08-12 23:21:13 -07:00
e69b6ed4ea
Merge remote-tracking branch 'lethosor/struct-fields-lua' into develop
2023-08-13 01:43:19 -04:00
22b0671038
review 2
2023-08-13 08:33:31 +03:00
8f33f4ee44
Merge pull request #3670 from myk002/myk_readtile
...
[Screen] detect extended tile properties and communicate them back to lua
2023-08-12 22:22:40 -07:00
b787c2bb1e
make creating a workorder a subscreen instead of a top-level
2023-08-12 22:02:17 -07:00
20460fecca
tiny refactor texpos methods
2023-08-13 07:40:35 +03:00
574fa08747
Add index_enum, ref_target
2023-08-12 22:12:45 -04:00
396b2d7832
Adapt tests to dynamically-generated field info
...
No need to freeze the field info tables anymore
2023-08-12 21:59:14 -04:00
1a630eab34
Auto-update submodules
...
library/xml: master
2023-08-13 00:45:42 +00:00
fc6d4caa8e
Dynamically generate field info in __index
...
Constructing the complete tables when the types were initialized made it
impossible to populate the "type" field, because not all types had been added to
the global type tables yet.
2023-08-12 20:18:22 -04:00
4a9a83daa5
Expose more fields, refactor
2023-08-12 20:01:03 -04:00
29f99733fe
Add tests
2023-08-12 19:04:51 -04:00
92549f3c56
Add _fields table to struct types
2023-08-12 19:04:49 -04:00
c37dce7c33
detect extended tile properties and communicate them back to lua
2023-08-12 15:53:22 -07:00
687bd82542
pathable & unsuspend specific tile size
2023-08-12 20:05:15 +03:00
46a3454fee
type alias for gcc
2023-08-12 17:00:07 +03:00
b20889e694
minor refactor for lua switch
2023-08-12 16:34:33 +03:00
fe8bd4fa78
assets use dynamic texture loading
2023-08-12 16:11:42 +03:00
0a5e914a65
Add struct_field_info_extra::original_name field for globals
2023-08-12 01:19:18 -04:00
351dfa84c2
Remove obsolete STATIC_FIELDS_GROUP check
2023-08-12 01:17:44 -04:00
4aaf625f4d
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-12 01:49:06 +00:00
8d8c139ccb
don't add keys as text when ctrl or alt are pressed
2023-08-11 12:54:49 -07:00
fa22f9521a
never suppress sdl key events when modifier keys are active
2023-08-11 12:54:18 -07:00
e81a90821a
review
2023-08-11 21:40:41 +03:00
e8a2ac68fe
Merge pull request #3662 from lethosor/fix-unknown-global-field-ref
...
Fix crash in df.global:_field() when global address is unknown
2023-08-11 10:38:12 -07:00
3a143e0601
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-11 07:12:32 +00:00
3e18e2f6fe
eof fix one more time
2023-08-11 09:50:51 +03:00
4bbcc7b05d
eof fix
2023-08-11 09:48:03 +03:00
6bd0819635
Fix crash in df.global:_field() when global address is unknown
...
and add a test
2023-08-11 02:31:54 -04:00
e21f0f2b69
dynamic texture loading
2023-08-11 09:14:05 +03:00
34ddf6bed7
Merge remote-tracking branch 'lethosor/memscan-funcs' into develop
2023-08-11 01:38:15 -04:00
ea43d6c801
get_code_segment(): update check for DF executable on Linux
2023-08-10 15:06:45 -04:00
0ac7d23bcf
Add memscan.read_global_table() and memscan.read_c_string()
2023-08-10 15:06:24 -04:00
46499a66cc
Add cxx_demangle() and Lua wrapper
2023-08-10 15:01:19 -04:00
fdf878c3b9
Merge pull request #3655 from myk002/myk_banner
...
[BannerPanel] use square brackets instead of color blocks
2023-08-09 17:51:26 -07:00
ca71c8c5f8
Auto-update submodules
...
library/xml: master
2023-08-09 07:13:34 +00:00
6bd7d97625
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-08 07:12:52 +00:00
970babe77c
Merge pull request #3654 from myk002/myk_mod_reload
...
ensure active mod scripts are properly reloaded
2023-08-07 19:39:39 -07:00
99517fcd81
use square brackets instead of color blocks
2023-08-07 17:20:58 -07:00
62a1bd6970
ensure active mod scripts are properly reloaded
2023-08-07 17:18:00 -07:00
8bff1399d4
add functions to Panel in addition to attributes
2023-08-07 17:02:55 -07:00
5fbff18d64
correctly fire on_resize_end events from Panel
2023-08-07 16:01:56 -07:00
8c166935d5
factor banner out into reusable panel class
2023-08-07 12:40:48 -07:00
03edea8257
add focus string support for legends mode
2023-08-07 02:50:37 -07:00
386608fa02
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-07 07:13:17 +00:00
30befab78f
Merge pull request #3644 from myk002/myk_trade
...
remove caravan_buying param from getValue call
2023-08-06 23:57:07 -07:00
db48e0eba0
remove caravan_buying param from getValue call
...
the identity of the selling party doesn't actually affect the value!
2023-08-06 17:38:34 -07:00
a7129cad04
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-06 07:12:09 +00:00
5e1854edae
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-05 07:11:36 +00:00
1864090bda
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-05 02:56:08 +00:00
ba0df78233
DataIdentity support for `std::future<void>`
2023-08-04 20:00:29 -05:00
9bf00904eb
Merge pull request #3632 from myk002/myk_xml
...
allow the reusable workflows to build xml-dump-type-sizes
2023-08-04 17:09:29 -07:00
0ef1a475e4
allow code to be generated even when the library isn't being built
2023-08-04 16:43:58 -07:00
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
f507bd7e38
Auto-update submodules
...
library/xml: master
2023-08-04 20:22:58 +00:00
a6de9a21fa
enable most core tests
2023-08-04 10:11:28 -07:00
1cf3f62237
Auto-update submodules
...
library/xml: master
2023-08-04 17:10:51 +00:00
4c2e7721e1
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-04 07:12:54 +00:00
5c4175e3c3
Update xml
2023-08-02 22:58:09 -04:00
8b786b4344
Forward-declare types only used in DataIdentity.cpp
2023-08-02 00:15:27 -04:00
2f42745175
Add identity_traits<condition_variable>, add macro for opaque identities
2023-08-02 00:15:27 -04:00
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
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
6fbb22e912
Add missing instantion for identity_traits<std::mutex>, refactor code shared with fstream identity
2023-08-02 00:15:26 -04:00
7c4d9364a2
Make allocator_fn compile for non-copy-assignable types like std::mutex
2023-08-02 00:15:26 -04:00
e5bc4b3221
Add identity for std::mutex
2023-08-02 00:15:25 -04:00
a299f0b5fb
Auto-update submodules
...
library/xml: master
scripts: master
2023-08-01 06:33:09 +00:00
9984dfef6e
Merge remote-tracking branch 'lethosor/fix-linux-plugins-cxx11abi' into develop
2023-08-01 00:51:24 -04:00
9f168214dd
Merge remote-tracking branch 'lethosor/fix-textures-cleanup-segfault' into develop
2023-08-01 00:35:19 -04:00
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
6e54210a66
Merge remote-tracking branch 'lethosor/fix-global-crash' into develop
2023-08-01 00:22:01 -04:00
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
95753f618c
memscan: check for new Linux executable name
2023-08-01 00:10:46 -04:00
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
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
17ca9e0132
Update Textures.h
2023-07-31 17:20:38 -07:00
6a50ae42ce
more deduplication of installed files
2023-07-29 00:35:12 -07:00
a9df9f92d9
update for 50.09-r2
2023-07-21 18:50:15 -07:00
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
65fc79c5e2
Merge branch 'develop' into myk_dwarfvet
2023-07-21 14:23:13 -07:00
dff4816287
update dwarfvet
2023-07-21 04:12:56 -07:00
462ee0cba7
generalize mod directory scanning
2023-07-20 17:43:57 -07:00
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
19643111e0
move SUPPRESS_DUPLICATE_KEYBOARD_EVENTS pref into cpp
2023-07-19 00:38:37 -07:00
0d81f5ce6e
don't include dead citizens in the citizens list
2023-07-18 23:09:19 -07:00
2d2ecf6f0d
add TextButton
2023-07-16 20:24:39 -07:00
2cd226d879
Merge pull request #3566 from myk002/myk_pasture
...
[zone] initial implementation of pasture assignment screen
2023-07-16 14:36:57 -07:00
5fb299c6df
expand egg-laying filter to the entire race, not just the unit
2023-07-16 12:30:12 -07:00
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
04b0c16f0f
Auto-update submodules
...
library/xml: master
2023-07-16 07:13:50 +00:00
e2a91ed3bb
Auto-update submodules
...
library/xml: master
2023-07-13 07:14:52 +00:00
6fc86d715b
simplify retrieval of setting property
2023-07-09 15:50:56 -07:00
7a618fd113
make event suppression configurable
2023-07-08 18:39:38 -07:00
f987bca8f9
prevent DF interface events for handled hotkeys
2023-07-08 17:23:00 -07:00
1fba8b16f5
replace `dts:make_unique` with `std::make_unique`
...
2014 here we come!
2023-07-07 21:38:15 -05:00
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
734de0dcd1
make EditField ignore Ctrl-A until we get Home key support
2023-07-07 14:49:10 -07:00
6a8522ab5e
generalize dfhack.items.isRequestedTradeGood
2023-07-06 03:27:05 -07:00
b938891e11
add dfhack.items.isRequestedTradeGood
2023-07-06 03:24:36 -07:00
c45dcdd7b0
implement sell_prices adjustments
2023-07-06 03:24:16 -07:00
2aeb86ba8f
implement trade agreement buy prices
2023-07-06 03:24:16 -07:00
c2e647b79b
fix item prices and algorithm
...
adjust prices according to race WAR affinity
2023-07-06 03:24:15 -07:00
9849885df6
Revert "generalize dfhack.items.isRequestedTradeGood"
...
This reverts commit aa6d28bab6
2023-07-06 03:23:17 -07:00
aa6d28bab6
generalize dfhack.items.isRequestedTradeGood
2023-07-06 03:21:36 -07:00
79dbcf0461
Merge pull request #3524 from myk002/myk_copypaste
...
support copy/paste from system clipboard
2023-07-05 23:09:08 -07:00
785405b281
Update DFSDL.cpp
2023-07-05 22:34:25 -07:00
50b3cecfcf
Merge pull request #3481 from myk002/myk_cpp20
...
get compiling with c++-20
2023-07-05 22:28:59 -07:00
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
09148698c8
add counter for socket accept fails
...
Signed-off-by: Kent Gustavsson <kent@minoris.se>
2023-06-26 22:47:21 +02:00
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
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
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
lethosor
Myk Taylor
DFHack-Urist via GitHub Actions
Myk
shevernitskiy
Kelly Kinkade
Kent Gustavsson
Taxi Service