d4e40b260e
Merge remote-tracking branches 'TymurGubayev/patch-2' and 'TymurGubayev/patch-3' into develop
2021-08-21 11:30:36 -04:00
ca8d89df5a
alt_getopt.lua: allow `?` as an option
...
This makes it possible to call `script -?`
2021-08-21 13:39:10 +02:00
bd423ca47c
argparse.lua: `hasArgument` in a comment refers to `hasArg` everywhere else
2021-08-21 13:27:09 +02:00
c5509bb76f
Auto-update submodules
...
scripts: master
2021-08-21 07:15:07 +00:00
86b2329b7f
fix hardcoded call to pairs, add test
2021-08-20 22:55:07 -07:00
de48ce2818
Auto-update submodules
...
scripts: master
2021-08-20 13:26:40 +00:00
2577819e8e
Merge pull request #1925 from myk002/myk_dreamfort_extras
...
[Dreamfort] add supporting files and documentation
2021-08-20 02:32:33 -04:00
c0146f3795
make /setup blueprint more robust; redesign apts.
2021-08-19 21:58:26 -07:00
4046e06056
update changelog
2021-08-19 21:58:26 -07:00
b748c19fde
update docs to point to packaged files
...
instead of google drive uploads
2021-08-19 21:58:26 -07:00
c8d329e334
add documentation for examples files
2021-08-19 21:58:26 -07:00
e44d496563
add supporting dreamfort files to data/examples
...
and install them to hack/examples
2021-08-19 21:58:26 -07:00
119595dcaf
use df.item._identity to test noniterable userdata
2021-08-19 21:57:16 -07:00
0f0ae156c3
test printall_recurse
2021-08-19 21:57:16 -07:00
c5bb139282
unit test with userdata
2021-08-19 21:57:16 -07:00
d9c6c2dde3
add safe_pairs, update unit tests
2021-08-19 21:57:16 -07:00
6d0f7e40a9
be silent if iteration fails for printall
2021-08-19 21:57:16 -07:00
51cc8df40c
update changelog
2021-08-19 21:57:14 -07:00
3f2795e80a
unit tests first draft
2021-08-19 21:56:44 -07:00
9fc71ef6e1
printall and printall_ipairs handle all iterables
2021-08-19 21:56:43 -07:00
4606d5742e
ensure printall, ~, and @ behave in lua 5.3.6
2021-08-19 21:56:41 -07:00
3ae4dbeb21
Merge pull request #1926 from myk002/myk_projectile_vomit
...
Handle projectiles in Items module functions
2021-08-20 00:21:20 -04:00
e9eef31344
refactor list item removal into a library fn
2021-08-19 19:51:25 -07:00
8b824244ac
Update library/modules/Items.cpp
...
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2021-08-19 19:21:27 -07:00
06a85d6f0d
handle projectiles in the Items module
2021-08-19 17:44:13 -07:00
d3fdb5a6e0
update changelog
2021-08-19 17:44:06 -07:00
5750bfff9b
Auto-update submodules
...
scripts: master
2021-08-19 07:17:50 +00:00
0758f3ea6f
Auto-update submodules
...
scripts: master
2021-08-18 07:15:44 +00:00
dfd3c966e1
Auto-update submodules
...
scripts: master
2021-08-17 07:15:21 +00:00
6b83a39f52
Merge remote-tracking branch 'myk002/myk_orders_reactions' into develop
2021-08-17 00:26:02 -04:00
22bcbf9877
Merge branch 'develop' into autofarm-berry-fix
2021-08-16 07:22:11 -05:00
92f258bdbf
Merge branch 'develop' into tailor-v2
2021-08-16 07:17:53 -05:00
e1f0e94f0f
fix changelog
2021-08-14 21:38:00 -07:00
55d9b4754d
editing pass, remove "Suites" hotkey, add "Cavern"
2021-08-14 21:38:00 -07:00
fb29bbdc17
break roof down into more stages; add traps
2021-08-14 21:38:00 -07:00
320286bf69
revise dreamfort according to testing and feedback
2021-08-14 21:38:00 -07:00
1e2732aee5
update changelog
2021-08-14 21:38:00 -07:00
f47bab9806
pass comment param to expect calls
2021-08-14 16:43:40 -07:00
00adb1b720
update changelog
2021-08-14 16:36:09 -07:00
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
9ec1488f1b
add unit tests
2021-08-14 16:35:40 -07:00
98b707d444
ensure active orders are restored after tests
2021-08-14 16:35:40 -07:00
37a8260c3b
import and export reaction-specific item conditions
2021-08-14 16:35:40 -07:00
2bd43f6e76
update changelog
2021-08-14 16:35:34 -07:00
71ac76761a
Add underscores as suggested
...
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2021-08-14 18:15:06 +01:00
77e0938dd1
Merge remote-tracking branch 'ab9rf/autogems-1263' into develop
...
Conflicts:
docs/changelog.txt
2021-08-12 00:27:26 -04:00
ef0ddb729e
Auto-update submodules
...
library/xml: master
depends/luacov: dfhack
2021-08-12 02:10:05 +00:00
5a076df305
update-submodules: fix accidentally hardcoded branch name
2021-08-11 22:08:25 -04:00
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
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
Timur Kelman
DFHack-Urist via GitHub Actions
myk002
Alan
Kelly Kinkade
Chris Parsons