Commit Graph

11332 Commits (19a49059337b56bfcea47e4c4f3a364c91ebee79)
 

Author SHA1 Message Date
lethosor 62e7303c68
Upgrade pre-commit-hooks to v4.3.0 (+ submodules)
This contains a fix on Windows that checks for the executable bit according to
Git, instead of according to Windows, which reduces false-positive
"check-executables-have-shebangs" failures.
2022-06-08 17:48:14 -04:00
Josh Cooper 04058c7529 Update matcher.cpp 2022-06-08 12:42:33 -07:00
Josh Cooper cec8a358b5 Replaces deprecated code with lambdas 2022-06-08 12:42:33 -07:00
Josh Cooper f8d46a10c1 Removes unhelpful inheritance 2022-06-08 12:42:33 -07:00
Josh Cooper 0eb9eee773 Fixes presumed typo in if statement 2022-06-08 12:42:33 -07:00
Josh Cooper f146cced95 Adds definition for "undeclared reference" 2022-06-08 12:42:33 -07:00
DFHack-Urist via GitHub Actions ec2f2446d2 Auto-update submodules
library/xml: master
scripts: master
2022-06-08 07:18:16 +00:00
DFHack-Urist via GitHub Actions 40a6fcdd99 Auto-update submodules
library/xml: master
scripts: master
2022-06-07 07:18:05 +00:00
myk002 c940f086b5 make the extra_fns functionality clearer 2022-06-06 16:44:11 -07:00
myk002 f1ebfe9441 key the DF cache on the hash of download-df.sh 2022-06-06 13:49:12 -07:00
pre-commit-ci[bot] 1a4a2ec63a [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/python-jsonschema/check-jsonschema: 0.14.3 → 0.16.0](https://github.com/python-jsonschema/check-jsonschema/compare/0.14.3...0.16.0)
- [github.com/Lucas-C/pre-commit-hooks: v1.1.13 → v1.2.0](https://github.com/Lucas-C/pre-commit-hooks/compare/v1.1.13...v1.2.0)
2022-06-06 13:48:26 -07:00
Myk 24d2e8e115 Update build.yml 2022-06-06 11:43:41 -07:00
myk002 9c31e4b423 change the key so we no longer match our old cache 2022-06-06 11:43:41 -07:00
myk002 1f6726bb03 namespace the ccache key with the repo and branch 2022-06-06 11:43:41 -07:00
DFHack-Urist via GitHub Actions 97775766ef Auto-update submodules
scripts: master
2022-06-06 07:16:06 +00:00
lethosor 5e0a947d51
Fix changelog entry and release for #2028 2022-06-06 01:49:23 -04:00
myk002 46f80bed3d
allow ccache to function again 2022-06-05 21:46:24 -07:00
DFHack-Urist via GitHub Actions 7b2cb8f9a6 Auto-update submodules
library/xml: master
2022-06-05 07:16:27 +00:00
myk002 1424e8c867 remove extra EOF newline 2022-06-04 20:05:11 -07:00
myk002 3928bb67d7 promote gui/quickfort in the library guide
also add a link to the TheQuickFortress online spreadsheets
2022-06-04 20:05:11 -07:00
myk002 42c35b05cc update help text for library blueprints
refer users to gui/blueprint for interactive positioning
2022-06-04 20:05:11 -07:00
DFHack-Urist via GitHub Actions f290b1c804 Auto-update submodules
library/xml: master
scripts: master
2022-06-04 07:16:44 +00:00
myk002 a8916a269e
fix syntax error
ref: #2164
2022-06-03 13:36:09 -07:00
Myk d9addb0f24
[gui/quantum] add integration test (#2175)
* add integration test for gui/quantum

* exercise the gui/quantum ui a little more
2022-06-03 13:19:56 -07:00
myk002 514e5ee5bb
convert status message to debug message
ref: #2164
2022-06-03 13:18:16 -07:00
DFHack-Urist via GitHub Actions c277d7cedb Auto-update submodules
scripts: master
2022-06-03 20:03:29 +00:00
Myk ed2ba69713
Improvements to dreamfort, quickfort keystroke aliases, and example orders (#2162)
* add alt-f as a hotkey for quickfort

to mimic the existing windows hotkey for the old quickfort
hopefully this will ease the transition from the old quickfort to the
new

* add and document new quickfort aliases

* reduce quantity requirement for dyeing

15 is just too high. the counter counts bags, not units

* dreamfort blueprint improvements

most of these suggested by ldog on the forums. Thanks!
- significantly extend the list of hostile creatures that get stashed in the prisoner quantum stockpile
- send adamantine thread to the metalworker stockpiles
- give from thread/cloth stockpiles to clothier, loom, and dyer to protect the adamantine thread
- automatically create tavern, library, and temple locations (restricted to residents only by default)
- automatically associate the rented rooms with the tavern
- place a stockpile under the dump zone so you can set up stockpile links for dumped items
- doc improvements. in particular, point people to the new assign-minecarts tool for assigning minecarts to quantum stockpile dumps

* update changelog

* fix typo in cloth stockpile settings

* fix typo in guildhall location setup

* don't restrict stockpiles for clothiers and dyers

* deprecate jugs alias and add stone|woodentools

* remove dye thread, make jugs wooden

remove dye thread to protect adamantine
make jugs wooden to differentiate them from scroll rollers. that gives
us a chance to actually have a usable jugs-only stockpile

* dreamfort improvements

- move trap corridor gates and levers before the walls and traps so they get
  constructed first
- give useful names to the craftsdwarf's workshops
- redesign the services level to:
  - fit better in a 1x1 embark
  - add doors to the hospital recovery rooms to protect from
    werebeasts-to-be
  - add an interrogation room (sheriff's office) next to the jail

* shape hospital zone to exactly the hospital area

* don't clutter the hospital with statues

* update changelog
2022-06-02 15:51:45 -07:00
Myk ea44be9b94
Enable fortress tests in CI (#2153)
* download and cache the test save along with df

Depends on us actually putting the test save on files.dfhack.org

* run fortress tests in run-tests.py

* use google drive link for now

* make the save directory before extracting to it
2022-06-02 15:50:17 -07:00
DFHack-Urist via GitHub Actions 206944a00d Auto-update submodules
scripts: master
2022-06-02 22:41:46 +00:00
DFHack-Urist via GitHub Actions 44d3a41f79 Auto-update submodules
scripts: master
2022-06-02 20:19:21 +00:00
Myk 27bf4c758b
Allow player to pause the confirmation dialog without disabling (#2164)
* basic pause functionality for confirm

* update changelog

* wrap the pause message and output in white

* unpause on viewscreen transition when we can

but still use esc detection when we won't get a viewscreen transition
(like when we're intercepting input on viewscreen_dwarfmodest

* add more code docs about unpause detection
2022-06-02 06:24:13 -07:00
DFHack-Urist via GitHub Actions f5d3b9f699 Auto-update submodules
library/xml: master
scripts: master
2022-06-02 04:51:00 +00:00
Myk 89d3d45e87
Allow EditField widgets to manage their own activation and keyboard focus (#2147)
* use new focus subsystem in widgets.EditField

* always eat the enter key if we have an on_submit

* add modal attribute

* give EditFields a default height of 1

so they can be autoarranged
2022-06-01 21:48:21 -07:00
Myk ad2d9cad03
[lua] implement keyboard focus subsystem (#2160)
* implement keyboard focus subsystem

* Fix error in focus group combining

* documentation for the inputToSubviews decision

* modify unit tests to catch that last bug
2022-06-01 17:42:13 -07:00
Ryan Williams bc0def4342
MiscUtils word_wrap: Add option to trim only leading whitespace after wrapping (#2169)
* Update changelog.txt
2022-05-30 22:58:46 -04:00
Ryan Williams b1e118384e Update Maps.cpp 2022-05-30 16:26:30 -07:00
DFHack-Urist via GitHub Actions 9d2bb01caf Auto-update submodules
scripts: master
depends/libexpat: dfhack
2022-05-28 07:17:45 +00:00
myk002 ea7fe2b926
account for scroll bars when sizing message boxes 2022-05-27 15:38:13 -07:00
Timur Kelman 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
DFHack-Urist via GitHub Actions add8aa2386 Auto-update submodules
depends/libexpat: dfhack
2022-05-27 07:18:24 +00:00
lethosor ca10cbc9e6
Merge remote-tracking branch 'lethosor/mock-observe-func' into develop 2022-05-27 01:46:24 -04:00
lethosor 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
lethosor 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
Myk 1f58896054
Clarify text and fix typos in the readme 2022-05-25 22:49:09 -07:00
DFHack-Urist via GitHub Actions 56b301164f Auto-update submodules
library/xml: master
scripts: master
2022-05-25 07:18:15 +00:00
Myk 77d045488b
Confirmation dialog for removing manager orders (#2163) 2022-05-23 21:17:52 -07:00
DFHack-Urist via GitHub Actions c4febc789a Auto-update submodules
scripts: master
2022-05-21 07:17:35 +00:00
myk002 81edd716d0
update scripts HEAD with test fixes 2022-05-19 16:36:22 -07:00
Myk 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
myk002 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