Commit Graph

14978 Commits (ebb190e3569daa534fe8363b03fe7027d695b427)
 

Author SHA1 Message Date
Mikhail 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
Myk db50dd6f53
Merge pull request #3708 from ab9rf/5009-treeseedwatch
seedwatch: ignore tree seeds
2023-08-29 22:42:33 -07:00
Kelly Kinkade e87aefa7bf seedwatch: changelog 2023-08-30 00:08:51 -05:00
Kelly Kinkade c5d30763b9 seedwatch: rewrite configuration cleaning 2023-08-30 00:07:30 -05:00
shevernitskiy 8a015f7f87 review 2023-08-30 07:38:21 +03:00
Kelly Kinkade fa9d2e2175 seedwatch: ignore tree seeds 2023-08-29 22:23:13 -05:00
Mikhail Panov 73af533a90
Update docs/plugins/sort.rst
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-08-29 10:59:28 +03:00
DFHack-Urist via GitHub Actions f2a5d82b90 Auto-update submodules
scripts: master
2023-08-29 01:23:03 +00:00
Myk 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
Myk 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
Myk Taylor 6185df25d6
update quickfort user guide for new take_from semantics 2023-08-28 17:59:52 -07:00
Myk Taylor a8bf8a04ae
add in value for units contained in cages 2023-08-28 15:42:56 -07:00
Myk fe621d5648
Merge pull request #3705 from myk002/myk_get_any
pass getAnyStockpile and getAnyCivZone through ZScreens
2023-08-28 13:48:47 -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
DFHack-Urist via GitHub Actions 3ce2909309 Auto-update submodules
library/xml: master
scripts: master
2023-08-28 06:20:58 +00: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 4fb6b09b30 move textures to separate lua module 2023-08-28 06:58:30 +03:00
shevernitskiy 6c5163af9e adjust adopt region reset step 2023-08-27 22:28:03 +03:00
Mikhail 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
pre-commit-ci[bot] 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
Mikhail 493be93a4c Fixing conflicts. 2023-08-25 16:26:32 +03:00
Mikhail 25f2c1746a Changed melee and ranged ratings to statistically proven linear formulas. 2023-08-25 16:18:20 +03:00
pre-commit-ci[bot] 771d7f6c6c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-24 15:49:54 +00:00
Mikhail 30488dc310 Trailing space again. My bad. 2023-08-24 18:47:42 +03:00
Mikhail aef60649fe Trim trailing whitespace. 2023-08-24 17:18:46 +03:00
Mikhail a1d68286cd Added melee rating, ranged rating, mental stability rating and stress to sorting options on military screen in sort.lua. Added info about new sorting methods to sort.rst. Added name to Authors.rst. 2023-08-24 16:26:09 +03:00
Myk 04dcbe383a
Merge pull request #3695 from myk002/myk_wall_clock_wait
[test] limit wait for title screen in wall clock time
2023-08-23 08:37:08 -07:00
Myk Taylor 03cfd6071b
limit wait for title screen in wall clock time 2023-08-23 00:48:22 -07:00
Myk 8a3c323b05
Merge pull request #3690 from ab9rf/tailor-fix-3685
`tailor`: remove crash
2023-08-21 11:09:49 -07:00
Kelly Kinkade b76333ae87 `tailor`: remove crash
clothing items may have an invalid maker race; this should not happen but it does so we have to deal with it
2023-08-21 12:46:24 -05:00
Myk e8481a4489
Merge pull request #3689 from myk002/myk_test
fix tests sometimes timing out in ci
2023-08-21 02:00:13 -07:00
Myk Taylor a7a5742710
fix tests sometimes timing out in ci 2023-08-21 01:48:42 -07:00
Myk Taylor 2d71a6b009
bump version to r3rc2 2023-08-21 00:49:31 -07:00
DFHack-Urist via GitHub Actions 432e415a13 Auto-update submodules
library/xml: master
2023-08-21 07:47:25 +00:00
Myk 85de598775
Merge pull request #3688 from myk002/myk_training
[autobutcher] don't slaughter animals marked for training
2023-08-20 22:57:02 -07:00
Myk Taylor 6caed7debe
update changelog 2023-08-20 10:09:08 -07:00
Myk Taylor 8e9c6c708a
don't butcher animals who have some kind of training
also use new units functions in logistics
2023-08-20 10:08:42 -07:00
Myk Taylor 1763a16831
add training check functions to Units 2023-08-20 10:08:25 -07:00
Myk Taylor 053ae023b2
put df root in LD_LIBRARY_PATH so DF can find SDL2.so 2023-08-19 10:23:58 -07:00
Myk Taylor 8725fd26f6
Revert "we no longer need to set LD_LIBRARY_PATH"
This reverts commit 96eb6a6de3.
2023-08-19 10:23:13 -07:00
Myk Taylor a06ba69446
pass launchdf param through to windows build workflow 2023-08-19 02:45:18 -07:00
Myk Taylor 6db338bf25
set prerelease flag appropriately for github releases 2023-08-19 02:32:13 -07:00
DFHack-Urist via GitHub Actions a1d6098446 Auto-update submodules
library/xml: master
2023-08-19 09:21:39 +00:00
Myk 4f247b79f1
Merge pull request #3684 from myk002/myk_sort_by_race
[zone] offer sort by race on animal assignment screen
2023-08-19 02:20:10 -07:00
Myk 07eaa3644e
Merge pull request #3683 from myk002/myk_arena
[overlay] support overlays on the load arena screen
2023-08-19 02:20:01 -07:00
Myk b21eef9573
Merge pull request #3681 from myk002/myk_cache_intermediate
archive artifacts before upload
2023-08-19 01:58:14 -07:00
Myk Taylor c05ac0c944
pre-archive build output
so artifact upload/download takes seconds instead of minutes
we can potentially revert this commit if/when the v4 release of the
upload-artifact and download-artifact actions comes out
2023-08-19 01:47:27 -07:00