d859a9f420
more adjustments to make gcc happy
2023-10-16 11:27:55 -05:00
74dffc5f52
add a `default:` to make gcc happy
2023-10-16 11:17:33 -05:00
a09f122d7e
implement simulated `Items::getCapacity`
...
in support of `combine`, see #3307
2023-10-16 11:08:36 -05:00
b128b904eb
Update Translation.cpp
2023-10-15 21:56:36 -07:00
eab10080db
Revert "use df's translate_name function if available"
2023-10-15 21:54:50 -07:00
2d20e790b6
Merge branch 'develop' into translate-name
2023-10-14 11:22:59 -05:00
87af3281fb
use generic baby/child names when race doesn't have something specific
2023-10-14 04:22:43 -07:00
43b0c3e10d
add more detailed focus strings for the nobles info screen
2023-10-13 14:33:06 -07:00
75e7e6462d
add focus strings for viewscreen_worldst
2023-10-10 16:40:20 -07:00
61e4432424
label war and hunt trained animals in readable names
2023-10-09 17:24:13 -07:00
34bbf4cce9
add more focus strings for justice screens
2023-10-08 13:44:45 -07:00
5c5fa341a8
Merge pull request #3849 from myk002/myk_info_search
...
search overlay for CREATURES info panels
2023-10-07 19:15:50 -07:00
d0ffd78479
more focus string details for location selector
2023-10-07 19:04:19 -07:00
37ad0c3e6f
add more focus string details for info panels
2023-10-07 12:10:52 -07:00
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
5d295400d2
centralize management of mouse state
2023-10-01 16:28:18 -07:00
bb9829eb51
Merge branch 'develop' into eventmanager_cleanup
2023-09-29 14:54:29 +01:00
13f83d2f95
protect against bad values in TranslateName
2023-09-28 16:35:29 -07:00
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
78bea2a550
fixed a typo brain fart moment
2023-09-27 23:34:19 +01:00
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
5c670d20db
align mouse button semantics to DF
...
we, um, had it backwards
2023-09-27 20:55:22 +01:00
6ad724b483
add detailed focus strings for setupdwarfgame
2023-09-27 20:55:22 +01:00
da77be29be
Merge pull request #3816 from myk002/myk_remousify
...
align mouse button semantics to DF
2023-09-26 19:09:23 -07:00
eefd38c66c
align mouse button semantics to DF
...
we, um, had it backwards
2023-09-26 03:52:24 -07:00
932f3324d3
add detailed focus strings for setupdwarfgame
2023-09-26 03:45:15 -07:00
ae67ec05de
remove doubled check
2023-09-24 13:01:31 +03:00
d2bc834fa9
fix exception on close, dummy surface refcount
2023-09-24 11:44:04 +03:00
bd4d831582
add flag for dummy & resolve conflicts
2023-09-24 11:44:04 +03:00
25cc778fce
review refactor
2023-09-24 11:44:04 +03:00
770402a292
erase from delayed when deleteHandle()
2023-09-24 11:44:04 +03:00
033a849de2
Apply suggestions from code review
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-09-24 11:44:04 +03:00
469a97f781
review
2023-09-24 11:44:04 +03:00
5b34ac63e1
fix for gcc
2023-09-24 11:44:03 +03:00
6f26650255
reserved texpos range
2023-09-24 11:44:03 +03:00
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
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
a61b8d11d0
Revert "use osyncstream for writing to gamelog.txt"
...
This reverts commit 4695b8c86d
2023-09-17 21:38:48 -07:00
4695b8c86d
use osyncstream for writing to gamelog.txt
2023-09-17 21:23:45 -07:00
863df21dd2
protect against missing keys param
2023-09-12 23:08:55 -07:00
e325f3b6d9
differentiate the new region loading screen in the focus string
2023-09-10 16:32:52 -07:00
5a557f232f
disable texture loading if enabler isn't present
2023-09-10 01:42:59 -07: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
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
Kelly Kinkade
Myk
Myk Taylor
Najeeb Al-Shabibi
shevernitskiy
lethosor