Commit Graph

13644 Commits (6b7c90b676ec51001a59da1388e3fa8e35ca52bf)
 

Author SHA1 Message Date
myk002 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
myk002 1b426efdb9 reduce spurious warnings from libzip 2022-05-13 14:36:22 -07:00
Myk 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
DFHack-Urist via GitHub Actions 4d08a49afb Auto-update submodules
plugins/isoworld: dfhack
2022-05-12 05:41:20 +00:00
Myk b2aa2a9b31
move isoworld to pull from the new dfhack branch 2022-05-11 22:40:33 -07:00
DFHack-Urist via GitHub Actions 08a39400de Auto-update submodules
depends/jsoncpp-sub: dfhack
2022-05-12 05:33:14 +00:00
DFHack-Urist via GitHub Actions 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
Myk a3a0631c41
fix typo in ci/update-submodules.manifest 2022-05-11 22:18:52 -07:00
myk002 2c6e450ac9 update the list of submodules to autoupdate 2022-05-11 22:14:08 -07:00
lethosor f7a3074204
Merge branch 'fix-script-docs-ext-check' into develop 2022-05-11 13:29:43 -04:00
DFHack-Urist via GitHub Actions baab258774 Auto-update submodules
scripts: master
depends/libzip: dfhack
depends/libexpat: dfhack
depends/xlsxio: dfhack
2022-05-11 07:23:49 +00:00
lethosor 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
myk002 7439678214 tombstone devel/unforbidall script 2022-05-10 15:37:37 -07:00
DFHack-Urist via GitHub Actions 15a11d1a39 Auto-update submodules
library/xml: master
scripts: master
2022-05-10 07:22:46 +00:00
lethosor f9cc79fb8d
pre-commit: decrease autoupdate interval to monthly 2022-05-10 00:57:56 -04:00
lethosor 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
lethosor 947098e564
Merge remote-tracking branch 'softmoth/command-prompt-wrap' into develop 2022-05-09 22:14:31 -04:00
Tim Siegel 5d2739eee0
[command-prompt] word-wrap response text
Fixes #2079
2022-05-09 13:42:16 -04:00
Tim Siegel c3347d465f
[command-prompt] cosmetics: whitespace, sort headers 2022-05-09 13:42:16 -04:00
Tim Siegel 55e4008925
MiscUtils: teach word_wrap() to optionally preserve whitespace 2022-05-09 13:42:11 -04:00
DFHack-Urist via GitHub Actions e95d8c7296 Auto-update submodules
scripts: master
depends/luacov: dfhack
2022-05-09 16:39:47 +00:00
DFHack-Urist via GitHub Actions c44a2cfa6a Auto-update submodules
depends/luacov: dfhack
2022-05-09 07:18:27 +00:00
lethosor a646ed7313
Split configure + build into separate steps for more granular timing 2022-05-08 13:56:09 -04:00
Ryan Williams 14afcc2b0a
Merge branch 'develop' into Bumber64-patch-2 2022-05-05 22:58:23 -07:00
Ryan Williams 018452af82
Update changelog.txt 2022-05-05 22:57:04 -07:00
myk002 585888c2d3
update version, changelog, modules for 0.47.05-r5 2022-05-04 17:21:31 -07:00
DFHack-Urist via GitHub Actions d4ba946d2b Auto-update submodules
library/xml: master
scripts: master
2022-05-03 07:18:10 +00:00
Ryan Williams 74499ad64a
Use to_string on integer 2022-05-03 00:09:34 -07:00
Ryan Williams 704651582b
Merge branch 'develop' into Bumber64-patch-2 2022-05-02 23:54:12 -07:00
Ryan Williams 5be0fe2a44
Fix issues, update changelog and docs
Initialize variables in LuaApi.cpp, solve changelog conflicts, hyperlink and escape char info in docs
2022-05-02 23:52:47 -07:00
Myk 0389637ac8 clean up changelog.txt 2022-05-02 21:54:41 -07:00
Myk 8703eeef91
[dreamfort] pull in changes from Google Drive sources (#2124)
* update dreamfort from online spreadsheets

* add zones for guildhall level
2022-05-02 09:29:02 -07:00
DFHack-Urist via GitHub Actions 2328c530e2 Auto-update submodules
scripts: master
2022-05-02 07:18:18 +00:00
Ryan Williams 621ccef996
Merge branch 'develop' into Bumber64-patch-2 2022-05-01 23:42:21 -07:00
Ryan Williams 038b6f0d86
Fix changelog conflicts 2022-05-01 23:07:52 -07:00
Ryan Williams f565de88e8
Fix stuff (#4)
* Update Lua API.rst

* Update Gui.h

* Update Gui.cpp

* Update LuaApi.cpp
2022-05-01 22:53:53 -07:00
lethosor cc20d9fbb7
Update Authors.rst
Checked as far back as 0.47.04-r1.
Oldest missing was chrismdp from before 0.47.05-r3.
2022-05-01 13:35:30 -04:00
lethosor e077e95f69
Add pre-commit hook to check Authors.rst 2022-05-01 13:23:41 -04:00
Josh Cooper 4439333f58
Adds ccache to build workflow (#2122)
* Adds ccache to build workflow

* Revises ccache actions cache key
2022-05-01 08:55:25 -07:00
DFHack-Urist via GitHub Actions 5f1d2a08e4 Auto-update submodules
library/xml: master
scripts: master
2022-05-01 13:33:50 +00:00
Pierre Lulé 876d9132b1
Add a link to the rust library for interacting with the remote API (#2121)
* Add link to the rust api client library

Add a link to https://docs.rs/dfhack-remote/latest/dfhack_remote/index.html a library interacting with DFHack remote API for the Rust programming language

* Use the docs.rs link

* Fix duplicate link label, included the change in the changelog

Co-authored-by: pierre <pierre>
2022-05-01 06:31:59 -07:00
DFHack-Urist via GitHub Actions 7120988044 Auto-update submodules
library/xml: master
scripts: master
2022-05-01 07:17:58 +00:00
lethosor 88f3627ef4
CI: Pass --color to sphinx 2022-05-01 01:04:59 -04:00
Josh Cooper fe29bff845
Adds cxxrandom unit test and fixes interface problems (#2099)
* Adds cxxrandom unit test and fixes interface problems

* Tightens braces

* Adds detection code for Shuffle's seqID/engID

* Adds usage examples for cxxrandom

* Gives cxxrandom objects id ranges, sort of

* Updates changelog

* Updates changelog.txt

* Increases id space for cxxrandom

* Fixes bool distribution error message and improves check

* Adds comment explaining the seeded RNG tests for cxxrandom

* Fixes type problem for 32bit builds

* Reduces loop count a few magnitudes

* Fixes a mistake in test.cxxrandom_seed
2022-04-30 21:46:47 -07:00
DFHack-Urist via GitHub Actions 9643246b18 Auto-update submodules
library/xml: master
2022-04-30 19:20:07 +00:00
DFHack-Urist via GitHub Actions e9a2de08cd Auto-update submodules
library/xml: master
2022-04-30 07:17:43 +00:00
Myk e2fb15a3a5
add dwarfmode.MenuOverlay:renderMapOverlay() (#2119)
* add dwarfmode.MenuOverlay:renderMapOverlay()

* ensure we move with the viewport when bounds_rect is nil
2022-04-29 20:32:22 -07:00
Myk 24dd4d8ac0
Update init files (#2117)
* update example init files

replace onLoad.init-example with documentation on how to create scripts that run on world/map load
it was confusing to show it being loaded with sc-script since it gets autorun anyway if it is just named properly

* update changelog

* add quickfort keybinding

* move standard tweaks from dreamfort init to main
2022-04-29 20:24:09 -07:00
myk002 e603fee3ce
move sidebar mode management code to init
from onAboutToShow(). this allows the frames to be calculated correctly
during widget instantiation. otherwise widgets can end up with -1 width
2022-04-29 12:10:05 -07:00
myk002 af47434f52
protect against 0 width in string:wrap() 2022-04-29 11:29:19 -07:00