Commit Graph

4538 Commits (7534d326e0a3d04029101a2a0482191bfd2e6673)

Author SHA1 Message Date
Kelly Kinkade 74dffc5f52 add a `default:` to make gcc happy 2023-10-16 11:17:33 -05:00
Kelly Kinkade a09f122d7e implement simulated `Items::getCapacity`
in support of `combine`, see #3307
2023-10-16 11:08:36 -05:00
Myk Taylor a651f6461b
add standard HelpButton and ConfigureButton classes
and use them across the overlays that need them
2023-10-16 03:27:08 -07:00
Myk Taylor 8d4d8f227d
ensure modal dialogs behave like modal dialogs
that is, don't let clicks and keys propagate to parent screens
2023-10-15 23:30:43 -07:00
Myk b128b904eb
Update Translation.cpp 2023-10-15 21:56:36 -07:00
Myk eab10080db
Revert "use df's translate_name function if available" 2023-10-15 21:54:50 -07:00
Myk Taylor 15ae84a31b
framed screen subclasses are modal
so they should swallow all input
2023-10-15 17:22:29 -07:00
DFHack-Urist via GitHub Actions 6cba299551 Auto-update submodules
library/xml: master
2023-10-14 19:01:52 +00:00
Kelly Kinkade 2d20e790b6
Merge branch 'develop' into translate-name 2023-10-14 11:22:59 -05:00
Myk Taylor 87af3281fb
use generic baby/child names when race doesn't have something specific 2023-10-14 04:22:43 -07:00
Myk Taylor 43b0c3e10d
add more detailed focus strings for the nobles info screen 2023-10-13 14:33:06 -07:00
Myk 2bc01f774c
Merge branch 'develop' into myk_world_artifacts 2023-10-10 18:21:45 -07:00
DFHack-Urist via GitHub Actions 40f9b04846 Auto-update submodules
library/xml: master
2023-10-11 01:14:43 +00:00
Myk Taylor 75e7e6462d
add focus strings for viewscreen_worldst 2023-10-10 16:40:20 -07:00
Myk Taylor 61e4432424
label war and hunt trained animals in readable names 2023-10-09 17:24:13 -07:00
Myk Taylor 34bbf4cce9
add more focus strings for justice screens 2023-10-08 13:44:45 -07:00
Myk fcdb148bf2
Merge branch 'develop' into myk_gray 2023-10-07 19:33:10 -07:00
Myk 5c5fa341a8
Merge pull request #3849 from myk002/myk_info_search
search overlay for CREATURES info panels
2023-10-07 19:15:50 -07:00
Myk ff77c7509c
Merge pull request #3851 from myk002/myk_utils_search
refactor text search routine out into utils fn
2023-10-07 19:15:40 -07:00
Myk Taylor f8a95667ee
succumb to american spelling 2023-10-07 19:12:53 -07:00
Myk Taylor d0ffd78479
more focus string details for location selector 2023-10-07 19:04:19 -07:00
Myk Taylor 5049483330
refactor text search routine out into utils fn 2023-10-07 18:55:39 -07:00
Myk Taylor 37ad0c3e6f
add more focus string details for info panels 2023-10-07 12:10:52 -07:00
Myk Taylor ae16b65c89
process keys before cursor dragging
so a held mouse button doesn't inhibit text input
2023-10-07 12:10:13 -07:00
DFHack-Urist via GitHub Actions a3cd847181 Auto-update submodules
library/xml: master
scripts: master
2023-10-07 07:21:47 +00:00
DFHack-Urist via GitHub Actions 16eea7c8d4 Auto-update submodules
library/xml: master
scripts: master
2023-10-07 06:33:42 +00:00
Myk Taylor 8a0956bc83
restore mouse state after sending input to parent 2023-10-05 13:30:00 -07:00
Kelly Kinkade 34b86772d8 use df's translate_name function if available
requires dfhack/df-structures#666 (included)

