85b828537e
Merge branch 'DFHack:develop' into Bumber64-patch-2
2022-05-30 14:45:45 -07:00
0ff0d272b5
use static instead of anon namespace; suggested changes
2022-05-30 13:51:24 -07:00
1c3ea000e1
Trim trailing whitespace
2022-05-28 15:56:49 -07:00
249ed2888f
Fix scope issue
2022-05-28 13:28:10 -07:00
e613085b0e
remove whitespace
2022-05-28 12:39:49 -07:00
2b29431806
More fixes
...
* Use word_wrap()
* add_proper_report utility fn; have addCombatReportAuto use this
* Update Lua API.rst
* Update Gui.cpp
2022-05-28 12:35:49 -07:00
9d2bb01caf
Auto-update submodules
...
scripts: master
depends/libexpat: dfhack
2022-05-28 07:17:45 +00:00
ea7fe2b926
account for scroll bars when sizing message boxes
2022-05-27 15:38:13 -07:00
07f54deb0b
fix wrong `Label.frame_body.x2` value ( #2134 )
...
* fix wrong `Label.frame_body.x2` value
`update_scroll_inset` might change `frame_inset`, i.e. we need to `computeFrame` with the new values.
* add tests for Label
* add missing `local`, remove code in comments
* move `TestFramedScreen` outside test functions
2022-05-27 15:25:17 -07:00
add8aa2386
Auto-update submodules
...
depends/libexpat: dfhack
2022-05-27 07:18:24 +00:00
ca10cbc9e6
Merge remote-tracking branch 'lethosor/mock-observe-func' into develop
2022-05-27 01:46:24 -04:00
71d003c77d
Ensure that test stack frames in the test file are printed
...
Previously, only frames in the file that called `expect.*()` were printed.
This change allows calling `expect.*()` from functions called by the files
under test. See dfhack/scripts#385 for an example with `expect.fail()`.
2022-05-27 01:03:40 -04:00
888c531774
Add mock.observe_func(), improve mock.lua documentation
...
observe_func() is similar to func() but passes through all calls to a specified
function.
2022-05-27 00:33:44 -04:00
1f58896054
Clarify text and fix typos in the readme
2022-05-25 22:49:09 -07:00
56b301164f
Auto-update submodules
...
library/xml: master
scripts: master
2022-05-25 07:18:15 +00:00
7d2ecae8b4
Merge branch 'DFHack:develop' into Bumber64-patch-2
2022-05-24 05:34:18 -07:00
4b21e7afb4
Remove parseReportString from API (now utility fn)
...
Implementations using `word_wrap()` are commented out pending changes to that function.
2022-05-24 03:52:33 -07:00
77d045488b
Confirmation dialog for removing manager orders ( #2163 )
2022-05-23 21:17:52 -07:00
c4febc789a
Auto-update submodules
...
scripts: master
2022-05-21 07:17:35 +00:00
81edd716d0
update scripts HEAD with test fixes
2022-05-19 16:36:22 -07:00
8b1070b553
tombstone deteriorate*rb scripts ( #2157 )
...
* tombstone deteriorate*rb scripts
* update to scripts head so we can build docs
* fix anchors
2022-05-19 15:27:08 -07:00
18628ff5b8
make key_sep more configurable
...
and add more configuration to HotkeyLabel and EditField to take
advantage of it
2022-05-18 16:46:33 -07:00
53609db1f9
let CycleHotkeyLabels take numeric initial_options
...
even if all of the option values are non-numeric
2022-05-18 15:39:52 -07:00
47b87a5ac1
Auto-update submodules
...
library/xml: master
2022-05-17 07:18:04 +00:00
ce34ac8f33
Use debugfilter; remove redundant changelog entries
2022-05-16 18:41:47 -07:00
0da881d5eb
Auto-update submodules
...
plugins/isoworld: dfhack
2022-05-15 07:17:46 +00:00
785fe9aa3a
fix "info" level described as "error" level
2022-05-14 05:56:57 -07:00
dfd3a39f0e
Auto-update submodules
...
scripts: master
2022-05-14 07:23:55 +00:00
ac8ac96080
fix warning on windows about possible loss of data
2022-05-13 14:37:13 -07:00
d6df928d69
update changelog
2022-05-13 14:36:49 -07:00
e4f951b01d
make both easy and lavish meals
2022-05-13 14:36:49 -07:00
b489a8584f
add more prepared meals logic
...
also remove material matchers for jugs and pots. we only care that we
have enough jugs and pots, not that they are rock
2022-05-13 14:36:49 -07:00
1b426efdb9
reduce spurious warnings from libzip
2022-05-13 14:36:22 -07:00
8f6522899b
Upgrade jsoncpp to 1.9.5 ( #2144 )
...
* test jsoncpp upgrade
* use new json library target name
* don't remap the output dirs
* undo warnings at the source
* set new defaults for jsoncpp
* fix typo in new options
* fix signed comparison mismatch warning
* address random(?) compile failures
saying our std::atomic is not initialized in Debug.cpp
2022-05-13 13:52:43 -07:00
4d08a49afb
Auto-update submodules
...
plugins/isoworld: dfhack
2022-05-12 05:41:20 +00:00
b2aa2a9b31
move isoworld to pull from the new dfhack branch
2022-05-11 22:40:33 -07:00
08a39400de
Auto-update submodules
...
depends/jsoncpp-sub: dfhack
2022-05-12 05:33:14 +00:00
bf8eaef6bc
Auto-update submodules
...
library/xml: master
plugins/isoworld: master
depends/libexpat: dfhack
depends/jsoncpp-sub: dfhack
2022-05-12 05:21:01 +00:00
a3a0631c41
fix typo in ci/update-submodules.manifest
2022-05-11 22:18:52 -07:00
2c6e450ac9
update the list of submodules to autoupdate
2022-05-11 22:14:08 -07:00
f7a3074204
Merge branch 'fix-script-docs-ext-check' into develop
2022-05-11 13:29:43 -04:00
baab258774
Auto-update submodules
...
scripts: master
depends/libzip: dfhack
depends/libexpat: dfhack
depends/xlsxio: dfhack
2022-05-11 07:23:49 +00:00
8696f72f77
Fix script-docs.py extension check
...
The check previously matched any filename ending in `lua`, not `.lua`. This
caused failures in my fork because I had a branch ending in `-lua`, which
created a file of that name in `.git/refs` that was not a valid Lua script.
For extra good measure, anything under `.git` is ignored now as well.
2022-05-11 01:06:47 -04:00
7439678214
tombstone devel/unforbidall script
2022-05-10 15:37:37 -07:00
15a11d1a39
Auto-update submodules
...
library/xml: master
scripts: master
2022-05-10 07:22:46 +00:00
f9cc79fb8d
pre-commit: decrease autoupdate interval to monthly
2022-05-10 00:57:56 -04:00
1203274e9f
Update Authors.rst
...
This time with missing scripts and df-structures authors since 0.47.04-r1
Just one: DFHack/scripts#339
2022-05-10 00:51:16 -04:00
947098e564
Merge remote-tracking branch 'softmoth/command-prompt-wrap' into develop
2022-05-09 22:14:31 -04:00
5d2739eee0
[command-prompt] word-wrap response text
...
Fixes #2079
2022-05-09 13:42:16 -04:00
c3347d465f
[command-prompt] cosmetics: whitespace, sort headers
2022-05-09 13:42:16 -04:00
Ryan Williams
DFHack-Urist via GitHub Actions
myk002
Timur Kelman
lethosor
Tim Siegel