Commit Graph

3159 Commits (035c9eec044dd0893fe9d81468c7564008f34f60)

Author SHA1 Message Date
lethosor 2332009825
Merge remote-tracking branch 'myk002/myk_enable_luacov' into develop 2021-03-28 00:38:36 -04:00
lethosor 5e09fd882d
Fix Painter:viewport()
This works because Painter inherits from ViewRect. Unsure how this went unnoticed.
2021-03-27 16:55:48 -04:00
DFHack-Urist via GitHub Actions d5ba1a3d23 Auto-update submodules
library/xml: master
2021-03-27 07:11:38 +00:00
lethosor dbd35359be
Update xml 2021-03-24 22:07:37 -04:00
lethosor 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
lethosor 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
DFHack-Urist via GitHub Actions d5d41cd374 Auto-update submodules
library/xml: master
2021-03-22 07:20:39 +00:00
lethosor fcb17da223
Update authors (#1801), xml 2021-03-20 19:21:39 -04:00
lethosor e8f8471af4
Update xml
Ref DFHack/df-structures#423
2021-03-12 00:26:02 -05:00
myk002 8fe3dac0b1
only enable luacov for the core context 2021-03-10 23:31:30 -08:00
lethosor 890fd5c746
Merge remote-tracking branch 'myk002/myk_no_test_docstrings' into develop 2021-03-10 00:44:23 -05:00
DFHack-Urist via GitHub Actions 7ea44010e0 Auto-update submodules
library/xml: master
2021-03-09 07:15:44 +00:00
myk002 916a10d717
exempt lua test files from docstring requirements
and don't display them with 'ls'
2021-03-07 08:52:45 -08:00
myk002 49b34b52f5
update docs 2021-03-07 08:16:25 -08:00
myk002 754baa45b3
remove io overrides
they were causing side effects when writing luacov reports
2021-03-07 08:16:24 -08:00
myk002 ba6a02eb59
call luacov.runner.init directly and clean up dbg 2021-03-07 08:16:24 -08:00
myk002 418a8c5d21
propagate luacov debug hook through coroutines 2021-03-07 08:16:24 -08:00
lethosor 032cd64c10
Bump to r1, update submodules and changelog 2021-03-06 13:30:16 -05:00
lethosor 2f629f3b22
Update xml 2021-03-06 12:29:35 -05:00
DFHack-Urist via GitHub Actions fe175876aa Auto-update submodules
library/xml: master
scripts: master
2021-03-06 07:15:27 +00:00
DFHack-Urist via GitHub Actions e72125dbff Auto-update submodules
library/xml: master
scripts: master
2021-03-05 07:15:28 +00:00
DFHack-Urist via GitHub Actions 1698a80c49 Auto-update submodules
library/xml: master
scripts: master
2021-03-04 07:15:38 +00:00
DFHack-Urist via GitHub Actions 12ad300d64 Auto-update submodules
library/xml: master
2021-03-03 07:16:20 +00:00
DFHack-Urist via GitHub Actions c9545268fa Auto-update submodules
library/xml: master
2021-03-02 07:15:54 +00:00
DFHack-Urist via GitHub Actions ed3f11a31d Auto-update submodules
library/xml: master
2021-03-01 07:15:58 +00:00
DFHack-Urist via GitHub Actions 3185d4d6cc Auto-update submodules
library/xml: master
2021-02-28 07:15:33 +00:00
DFHack-Urist via GitHub Actions 5affbce13b Auto-update submodules
library/xml: master
2021-02-27 07:15:42 +00:00
lethosor cb9ed4ff0c
Merge remote-tracking branch 'myk002/myk_manipulator' into develop
Conflicts:
	docs/changelog.txt
2021-02-25 00:39:01 -05:00
DFHack-Urist via GitHub Actions 29db977bc7 Auto-update submodules
library/xml: master
scripts: master
2021-02-23 07:15:29 +00:00
Ben Lubar f3dd38a038
update structures 2021-02-18 18:18:34 -06:00
myk002 9e17bc938c
only set labor validity for the player civ 2021-02-17 09:16:49 -08:00
Ben Lubar 416fc32cb2
update scripts and structures 2021-02-15 11:49:34 -06:00
Ben Lubar ef1ac6ff40
update structures 2021-02-13 16:23:01 -06:00
myk002 55743fc43f
Merge remote-tracking branch 'upstream/develop' into myk_manipulator 2021-02-13 07:16:58 -08:00
lethosor 49b6e814db
Bump to beta1, update submodules 2021-02-10 21:08:45 -05:00
Ben Lubar a051077820
update structures 2021-02-10 18:54:12 -06:00
lethosor 625380a30b
Update submodules 2021-02-09 00:11:59 -05:00
myk002 6819ee9928
make alchemist flag valid for controllable civs 2021-02-05 16:45:39 -08:00
lethosor 06cd0c8437
Make libz.dylib optional on macOS
Thurin reports that the path specified does not exist on macOS 11.2, and DFHack links successfully without it.

CMake output from the find_package(ZLib) call in /CMakeLists.txt:
Found ZLIB: /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk/usr/lib/libz.tbd (found suitable version "1.2.11", minimum required is "1.1.2")
2021-02-01 23:23:19 -05:00
lethosor 353b8b71f5
Update xml 2021-01-31 13:24:21 -05:00
lethosor 233925ec75
Bump to 0.47.05-alpha0, update xml 2021-01-31 12:10:00 -05:00
lethosor 7e12f3fd3d
Fix off-by-one, adjust changelog, move scroll keys to consistent place
Ref #1748
2021-01-30 19:40:15 -05:00
lethosor 8967e98a33
Merge remote-tracking branch 'myk002/myk_scrollable_labels' into develop 2021-01-30 19:33:04 -05:00
lethosor 813a353ec2
Update xml 2021-01-30 18:08:32 -05:00
lethosor 4126585573
Merge remote-tracking branch 'lethosor/lua-runcommand' into develop 2021-01-29 20:27:38 -05:00
lethosor de6f9183fd
Fix changelog, replace a couple qerror calls with error
Ref #1746
2021-01-29 00:04:10 -05:00
lethosor d4aef78b26
Merge remote-tracking branch 'myk002/myk_getopt' into develop 2021-01-28 23:58:45 -05:00
myk002 32a0363f31
move identity check up a bit to avoid useless work 2021-01-24 08:57:56 -08:00
myk002 03719f58df
avoid infinite parentage when linking rooms 2021-01-24 08:52:34 -08:00
myk002 5a2181d55e
don't render overflow text 2021-01-13 22:02:22 -08:00