needs testing on linux
2023-10-03 17:44:43 -05:00
DFHack-Urist via GitHub Actions 7d23ea73ad Auto-update submodules
library/xml: master
scripts: master
2023-10-03 18:00:51 +00:00
Myk Taylor 5d295400d2
centralize management of mouse state 2023-10-01 16:28:18 -07:00
Myk Taylor 942cbe2015
bump 50.11-r1 2023-10-01 13:35:29 -07:00
DFHack-Urist via GitHub Actions 66b363b291 Auto-update submodules
library/xml: master
scripts: master
2023-10-01 20:24:16 +00:00
DFHack-Urist via GitHub Actions a50013af26 Auto-update submodules
library/xml: master
scripts: master
2023-10-01 18:57:06 +00:00
Myk Taylor 0dba891993
clean out some unused dependencies 2023-10-01 08:43:59 -07:00
DFHack-Urist via GitHub Actions 211b34c618 Auto-update submodules
library/xml: master
scripts: master
2023-10-01 08:35:42 +00:00
Myk Taylor cd12e41fd7
update enabler mouse state when mouse clicks are handled in dialogs 2023-09-30 23:54:25 -07:00
DFHack-Urist via GitHub Actions 56e782d9bb Auto-update submodules
library/xml: master
scripts: master
2023-09-30 04:47:59 +00:00
DFHack-Urist via GitHub Actions ffd166a41f Auto-update submodules
library/xml: master
2023-09-29 18:26:00 +00:00
Najeeb Al-Shabibi bb9829eb51 Merge branch 'develop' into eventmanager_cleanup 2023-09-29 14:54:29 +01:00
Myk Taylor 13f83d2f95
protect against bad values in TranslateName 2023-09-28 16:35:29 -07:00
Najeeb Al-Shabibi 14871c9d2e Merge branch 'develop' into eventmanager_cleanup 2023-09-28 16:20:54 +01:00
Najeeb Al-Shabibi 70ff728fba manageJobStartedEvent handle moved to inner loop and iterates from previous in linked list in case it is removed. fix a bug with item change events and using invalidated stack pointer as item data. swapped order of destroyed and created building event calls, and a couple other improvements 2023-09-28 16:19:32 +01:00
DFHack-Urist via GitHub Actions d44499b970 Auto-update submodules
library/xml: master
scripts: master
2023-09-28 07:13:26 +00:00
Najeeb Al-Shabibi 78bea2a550 fixed a typo brain fart moment 2023-09-27 23:34:19 +01:00
Najeeb Al-Shabibi f5aab7ee45 pulled event handler calls out of the loops over global vectors to avoid potential iterator invalidation by an event callback, and did some tidying 2023-09-27 20:55:22 +01:00
DFHack-Urist via GitHub Actions 888c88dfcf Auto-update submodules
library/xml: master
scripts: master
2023-09-27 20:55:22 +01:00
Myk Taylor 5c670d20db align mouse button semantics to DF
we, um, had it backwards
2023-09-27 20:55:22 +01:00
Myk Taylor 6ad724b483 add detailed focus strings for setupdwarfgame 2023-09-27 20:55:22 +01:00
DFHack-Urist via GitHub Actions e253642660 Auto-update submodules
library/xml: master
scripts: master
2023-09-27 02:23:08 +00:00
Myk da77be29be
Merge pull request #3816 from myk002/myk_remousify
align mouse button semantics to DF
2023-09-26 19:09:23 -07:00
Myk Taylor eefd38c66c
align mouse button semantics to DF
we, um, had it backwards
2023-09-26 03:52:24 -07:00
Myk Taylor 932f3324d3
add detailed focus strings for setupdwarfgame 2023-09-26 03:45:15 -07:00
DFHack-Urist via GitHub Actions 7e21d384ab Auto-update submodules
library/xml: master
scripts: master
2023-09-25 07:13:23 +00:00
shevernitskiy ae67ec05de remove doubled check 2023-09-24 13:01:31 +03:00
shevernitskiy d2bc834fa9 fix exception on close, dummy surface refcount 2023-09-24 11:44:04 +03:00
shevernitskiy bd4d831582 add flag for dummy & resolve conflicts 2023-09-24 11:44:04 +03:00
shevernitskiy 25cc778fce review refactor 2023-09-24 11:44:04 +03:00
shevernitskiy 770402a292 erase from delayed when deleteHandle() 2023-09-24 11:44:04 +03:00
shevernitskiy 033a849de2 Apply suggestions from code review
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-09-24 11:44:04 +03:00
shevernitskiy 469a97f781 review 2023-09-24 11:44:04 +03:00
shevernitskiy 5b34ac63e1 fix for gcc 2023-09-24 11:44:03 +03:00
shevernitskiy 6f26650255 reserved texpos range 2023-09-24 11:44:03 +03:00
lethosor 3af118dce9
Check that SDL_ShowSimpleMessageBox has been bound first
This function can be called before DFSDL is initialized
2023-09-21 01:18:56 -04:00
lethosor aa6c4094c5
Use SDL_ShowSimpleMessageBox in Core::fatal()
This allows the message to be displayed consistently in a dialog on all platforms.
2023-09-21 01:13:07 -04:00
lethosor 8d03dd4d71
Update xml for 50.10-r1.1 2023-09-19 18:14:59 -04:00
Myk Taylor 8e86c5c0ab
update xml ref 2023-09-18 10:06:06 -07:00
Myk Taylor 64d46af38e
bump to 50.10-r1 2023-09-17 23:52:37 -07:00
Myk Taylor 66a93ad0cc
update xml ref 2023-09-17 23:32:24 -07:00
Myk Taylor a61b8d11d0
Revert "use osyncstream for writing to gamelog.txt"
This reverts commit 4695b8c86d.
2023-09-17 21:38:48 -07:00
Myk Taylor 4695b8c86d
use osyncstream for writing to gamelog.txt 2023-09-17 21:23:45 -07:00
Myk Taylor a8c4456c77
update xml ref 2023-09-17 21:16:35 -07:00
Myk Taylor 53574fb2b3
Merge branch '5010-beta' into develop 2023-09-17 21:15:33 -07:00
DFHack-Urist via GitHub Actions 03a24c7cff Auto-update submodules
library/xml: master
2023-09-16 07:11:54 +00:00
Kelly Kinkade a13159bc35 use `TerminateProcess` for die on windows
evades issues with the stacktrace logger in 50.10
2023-09-14 17:42:15 -05:00
Myk Taylor ca32e6a1ae
update version and refs for 50.09-r4 2023-09-14 12:38:19 -07:00
Myk Taylor e7762e7bc6
update structures ref 2023-09-14 10:20:20 -07:00
Myk Taylor 6a1b1f2222
update structures ref 2023-09-14 10:18:49 -07:00
lethosor 017e280b18
Define identity_traits<shared_ptr<T>> for all T (opaque for now) 2023-09-13 21:57:44 -04:00
Myk Taylor 49e449a422
update xml ref 2023-09-13 18:20:49 -07:00
Myk Taylor 561f447a54
update xml ref 2023-09-13 18:17:23 -07:00
Myk Taylor 96f6893a32
update xml ref 2023-09-13 18:02:52 -07:00
Myk Taylor a7e59c8f77
update xml ref 2023-09-13 17:06:33 -07:00
Myk Taylor 218e52bd93
Merge branch 'myk_proc_maps_format' into 5010-beta 2023-09-13 17:00:08 -07:00
Kelly Kinkade 9ea68d38c5 sync structures 2023-09-13 13:57:55 -05:00
Myk Taylor 863df21dd2
protect against missing keys param 2023-09-12 23:08:55 -07:00
Myk Taylor d2ae5463df
update xml ref 2023-09-12 22:58:26 -07:00
lethosor fd676fa70f
Add identity_traits for std::unordered_map 2023-09-12 23:38:09 -04:00
Kelly Kinkade dbee92cd81 `widget` is a `struct` not a `class`
at least as far as df-structures is concerned...
2023-09-12 22:01:58 -05:00
Kelly Kinkade 673d9d5230 bodge DataIdentity to get 50.10 working 2023-09-12 21:55:55 -05:00
Myk Taylor f8b2297ddc
update xml ref 2023-09-12 18:41:50 -07:00
Kelly Kinkade a829358af0 update structures 2023-09-12 15:57:04 -05:00
Myk Taylor 22f68223a1
update structures ref 2023-09-12 01:03:36 -07:00
DFHack-Urist via GitHub Actions 51772430f2 Auto-update submodules
library/xml: master
2023-09-12 07:12:47 +00:00
Myk Taylor 905438be96
update xml ref to 5010-testing 2023-09-11 23:21:55 -07:00
Myk Taylor 2e11c91a10
format string didn't match my system; generalizing 2023-09-10 23:04:20 -07:00
Myk Taylor e325f3b6d9
differentiate the new region loading screen in the focus string 2023-09-10 16:32:52 -07:00
Myk Taylor a0919ec316
add ASCII-mode highlight for smoothing and carving designations 2023-09-10 05:29:55 -07:00
Myk Taylor 5a557f232f
disable texture loading if enabler isn't present 2023-09-10 01:42:59 -07:00
DFHack-Urist via GitHub Actions d118a37be6 Auto-update submodules
library/xml: master
scripts: master
2023-09-10 07:12:04 +00:00
Andriel Chaoti bae570d756
Merge branch 'develop' into andriel_argparse 2023-09-09 14:44:44 -06:00