Commit Graph

13823 Commits (2923cf7d2114df2578227202a36746df7d9bff3a)
 

Author SHA1 Message Date
lethosor 75bf013c7f
Add more "orders import" tests
The invalid-after-valid test fails
2021-06-30 23:15:56 -04:00
lethosor 5686272c91
Add tests for "orders import"
A couple crashes have resulted from invalid orders JSON files - this should
help catch any regressions with error handling.

See #1770, #1893, #1894
2021-06-30 23:01:51 -04:00
lethosor 71cfa744f9
Merge remote-tracking branch 'myk002/myk_orders_splat' into develop 2021-06-30 22:33:13 -04:00
myk002 db0614d85b
update changelog 2021-06-30 15:00:45 -07:00
myk002 36c481cd10
catch exceptions thrown while importing orders 2021-06-30 14:58:01 -07:00
myk002 c1df1ceff7
add support for custom test wrapper functions
to support @BeforeEach and @AfterEach semantics. however, much of our
code is scope-based (lambda-based?) so it seemed to make sense to
use a single wrapper function instead of separate before_each and
after_each functions.
2021-06-30 07:10:59 -07:00
DFHack-Urist via GitHub Actions 0b2e26d095 Auto-update submodules
scripts: master
2021-06-30 07:15:18 +00:00
lethosor fa023db5d8
Merge remote-tracking branch 'myk002/myk_blueprint_normalize' into develop 2021-06-30 00:20:29 -04:00
lethosor 8f6b99f8d1
Merge remote-tracking branch 'myk002/myk_normalize_path' into develop 2021-06-30 00:16:08 -04:00
myk002 367fdbd31c
normalize pathnames and handle dirs as basenames 2021-06-29 14:25:30 -07:00
myk002 a6a9704631
update changelog 2021-06-29 12:25:21 -07:00
myk002 eafa6e86f7
add utils.normalizePath() 2021-06-29 12:22:05 -07:00
DFHack-Urist via GitHub Actions 2a54b101bd Auto-update submodules
scripts: master
2021-06-29 07:14:21 +00:00
lethosor 438f98804d
Merge branch 'develop' of DFHack/dfhack into develop 2021-06-28 01:03:44 -04:00
lethosor e070f4d9d8
Merge remote-tracking branch 'myk002/myk_sidebar' into develop 2021-06-28 01:03:13 -04:00
DFHack-Urist via GitHub Actions 168d53c688 Auto-update submodules
scripts: master
2021-06-27 07:14:25 +00:00
DFHack-Urist via GitHub Actions 71aeaf6e07 Auto-update submodules
scripts: master
2021-06-26 07:14:19 +00:00
lethosor 4945018e92
Merge remote-tracking branch 'myk002/myk_multi_mock' into develop 2021-06-25 01:27:46 -04:00
lethosor 96dd249be0
getAnyPlant: use Maps::getPlantAtTile
Followup to #1882
2021-06-25 01:08:58 -04:00
lethosor 64f0efd7b2
Merge remote-tracking branch 'Bumber64/patch-1' into develop 2021-06-25 00:59:39 -04:00
Ryan Williams 35d32645fc
Added getPlantAtTile to Lua API 2021-06-23 23:12:53 -07:00
Ryan Williams 5807d6fbfa
Merge branch 'DFHack:develop' into patch-1 2021-06-23 23:08:01 -07:00
Ryan Williams c5e7a54d97
Rename to getPlantAtTile; remove extra variables 2021-06-23 23:03:22 -07:00
Ryan Williams c5fb28a13c
Rename getPlantAtCoords to getPlantAtTile 2021-06-23 23:00:30 -07:00
Ryan Williams 818ff7a946
Rename getPlantAtCoords to getPlantAtTile 2021-06-23 22:59:39 -07:00
Ryan Williams a67a5d8283
Rename getPlantAtCoords to getPlantAtTile 2021-06-23 22:58:24 -07:00
lethosor 1b167e7898
Also add quotes in expect.ne()
Extension of #1886
2021-06-24 01:15:15 -04:00
lethosor 72998cddd5
Merge remote-tracking branch 'myk002/myk_expect_quotes' into develop 2021-06-24 01:11:21 -04:00
lethosor e6729894ab
Merge remote-tracking branch 'myk002/myk_delay_until' into develop 2021-06-24 01:05:41 -04:00
lethosor 0297a5b1b8
Check some more cases, especially empty strings 2021-06-24 00:42:50 -04:00
lethosor 1da0f85192
Merge remote-tracking branch 'myk002/myk_wrap' into develop 2021-06-24 00:40:47 -04:00
lethosor bc4e00b242
Print more complete tracebacks on test check failures
Any library functions written in Lua, like `dfhack.with_finalize()`, would
cause the traceback to end even if there were more stack frames in the test file.
2021-06-24 00:39:03 -04:00
myk002 7793adb888
update changelog 2021-06-23 14:55:42 -07:00
myk002 9c7cb473ce
add delay_until test function 2021-06-23 14:53:02 -07:00
myk002 67840c033c
add quotes around printed unequal values
so you can see confusing hidden trailing spaces
2021-06-23 14:04:16 -07:00
myk002 3ca80c271d
update changelog 2021-06-23 14:01:23 -07:00
myk002 5b12c64cba
add new string function: wrap()
refactored and improved from the implementation in quickfort's dialog.lua
2021-06-23 13:59:39 -07:00
myk002 d1796effd6
update changelog 2021-06-23 12:32:25 -07:00
myk002 000b589e3a
add dwarfmode library function: enterSidebarMode()
refactored from quickfort. this common implementation will replace the
now redundant functions in quickfort, gui/mass-remove, and gui/blueprint
2021-06-23 12:29:37 -07:00
arzyu c36441142a update changelog 2021-06-23 23:53:06 +08:00
arzyu c30ac42c51
use "move selector" instead of "move cursor" 2021-06-23 14:25:45 +08:00
Ryan Williams 7f61c24181
Authors.rst: Bumber -> Ryan Williams 2021-06-22 20:13:35 -07:00
Ryan Williams 60fe864426
Update Lua API.rst 2021-06-22 20:10:25 -07:00
Ryan Williams bc841f595e
Update LuaApi.cpp 2021-06-22 20:05:45 -07:00
Ryan Williams b64e28253f
Update Maps.cpp 2021-06-22 20:03:18 -07:00
Ryan Williams d81de5e4c7
Add getPlantAtCoords function to Maps namespace
Derived from disassembly of DF code. Returns a pointer to plant struct that owns the tile at position. Useful for finding a tree from one of its branches. Lua API support.
2021-06-22 20:01:10 -07:00
Warmist b7069a5ebd
Fix label early key detection in scrolling logic
Current logic is because @myk002 fixed it so label would allow other widgets control when label(s) are present. However that breaks label key detection for default scroll keys. This can be worked around by setting scrollkeys to empty.

TBH: label is quite complicated and used everwhere so i'm reluctant to touch it and would love for someone to look over if i'm correct.
2021-06-22 11:31:00 +03:00
Tachytaenius 990c153a9a
Show adjective in item prompt
Useful for high boot/low boot etc.
2021-06-19 13:59:38 +01:00
lethosor 2fc5fbacb5
Merge remote-tracking branch 'myk002/myk_reveal_unhideFlood' into develop 2021-06-19 01:08:05 -04:00
lethosor db7eb9a736
Update scripts, move changelog entry 2021-06-18 18:22:53 -04:00