Commit Graph

11001 Commits (0664524249a8f5bfb5d77c9756b1e6949d47afd1)
 

Author SHA1 Message Date
Kelly Kinkade 92f258bdbf
Merge branch 'develop' into tailor-v2 2021-08-16 07:17:53 -05:00
myk002 e1f0e94f0f fix changelog 2021-08-14 21:38:00 -07:00
myk002 55d9b4754d editing pass, remove "Suites" hotkey, add "Cavern" 2021-08-14 21:38:00 -07:00
myk002 fb29bbdc17 break roof down into more stages; add traps 2021-08-14 21:38:00 -07:00
myk002 320286bf69 revise dreamfort according to testing and feedback 2021-08-14 21:38:00 -07:00
myk002 1e2732aee5 update changelog 2021-08-14 21:38:00 -07:00
myk002 f47bab9806
pass comment param to expect calls 2021-08-14 16:43:40 -07:00
myk002 00adb1b720
update changelog 2021-08-14 16:36:09 -07:00
myk002 9a7a692ea8
ensure restored orders start at index 0
so the manager_order_next_id state can be set to #orders
2021-08-14 16:35:41 -07:00
myk002 9ec1488f1b
add unit tests 2021-08-14 16:35:40 -07:00
myk002 98b707d444
ensure active orders are restored after tests 2021-08-14 16:35:40 -07:00
myk002 37a8260c3b
import and export reaction-specific item conditions 2021-08-14 16:35:40 -07:00
myk002 2bd43f6e76
update changelog 2021-08-14 16:35:34 -07:00
Chris Parsons 71ac76761a
Add underscores as suggested
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2021-08-14 18:15:06 +01:00
lethosor 77e0938dd1
Merge remote-tracking branch 'ab9rf/autogems-1263' into develop
Conflicts:
	docs/changelog.txt
2021-08-12 00:27:26 -04:00
DFHack-Urist via GitHub Actions ef0ddb729e Auto-update submodules
library/xml: master
depends/luacov: dfhack
2021-08-12 02:10:05 +00:00
lethosor 5a076df305
update-submodules: fix accidentally hardcoded branch name 2021-08-11 22:08:25 -04:00
lethosor a9c7be7a60
update-submodules: hopefully fix pulling
This was the last failure. Unsure why this doesn't occur with other submodules.

https://github.com/DFHack/dfhack/runs/3307299302?check_suite_focus=true

```
+ git checkout dfhack
Previous HEAD position was 19b52ca 0.15.0 release
Switched to branch 'dfhack'
+ git pull --ff-only
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> dfhack
```
2021-08-11 22:04:05 -04:00
lethosor 9ca2eaa794
Disable shallow clones in .gitmodules
Shallow clones cause issues with `git push --recurse-submodules=check|on-demand`
such as in https://github.com/DFHack/dfhack/runs/3307192897?check_suite_focus=true:

```
The following submodule paths contain changes that can
not be found on any remote:
  depends/luacov

Please try

    git push --recurse-submodules=on-demand

or cd to the path and use

    git push

to push them to a remote.
```

