493be93a4c
Fixing conflicts.
2023-08-25 16:26:32 +03:00
25f2c1746a
Changed melee and ranged ratings to statistically proven linear formulas.
2023-08-25 16:18:20 +03:00
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
30488dc310
Trailing space again. My bad.
2023-08-24 18:47:42 +03:00
aef60649fe
Trim trailing whitespace.
2023-08-24 17:18:46 +03:00
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
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
03cfd6071b
limit wait for title screen in wall clock time
2023-08-23 00:48:22 -07:00
8a3c323b05
Merge pull request #3690 from ab9rf/tailor-fix-3685
...
`tailor`: remove crash
2023-08-21 11:09:49 -07:00
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
e8481a4489
Merge pull request #3689 from myk002/myk_test
...
fix tests sometimes timing out in ci
2023-08-21 02:00:13 -07:00
a7a5742710
fix tests sometimes timing out in ci
2023-08-21 01:48:42 -07:00
2d71a6b009
bump version to r3rc2
2023-08-21 00:49:31 -07:00
432e415a13
Auto-update submodules
...
library/xml: master
2023-08-21 07:47:25 +00:00
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
6caed7debe
update changelog
2023-08-20 10:09:08 -07:00
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
1763a16831
add training check functions to Units
2023-08-20 10:08:25 -07:00
053ae023b2
put df root in LD_LIBRARY_PATH so DF can find SDL2.so
2023-08-19 10:23:58 -07:00
8725fd26f6
Revert "we no longer need to set LD_LIBRARY_PATH"
...
This reverts commit 96eb6a6de3
2023-08-19 10:23:13 -07:00
a06ba69446
pass launchdf param through to windows build workflow
2023-08-19 02:45:18 -07:00
6db338bf25
set prerelease flag appropriately for github releases
2023-08-19 02:32:13 -07:00
a1d6098446
Auto-update submodules
...
library/xml: master
2023-08-19 09:21:39 +00:00
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
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
b21eef9573
Merge pull request #3681 from myk002/myk_cache_intermediate
...
archive artifacts before upload
2023-08-19 01:58:14 -07:00
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
4e090d8fe0
put artifacts in their own dir so unrelated files don't get uploaded
2023-08-19 00:09:16 -07:00
1e4594f8d5
need sphinx to generate changelogs
2023-08-18 23:46:12 -07:00
592990f1d3
make deploy to github action work for non-releases
2023-08-18 23:34:37 -07:00
8b91e84944
offer sort by race on animal assignment screen
2023-08-18 19:28:24 -07:00
d9fa827b20
support overlays on the load arena screen
2023-08-18 19:27:12 -07:00
833a54da05
bump version string to 50.09-r3rc1
2023-08-18 09:35:07 -07:00
56bc9a18ba
Auto-update submodules
...
scripts: master
2023-08-18 16:34:15 +00:00
96eb6a6de3
we no longer need to set LD_LIBRARY_PATH
2023-08-17 02:35:41 -07:00
43f265fb6f
update stonesense ref
2023-08-17 02:33:30 -07:00
e7ebaf6a7a
supercede LD_LIBRARY_PATH for dfhack libs
2023-08-17 02:33:13 -07:00
790f0ff628
fix stonesense
2023-08-16 23:58:00 -07:00
89ddc4b798
Auto-update submodules
...
library/xml: master
2023-08-17 06:06:58 +00:00
6a94dd4f25
ensure we check out the correct repo
2023-08-16 22:32:05 -07:00
1a6aec1de8
fetch full history to get other branches
2023-08-16 22:24:45 -07:00
2287ebe99a
another try at the ref format
2023-08-16 22:22:34 -07:00
1b5bee53bc
prepend origin on ref
2023-08-16 22:17:33 -07:00
57e324b8f4
Allow forced structures ref to find the branch name
2023-08-16 22:05:00 -07:00
9511d4ba06
Temporarily override structures ref for Linux build
...
Until the windows and Linux structures align again
2023-08-16 21:51:26 -07:00
e3dd0d2113
Merge pull request #3679 from myk002/myk_xmldump
...
instruct ci to install xmldump when it is built
2023-08-16 07:32:04 -07:00
caae21ae5d
instruct ci to install xmldump when it is built
2023-08-16 07:13:25 -07:00
65b9ee8ded
Merge pull request #3678 from myk002/myk_sort
...
[sort] search and sort for squad assignment screen
2023-08-16 06:26:11 -07:00
4f04d551af
update changelog
2023-08-16 06:07:49 -07:00
2620bfbb43
tweak color and layout
2023-08-16 06:07:19 -07:00
Mikhail
pre-commit-ci[bot]
Myk
Myk Taylor
Kelly Kinkade
DFHack-Urist via GitHub Actions