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
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
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
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
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
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
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
863df21dd2
protect against missing keys param
2023-09-12 23:08:55 -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
5a557f232f
disable texture loading if enabler isn't present
2023-09-10 01:42:59 -07:00
Myk Taylor
cbe4f53823
add focus string details for orders context
2023-09-03 12:50:12 -07:00
Myk Taylor
1d6ae37a66
fix and reinstate heat safety filter
2023-09-03 11:54:32 -07:00
Myk Taylor
b8fc6e210f
add note about handling bags
2023-09-03 07:12:30 -07:00
Myk
940d25accb
Merge pull request #3711 from myk002/myk_instrument_textures
...
[Textures] instrument textures module
2023-08-31 18:14:18 -07:00
lethosor
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
Myk Taylor
088fa9a35c
instrument textures module and clean up gui
2023-08-31 10:53:43 -07:00
Myk
5d7649837c
Merge pull request #3704 from shevernitskiy/create-delete-textures
...
create and delete textures
2023-08-30 03:42:27 -07:00
shevernitskiy
8a015f7f87
review
2023-08-30 07:38:21 +03:00
Myk Taylor
a8bf8a04ae
add in value for units contained in cages
2023-08-28 15:42:56 -07:00
Myk Taylor
423bba2c24
pass getAnyStockpile and getAnyCivZone through ZScreens
2023-08-28 13:27:46 -07:00
shevernitskiy
4b0219e225
fix stupid linux build again
2023-08-28 10:56:08 +03:00
shevernitskiy
51baa0d674
fix linux build
2023-08-28 10:46:59 +03:00
shevernitskiy
6f11812729
create and delete textures
2023-08-28 10:00:39 +03:00
Myk
a740c6628e
Merge pull request #3663 from shevernitskiy/dynamic-texture-loading
...
feat: dynamic texture loading
2023-08-27 22:45:52 -07:00
shevernitskiy
6c5163af9e
adjust adopt region reset step
2023-08-27 22:28:03 +03:00
Myk Taylor
1763a16831
add training check functions to Units
2023-08-20 10:08:25 -07:00
shevernitskiy
c1945f7b54
fix build err in gcc
2023-08-17 06:32:26 +03:00
Myk Taylor
fa3c2222e6
higher granularity for unit viewsheet focus strings
2023-08-13 23:54:18 -07:00
shevernitskiy
91f4c3d561
mirgate preloaded assets to lua
2023-08-14 08:17:57 +03:00
shevernitskiy
1409af67de
expose api to lua
2023-08-13 20:09:12 +03:00
Myk
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
shevernitskiy
22b0671038
review 2
2023-08-13 08:33:31 +03:00
Myk Taylor
b787c2bb1e
make creating a workorder a subscreen instead of a top-level
2023-08-12 22:02:17 -07:00
Myk Taylor
c37dce7c33
detect extended tile properties and communicate them back to lua
2023-08-12 15:53:22 -07:00