(in this case, the changes *are* on the remote, and on-demand doesn't help)

Our submodules also aren't currently very large on disk even with full clones -
libexpat is the largest:

616K    .git/modules/depends/clsocket
744K    .git/modules/depends/luacov
924K    .git/modules/depends/xlsxio
1.8M    .git/modules/depends/libzip
3.7M    .git/modules/depends/jsoncpp
8.2M    .git/modules/depends/libexpat

If a shallow clone of submodules is desired, `git clone --shallow-submodules` is
still an option.
2021-08-11 21:54:05 -04:00
lethosor 9898d8c871
update-submodules: attempt to fix checkout issue, properly exit on errors
A recent run failed to update luacov, but did not fail the workflow run:

https://github.com/DFHack/dfhack/runs/3298049090?check_suite_focus=true

```
+ git checkout dfhack
error: pathspec 'dfhack' did not match any file(s) known to git
```
2021-08-11 21:36:01 -04:00
lethosor 46984c9d03
Split docs conventions into subsections, add links to documentation on links 2021-08-11 19:14:36 -04:00
Chris Parsons 4841c338fd Compilation updates for Apple Silicon 2021-08-11 22:26:19 +01:00
Kelly Kinkade aec9649c4e
Update changelog.txt 2021-08-11 13:04:55 -05:00
Kelly Kinkade 8254b96498
update changelog 2021-08-11 13:03:28 -05:00
Kelly Kinkade 1e44f61060
update changelog 2021-08-11 13:01:52 -05:00
lethosor 0aeb107844
Update changelog (#1923) 2021-08-11 11:21:41 -04:00
lethosor d2eca8c41d
Merge remote-tracking branch 'lethosor/fix-memscan-field-offset-oob' into develop 2021-08-11 11:16:31 -04:00
lethosor c887df3b07
Add luacov to update-submodules.manifest
This should make the submodule-update job handle this dependency as well
2021-08-10 20:29:11 -04:00
lethosor e8d9a9d184
Fix out-of-bounds access in memscan.field_offset()
Fixes #1907
2021-08-10 11:26:06 -04:00
Kelly Kinkade 2981deb521 update autogems to respect workshop profiles
Add a test so that autogems will not assign cut gem jobs to workshops that are not allowed to do them.

Fixes #1263
2021-08-10 06:29:10 -05:00
lethosor 0140ace317
Merge remote-tracking branch 'myk002/myk_buildingplan_attached' into develop 2021-08-10 01:07:35 -04:00
lethosor 4d103dc546
Merge remote-tracking branch 'myk002/myk_alt_tab_modstate' into develop 2021-08-08 11:13:52 -04:00
Kelly Kinkade 73107fb21b tailor: add support for user-specified material list
Add support for user-specified material list. Also refactor, fix some mostly-innocuous bugs

Resolves #1911.
2021-08-08 09:53:32 -05:00
lethosor 40fc3dd110
Update scripts 2021-08-07 22:35:09 -04:00
lethosor 1a9b080250
Merge remote-tracking branch 'Moth-Tolias/autonick.txt' into develop 2021-08-07 22:34:45 -04:00
Kelly Kinkade 685e5111ae Update autofarm.cpp
`dts::make_unique`, not `std::make_unique`, sorry my bad
2021-08-07 15:51:21 -05:00
Kelly Kinkade ce50bbdfde fix autofarm berry problem
Update autofarm to count PLANT_GROWTHS as well as PLANTS for threshold purposes. This addresses #1902.

Also addresses some pointer hygiene issues in autofarm.
2021-08-07 15:32:43 -05:00
myk002 192dfd51ee
clear modstate on window focus
this fixes the issue where the alt modstate was getting stuck on systems
that don't send standard keyup events after alt-tab. for example, in KDE
Plasma (on Gentoo, at least), the keyup event when alt is released after
alt-tab contains an incorrect keycode (NUMLOCK instead of L_ALT), which
was preventing us from correctly clearing the alt modstate.
2021-08-06 07:10:42 -07:00
myk002 063c512389
update changelog 2021-08-06 07:10:22 -07:00
DFHack-Urist via GitHub Actions 8b14fbe544 Auto-update submodules
scripts: master
2021-08-06 07:14:34 +00:00
DFHack-Urist via GitHub Actions ffdb763ddb Auto-update submodules
scripts: master
2021-08-05 07:14:35 +00:00
lethosor ecad3bfc1a
Merge remote-tracking branch 'myk002/myk_quickfort_integration' into develop 2021-08-05 00:53:39 -04:00
lethosor 6109320ca2
Merge remote-tracking branch 'myk002/myk_ecosystem_test' into develop 2021-08-05 00:52:19 -04:00
lethosor 8bd68e59ea
Merge branch 'develop' of DFHack/dfhack into develop 2021-08-04 23:21:34 -04:00
lethosor d572c6c9dd
Update xml (dfhack/df-structures#434) 2021-08-04 23:21:28 -04:00
lethosor f617e47d39
Merge remote-tracking branch 'myk002/myk_test_elapsed' into develop 2021-08-04 23:15:54 -04:00
DFHack-Urist via GitHub Actions ca1a1253c7 Auto-update submodules
library/xml: master
2021-08-04 07:19:36 +00:00
lethosor 8a2fd1e845
Merge branch 'develop' of DFHack/dfhack into develop 2021-08-03 19:53:39 -04:00
lethosor 79a22e25eb
Merge remote-tracking branch 'myk002/myk_dig_dug' into develop 2021-08-03 19:53:01 -04:00
myk002 d8b5ac41d9
ensure soil tiles get randomized variants 2021-08-01 23:30:04 -07:00