75df1c0426
Merge pull request #3713 from lethosor/fix-removejob-gcc-optimization
...
Hack to force GCC to invoke cancel_job() through DF's vtable
2023-08-31 15:27:56 -07:00
8cffe3bc87
Merge pull request #3712 from myk002/myk_relwithdebinfo
...
remove unneeded modification of CMAKE_CXX_FLAGS_RELWITHDEBINFO
2023-08-31 14:53:06 -07:00
bb79755efd
Add test that removeJob() actually removes jobs
2023-08-31 17:42:17 -04: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
cf53283f33
remove unneeded modification of CMAKE_CXX_FLAGS_RELWITHDEBINFO
...
-g is already in the flags, we just end up adding it a second time
2023-08-31 14:14:45 -07:00
088fa9a35c
instrument textures module and clean up gui
2023-08-31 10:53:43 -07:00
38ece5aa93
fix status output character encoding
...
so dwarf and item names and item descriptions are printed correctly
2023-08-31 06:03:52 -07:00
07e8e83837
Merge pull request #3698 from Halifay/advanced_military_sorting
...
Enhancing Military Candidate Selection
2023-08-30 23:52:18 -07:00
742c8bbfb8
Auto-update submodules
...
scripts: master
2023-08-31 06:32:03 +00:00
4a788e79c3
Apply suggestions from code review
2023-08-30 23:26:03 -07:00
2c97ab9c8d
Tidying up melee skill and ranged skill funcitons in sort.lua.
2023-08-30 17:16:59 +03:00
5d7649837c
Merge pull request #3704 from shevernitskiy/create-delete-textures
...
create and delete textures
2023-08-30 03:42:27 -07:00
47a22025a0
Update docs/dev/Lua API.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-30 12:49:48 +03:00
02d33e532d
Update docs/dev/Lua API.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-30 12:49:40 +03:00
63913567cf
Update docs/dev/Lua API.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-30 12:49:28 +03:00
72a985c3b0
Update docs/dev/Lua API.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-30 12:49:17 +03:00
a2d1d416c4
Update docs/dev/Lua API.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-30 12:49:09 +03:00
14c4e948ba
Update docs/dev/Lua API.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-30 12:49:01 +03:00
72dbb68a5c
Update docs/dev/Lua API.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-30 12:48:54 +03:00
c0ac7ad8a2
Update docs/dev/Lua API.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-30 12:48:47 +03:00
13e0a49eef
Update docs/dev/Lua API.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-30 12:48:36 +03:00
b3d423b8a4
Update docs/dev/Lua API.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-30 12:48:26 +03:00
7ce7bd15f6
Update docs/dev/Lua API.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-30 12:48:14 +03:00
5c6942a89c
intendation for example
2023-08-30 10:45:17 +03:00
a1fe49e52a
typo
2023-08-30 10:37:23 +03:00
ff82cb2dfc
docs work
2023-08-30 10:05:23 +03:00
26b81cfbbd
Merged military rating back into one. Adjusted formulas for melee and ranged rating. Added skill effectiveness ratings for ranged and melee. Changed any melee and any ranged to skill effectiveness ratings. Added info about new ratings and research links to the docs.
2023-08-30 09:39:13 +03:00
db50dd6f53
Merge pull request #3708 from ab9rf/5009-treeseedwatch
...
seedwatch: ignore tree seeds
2023-08-29 22:42:33 -07:00
e87aefa7bf
seedwatch: changelog
2023-08-30 00:08:51 -05:00
c5d30763b9
seedwatch: rewrite configuration cleaning
2023-08-30 00:07:30 -05:00
8a015f7f87
review
2023-08-30 07:38:21 +03:00
fa9d2e2175
seedwatch: ignore tree seeds
2023-08-29 22:23:13 -05:00
73af533a90
Update docs/plugins/sort.rst
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-29 10:59:28 +03:00
f2a5d82b90
Auto-update submodules
...
scripts: master
2023-08-29 01:23:03 +00:00
6c3da5159f
Merge pull request #3707 from myk002/myk_quickfort_by_id
...
update quickfort user guide for new take_from semantics
2023-08-28 18:13:20 -07:00
fb3ec4947a
Merge pull request #3706 from myk002/myk_cage_price
...
add in value for units contained in cages
2023-08-28 18:04:30 -07:00
6185df25d6
update quickfort user guide for new take_from semantics
2023-08-28 17:59:52 -07:00
a8bf8a04ae
add in value for units contained in cages
2023-08-28 15:42:56 -07:00
fe621d5648
Merge pull request #3705 from myk002/myk_get_any
...
pass getAnyStockpile and getAnyCivZone through ZScreens
2023-08-28 13:48:47 -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
c91a02ca6a
Reworked fallback from rating sortings. Renamed melee potential to solo combat potential. Added group combat potential.
2023-08-27 17:52:09 +03:00
6fcbf48c84
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-25 13:28:37 +00:00
493be93a4c
Fixing conflicts.
2023-08-25 16:26:32 +03:00
Myk
lethosor
Myk Taylor
DFHack-Urist via GitHub Actions
Mikhail
shevernitskiy
Kelly Kinkade
Mikhail Panov
pre-commit-ci[bot]