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
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