Commit Graph

14707 Commits (29f99733fe67b12facd4f10997c0b08f8b8cef16)
 

Author SHA1 Message Date
Tachytaenius a9ab415ac7 Clean merge heckery and clean up label reference 2022-06-21 15:20:49 +01:00
Tachytaenius 41526f376d Fix wrong - length 2022-06-21 13:02:10 +01:00
Tachytaenius 6f2998d7e5
Update docs/guides/modding-guide.rst
Co-authored-by: Myk <myk002@yahoo.com>
2022-06-21 12:58:40 +01:00
Tachytaenius 52161df428
Update docs/guides/modding-guide.rst
Co-authored-by: Myk <myk002@yahoo.com>
2022-06-21 12:58:36 +01:00
Tachytaenius 92ab6b1052
Update docs/guides/modding-guide.rst
Co-authored-by: Myk <myk002@yahoo.com>
2022-06-21 12:58:29 +01:00
Tachytaenius 88a9755d78
Update docs/guides/modding-guide.rst
Co-authored-by: Myk <myk002@yahoo.com>
2022-06-21 12:54:45 +01:00
Tachytaenius 4c2a533de0 Remove "added anchor" from changelog 2022-06-21 12:54:28 +01:00
Tachytaenius ccee6ba487 Added link to modding guide from changelog 2022-06-21 12:53:59 +01:00
Tachytaenius a880a2b92d Move changelog entries to proper place 2022-06-21 12:48:28 +01:00
quarque2 f33c9bc881
Update tile-material.lua (#2218)
* Update tile-material.lua

* Update changelog.txt

* Update changelog.txt

* Update changelog.txt

* Update tile-material.lua
2022-06-20 12:38:37 -07:00
Tachytaenius 063e4897a8 Forgot to stage a change 2022-06-20 20:31:19 +01:00
Tachytaenius 0ae8a42080 Unfinished modding guide 2022-06-20 20:07:07 +01:00
myk002 88ae50b9ae
update version and changelog to 0.47.05-r6 2022-06-17 15:42:23 -07:00
Myk b361a66a52
ensure our docs build cleanly with sphinx-5 (#2193)
* ensure our docs build cleanly with sphinx-5

* adapt to the API change in sphinx 5

while keeping compatibility with <5

* get rid of the extra colons in field lists
2022-06-17 09:35:31 -07:00
Josh Cooper d38ab1d152
Fix UNIT_NEW_ACTIVE events (#2197)
* Updates eventful.lua to use UNIT_NEW_ACTIVE

* Fixes bug #2189

* Revises activeUnits declaration/initialization

* Fixes build error

* Update changelog.txt

* reword changelog entry

* add changelog entry for event name change

Co-authored-by: Myk <myk002@yahoo.com>
2022-06-17 09:34:41 -07:00
Rafał ae5b00523e
Add myself to Authors.rst (#2208)
As suggested in: https://github.com/DFHack/scripts/pull/404#issuecomment-1152780958
2022-06-14 00:35:59 -04:00
Warmist fc384fd1a2
Update eventful.lua (#2203)
* Update eventful.lua

Had wrong function. Fixes https://github.com/DFHack/dfhack/issues/2202

* Update Lua API.rst

Update docs to add onReactionCompleting and remove outdated info

* Update Lua API.rst

Some more minor doc fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add changelog entry

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2022-06-12 07:12:49 -07:00
Timur Kelman 1a629a26bf
add `ItemTraitsDialog` to materials.lua (#2199)
* add `ItemTraitDialog` to materials.lua

* rename `ItemTraitDialog` to `ItemTraitsDialog` (plural)

* Update changelog.txt
2022-06-12 07:03:04 -07:00
Myk 85d7489b3c
ensure refs are cleaned up when we remove a job (#2184)
* ensure job items are disassociated from the job

when the job is removed. the new df-provided ``cancel_job()`` doesn't do
this for us whereas the old custom implementation did.
ref: #2028

* remove trailing whitespace

* Clean up general refs before removing job

Because the game method doesn't do it itself

* Fix typo in var name

* clean up code

* update changelog
2022-06-11 07:38:22 -07:00
DFHack-Urist via GitHub Actions 98112050c3 Auto-update submodules
scripts: master
2022-06-11 07:16:22 +00:00
myk002 4de5b89fa3
don't try to build up stairs on flat ground 2022-06-10 15:59:19 -07:00
DFHack-Urist via GitHub Actions d846a1c93f Auto-update submodules
scripts: master
depends/xlsxio: dfhack
2022-06-10 22:48:30 +00:00
myk002 1f38936723 don't create the unused manipulator/ directory 2022-06-10 15:36:16 -07:00
Myk d12134d326
check for files, not md5 receipt in download-df.sh (#2196) 2022-06-09 11:21:14 -07:00
lethosor 92cd9ef350
Merge remote-tracking branch 'lethosor/gha-ubuntu-gcc-upgrade' into develop 2022-06-09 01:40:39 -04:00
lethosor 078256cc2a
Remove GCC 11 from build matrix 2022-06-09 01:35:55 -04:00
lethosor fbdeba6216
Force consistent ccache cache directory
This changed to use ~/.cache/ccache instead of ~/.ccache in ccache 4.

Squashed: fixed to expand `$HOME` in a shell, because `~` in an `env:` block
does not get expanded.
2022-06-09 01:34:54 -04:00
lethosor b3618810c3
Add ccache stats to build output 2022-06-09 01:24:35 -04:00
lethosor e3f617d98e
build.yml: Force CMake to use ccache
CMake in the Ubuntu 22.04 environment doesn't seem to pick up on ccache
implicitly anymore.
2022-06-09 01:24:34 -04:00
lethosor 3f6b30af15
Update stonesense 2022-06-09 01:24:30 -04:00
Myk 4152be13c7
Simplify bug extlink 2022-06-08 19:02:58 -07:00
lethosor 698dc56222
GitHub Actions: Upgrade newest matrix entry to Ubuntu 22.04, GCC 12 2022-06-08 21:41:09 -04:00
myk002 ff373bb9e2 use extlinks where appropriate in docs 2022-06-08 16:53:46 -07:00
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
Ryan Williams 46438a2af3
Merge branch 'DFHack:develop' into Bumber64-patch-2 2022-06-07 04:21:56 -07:00
Ryan Williams a7267e3c4e
Optimize report deletion 2022-06-07 04:21:48 -07: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
Ryan Williams 5d08e5ae67
More constants; remove extra "using" statements 2022-06-06 01:56:11 -07:00