dfb52a2aba
Merge remote-tracking branch 'lethosor/command-prompt-fix-gui-scripts' into develop
...
Conflicts:
docs/changelog.txt
2021-04-02 21:53:14 -04:00
81905fa8fc
Merge remote-tracking branch 'lethosor/fix-buildingplan-construction-sizing' into develop
2021-04-01 22:01:50 -04:00
257f8dbe00
buildingplan: fix size calculation for constructions
...
Planning a 4x2 construction with DF's `umkh` keys (i.e. not automaterial's box-select) would previously produce a 5x3 construction instead, for example.
2021-04-01 00:16:54 -04:00
8129fdab4e
Merge remote-tracking branch 'myk002/myk_invalidate_scripts' into develop
2021-03-31 00:50:31 -04:00
c06d1f8e52
tagged union support for lua ( #1818 )
2021-03-30 15:55:06 -05:00
5e7653bbf5
Don't run update-submodules job in forks
2021-03-29 20:03:50 -04:00
4e844f39ae
undo formatting change in script_environment
2021-03-29 12:29:15 -07:00
d71a816b20
remove debug marker
2021-03-29 12:28:19 -07:00
54a1e8d98a
move script_environment changes to test.lua
2021-03-29 12:23:53 -07:00
e4cab1b1c6
load scripts into different namespace for testing
2021-03-29 11:26:28 -07:00
badf471434
Auto-update submodules
...
library/xml: master
2021-03-29 07:07:32 +00:00
8ccacd94e0
clarify clean_reqscript() function comment
2021-03-28 15:41:05 -07:00
035c9eec04
force reloading of scripts under test
...
and invalidate scripts once tests are complete. this ensures that the
IN_TEST flag is respected.
2021-03-28 15:40:59 -07:00
2332009825
Merge remote-tracking branch 'myk002/myk_enable_luacov' into develop
2021-03-28 00:38:36 -04:00
5e09fd882d
Fix Painter:viewport()
...
This works because Painter inherits from ViewRect. Unsure how this went unnoticed.
2021-03-27 16:55:48 -04:00
d5ba1a3d23
Auto-update submodules
...
library/xml: master
2021-03-27 07:11:38 +00:00
572b6ebab5
Fix warning ( #1796 )
2021-03-27 00:11:50 -04:00
d61c4aa234
Merge remote-tracking branch 'myk002/myk_xlsxreader_classes' into develop
2021-03-27 00:10:03 -04:00
4d2af8438f
always read all cells to work around xlsxio bug
...
otherwise xlsxio will return a spurious empty row on next row read
2021-03-26 19:43:15 -07:00
ceae4723cd
Update scripts, authors ( dfhack/scripts#264 )
2021-03-26 00:37:28 -04:00
26e41005e3
Fix fastdwarf warning
2021-03-25 17:20:33 -04:00
dbd35359be
Update xml
2021-03-24 22:07:37 -04:00
2249b32ef0
Merge branch 'myk_move_main' into develop
2021-03-24 22:07:21 -04:00
62776f5568
Move `expect` functions to a separate file
...
This allows tests to test these functions without needing to include the test
wrapper directly (now ci/test.lua, formerly test/main.lua). Hopefully this
location is also more stable, similar to other libraries that are already tested.
2021-03-24 00:48:52 -04:00
29a396ba54
Merge branch 'develop' into myk_move_main
2021-03-23 22:17:36 -04:00
9a29e5f1ce
Make "test file failed to load" errors more obvious, and make run-tests.py fail
...
These errors could previously go undetected, since they were easy to miss at the
end of the output and did not cause run-tests.py to fail.
This change adds a `*` pseudo-entry to test_status.json, which is set to
"failed" if any tests failed *or* failed to load. This avoids the need to change
run-tests.py, which is cached on Buildmaster.
See #1815
2021-03-23 22:11:48 -04:00
10a7455e85
Update scripts
2021-03-23 21:28:14 -04:00
e9efa6c961
Update xml, fix + improve robustness of unions.lua unit tests
...
- unit_action_fields(): handled primitive union members correctly
- unit_action_type(): added messages to make failures easier to diagnose
- Also removed redundant checks that effectively checked that
`enum.attrs[k] == enum.attrs[v]` - this is out of scope of union tests
2021-03-23 21:24:57 -04:00
3e67b8f00f
Merge remote-tracking branch 'myk002/myk_always_run_tests_by_default' into develop
2021-03-23 21:09:57 -04:00
a9192ebe12
update docs with new script path
2021-03-22 11:09:44 -07:00
222feff342
expand docs for open and close functions
2021-03-22 10:44:32 -07:00
4ef0ff2a24
fix formatting errors
2021-03-22 10:40:29 -07:00
e157c20fc2
use new test harness script path
2021-03-22 10:23:31 -07:00
5f00183177
move test harness out of test dir
...
and install to test.lua in top-level scripts directory instead of test/main.lua
2021-03-22 10:15:32 -07:00
3e5a2c8d7c
rerun all tests by default
...
introduce and use --resume option for ci
2021-03-22 10:06:03 -07:00
aac958aa50
add open() wrapper fn and document class methods
2021-03-22 09:38:20 -07:00
d5d41cd374
Auto-update submodules
...
library/xml: master
2021-03-22 07:20:39 +00:00
59b023c71d
Ensure that command-prompt is dismissed after a command creates a new screen
...
Fixes #1803
Running a command that created a new screen would previously result in a screen
order that looked like this, due to how `Screen::Hide` works:
- DF screen
- `command-prompt` screen (dismissed)
- New screen
The `command-prompt` screen remained on the stack until the new screen was
dismissed, so it would intercept viewscreen vmethod calls intended for the
DF screen.
This change adds a new behavior to `Screen::Hide` that results in this screen
order after running a command:
- DF screen
- New screen
- `command-prompt` screen (dismissed) - DF removes this screen immediately
2021-03-21 20:42:50 -04:00
e7cf5e2079
Update scripts
2021-03-21 00:13:01 -04:00
fcb17da223
Update authors ( #1801 ), xml
2021-03-20 19:21:39 -04:00
3926482047
Merge remote-tracking branch 'gaberau/patch-1' into develop
2021-03-20 19:15:25 -04:00
81b6d93701
Minor grammer fixes.
2021-03-20 15:51:35 -06:00
cc376eeb55
Fixed a number of spelling and grammatical errors. Should be set now. Added better examples and removed redundant words.
2021-03-20 15:49:53 -06:00
120a359d6f
Fix typo
2021-03-20 13:29:30 -04:00
4c27c558db
Merge remote-tracking branch 'myk002/myk_interactive_test' into develop
2021-03-20 13:29:05 -04:00
374fc763eb
Fixed whitespace issues that cause a failed build on lint.
2021-03-20 01:55:45 -06:00
e6639180db
Fixed merge conflicts, expanded upon provided examples, added more detail.
2021-03-20 01:47:36 -06:00
5aa3c6bfc6
Revised Lua API.rst to better explain command. Added proper examples and explantion of difference between run_command and run_script.
2021-03-19 21:58:24 -06:00
a77353b2e6
Update Lua API.rst
...
Corrected the dfhack.run_script documentation and added an example.
2021-03-17 23:17:01 -06:00
89e11b56f2
Merge remote-tracking branch 'myk002/myk_no_test_scripts' into develop
2021-03-14 14:42:51 -04:00
lethosor
Ben Lubar
myk002
DFHack-Urist via GitHub Actions
Gabe Rau