chiark / gitweb /
Ian Jackson [Fri, 9 Jul 2021 11:05:13 +0000 (12:05 +0100)]
jstest: lower: Note checks we want to make
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 11:04:54 +0000 (12:04 +0100)]
jstest: lower: make targets be vpid
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 00:38:38 +0000 (01:38 +0100)]
jstest: lower: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 00:26:36 +0000 (01:26 +0100)]
jstest: Change type of piece id
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Jul 2021 00:23:25 +0000 (01:23 +0100)]
jstest: Tidy formatting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 20:16:52 +0000 (21:16 +0100)]
jstest: Programattically generate a test csase, wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 20:03:34 +0000 (21:03 +0100)]
jat-lower: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 19:40:16 +0000 (20:40 +0100)]
jstest: Provide for wrapping
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 19:32:34 +0000 (20:32 +0100)]
jstest: Introduce Rust helper code
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 19:32:11 +0000 (20:32 +0100)]
script: Remove a spurious HTML comment end marker
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 19:31:57 +0000 (20:31 +0100)]
jstest: add missing copyright blocks
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 18:51:08 +0000 (19:51 +0100)]
jstest: loower: skeleton/example
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 18:50:44 +0000 (19:50 +0100)]
jstest: run1: make expected output optional
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 18:26:22 +0000 (19:26 +0100)]
jstest: run1: show whole console log output on failures
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 18:14:25 +0000 (19:14 +0100)]
jstest: wip lower test, currently just a skeleton
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:39:44 +0000 (13:39 +0100)]
Makefile: touch the otter cli when we rebuild it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:39:30 +0000 (13:39 +0100)]
jstest: Rename the one test we have so far, again
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:38:50 +0000 (13:38 +0100)]
jstest: Rename the one test we have so far
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:33:56 +0000 (13:33 +0100)]
jstest: expected output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:29:39 +0000 (13:29 +0100)]
jstest: prep for multiple tests
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:25:43 +0000 (13:25 +0100)]
jstest: prep for multiple tests
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:19:46 +0000 (13:19 +0100)]
jstest: Include script plumbing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:13:47 +0000 (13:13 +0100)]
jstest: Drop some now-superseded wip note comments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:09:38 +0000 (13:09 +0100)]
jstest: Add emacs mode comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:12:53 +0000 (13:12 +0100)]
jstest: wire up to check target
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:09:26 +0000 (13:09 +0100)]
Makefile: jstest can run from Makefile
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 8 Jul 2021 12:05:44 +0000 (13:05 +0100)]
Makefile: move --no-modules out of WASM_BINDGEN_OPTIONS
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Jul 2021 23:32:54 +0000 (00:32 +0100)]
jstest: wip, it runs, with the runes in the comments, as a bodge
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Jul 2021 22:58:00 +0000 (23:58 +0100)]
jstest: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 7 Jul 2021 17:26:56 +0000 (18:26 +0100)]
vatikan: Make green and purple hands bigger
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:57:05 +0000 (01:57 +0100)]
script: raise: log a message when nothing oculd be raised
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:42:37 +0000 (01:42 +0100)]
script: bind 't' to new explicit raise feature
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:42:33 +0000 (01:42 +0100)]
script: Break out piece_raise
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:39:05 +0000 (01:39 +0100)]
script: break out piece_moveable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:32:32 +0000 (01:32 +0100)]
script: section boundary for lowering code
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 21:00:45 +0000 (22:00 +0100)]
script: Do not re-raise things that were explicitly lowered
This fixes an annoying UI issue where if you would lower a thing while
dragging it, the auto-raie on release would still happen, re-raising
it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 20:47:35 +0000 (21:47 +0100)]
script: Change held_us_raising to its own type
We're going to fix the raise-after-lower bug in a moment.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:58:29 +0000 (20:58 +0100)]
script: dragging: Make this hex
In case we every want to add more. (We don't right now, it turns
out.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:55:54 +0000 (20:55 +0100)]
hand: Show count of items occulted
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:55:38 +0000 (20:55 +0100)]
ui: break out occultation_notify_update_image
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:53:28 +0000 (20:53 +0100)]
deck: Make count use a monospaced font
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:50:15 +0000 (20:50 +0100)]
ui: break out monospace_font
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 19:50:01 +0000 (20:50 +0100)]
demo game: Add a label to the test hand
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 22:23:58 +0000 (23:23 +0100)]
script: Make non-moveable pieces bottom, when lowerint
This avoids lowering pieces below the hand they are in, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 22:17:17 +0000 (23:17 +0100)]
script: When lowering, avoid raising
It can happen that the z of the piece which sets the z_top for the end
of the plan (with z_bot == null) will cause the first lowered piece to
actually be raised.
This is particularly troublesome if the piece is an occulting one,
which the server will not allowe to be raised.
Handle this case specially: if necessary, set the z_top to top piece
of that plan entry.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 5 Jul 2021 22:09:42 +0000 (23:09 +0100)]
api: Allow setz to strictly lower an occulter
This will be useful for various things, including in particular
recovering from things stuck under occulters, and making the UI "b"
work properly.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:20:36 +0000 (01:20 +0100)]
script: Remove a redundant semicolon
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:09:49 +0000 (01:09 +0100)]
script: New "bottom" concept name replaces "pinned" for lowering
Currently the implementation is the same, so this is just a slightly
selective search and replace of "pinned" to "bottom".
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:02:15 +0000 (01:02 +0100)]
script: Consistently use lower_treat_pinned
PieceInfo.pinned is not the same, and the algorithm needs a coherent
idea of what counts.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 6 Jul 2021 00:03:20 +0000 (01:03 +0100)]
promote and rename lower_treat_pinned
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 13 Jun 2021 14:24:57 +0000 (15:24 +0100)]
tera: Drop direct dependency on tera
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 13 Jun 2021 14:23:34 +0000 (15:23 +0100)]
tera: Make nwtemplates use tera_standalone
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 17:25:50 +0000 (18:25 +0100)]
CHANGELOG: Document changes in 0.7.1
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 17:20:57 +0000 (18:20 +0100)]
cargo deps: Update to usvg 0.14 and adjust all command lines
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 17:04:49 +0000 (18:04 +0100)]
cargo deps: Update to nix 0.21
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 17:02:33 +0000 (18:02 +0100)]
cargo deps: Update to strum 0.21
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:53:51 +0000 (17:53 +0100)]
docs: build.rst: Document tested version of Nightly Rust, actually
IDK why the dates disagree, but they do.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:50:14 +0000 (17:50 +0100)]
docs: build.rst: Document tested version of Nightly Rust
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:49:54 +0000 (17:49 +0100)]
make-release: Add compiler compat to release checklist
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:49:37 +0000 (17:49 +0100)]
Cargo.toml: Update all versions to 0.7.1
Commit made automatically by update-versions.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:47:46 +0000 (17:47 +0100)]
docs: build.rst: Section for how to build just the cli
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:44:52 +0000 (17:44 +0100)]
docs: build.rst: Mention that you don't need wdriver for just cli
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 21:51:45 +0000 (22:51 +0100)]
make-release: Get rid of a spurious \n
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 10 Jun 2021 12:46:17 +0000 (13:46 +0100)]
docs: Refer to new sphinx docs, not gone shapelib toml rustdoc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 17:46:45 +0000 (18:46 +0100)]
docs: Forgo documenting otter-cli's dependencies
Unfortunately we can't seem to currently do this because of
https://github.com/rust-lang/rust/issues/86173
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 9 Jun 2021 16:12:25 +0000 (17:12 +0100)]
cargo update
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 18:14:33 +0000 (19:14 +0100)]
CHANGELOG: Document changes in 0.7.0
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 18:55:16 +0000 (19:55 +0100)]
chiark example config: Show the ssh_proxy_command config setting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 19:09:33 +0000 (20:09 +0100)]
Makefile: deploy: Copy otter-ssh-proxy to deploy host too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 19:06:06 +0000 (20:06 +0100)]
sshkeys: Provide SshReinstallKeys command
No corresponding cli subcommand - just use command-ron.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 18:55:42 +0000 (19:55 +0100)]
ssh: Make ssh_restrictions configurable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 18:09:25 +0000 (19:09 +0100)]
otter cli: Add --no-prefs option
This saves the user using --prefs /dev/null.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 17:31:24 +0000 (18:31 +0100)]
Cargo.toml: Update all versions to 0.7.0
Commit made automatically by update-versions.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 17:30:45 +0000 (18:30 +0100)]
make-release: Add a release process checklist
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 17:24:06 +0000 (18:24 +0100)]
make-release: Poll crates.io in the hope of making release reliable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 17:21:33 +0000 (18:21 +0100)]
make-release: Set pipefail
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:52:22 +0000 (13:52 +0100)]
Revert "penultima: Add colourful fairy chess pieces, for revert"
This reverts commit
277d94410024a1ccd8364ce888b5f44306ef5179.
Ian Jackson [Tue, 8 Jun 2021 12:52:07 +0000 (13:52 +0100)]
penultima: Add colourful fairy chess pieces, for revert
This is very cluttered.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:41:05 +0000 (13:41 +0100)]
penultima: Add colourful pawns
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:37:49 +0000 (13:37 +0100)]
penultima: Prep for more colourful things
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:34:09 +0000 (13:34 +0100)]
penultima: loopify colours
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:25:47 +0000 (13:25 +0100)]
penultima: macroify colours
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:20:50 +0000 (13:20 +0100)]
penultima: add more spare pawns
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:19:38 +0000 (13:19 +0100)]
penultima: add some comments to help navigation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:16:09 +0000 (13:16 +0100)]
penultima: use tera for for player label sets
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:14:38 +0000 (13:14 +0100)]
penultima: use count for player labels (2)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:14:04 +0000 (13:14 +0100)]
penultima: use count for player labels (1)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:08:34 +0000 (13:08 +0100)]
penultima: macros, officers and fairy chess pieces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:04:24 +0000 (13:04 +0100)]
mao: Add some delimiters etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:04:13 +0000 (13:04 +0100)]
mao: Use decks variable for jokers too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 12:02:19 +0000 (13:02 +0100)]
mao: Introduce some_cards macro
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:59:00 +0000 (12:59 +0100)]
mao: Use new "decks" variable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:57:40 +0000 (12:57 +0100)]
mao: Use "suits" variable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:51:48 +0000 (12:51 +0100)]
mao: Use macro for main decks of 52
This changes the order: now it's CDHS CDHS CDHS J9 rather than
CCC DDD HHH SSS J9 (bottom to top)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:40:26 +0000 (12:40 +0100)]
mao: rename deckplace
We're going to want deck52 for a deck of cards, too.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:36:52 +0000 (12:36 +0100)]
mao: change deck stacking order
Put the jokers on top. That makes it easy to show them and also to
remove them if desired.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:33:49 +0000 (12:33 +0100)]
mao: Use macros for deck
No functional change, verified with
target/debug/otter -vv --account server: --config tmp/at-otter/server-config.toml -g server::dummy reset ~ian/Rustup/Game/server/specs/mao.game.toml | sed -n 's/^spec out [0-9][0-9]* //p' >t
and same for u with modified mao.game.toml and then
diff -Bu [tu] |less
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:33:27 +0000 (12:33 +0100)]
mao: Remove some now-extraneous whitespace
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:23:45 +0000 (12:23 +0100)]
otter cli: reset -vv templating output goes to stdout
There's no other use for stdout here.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 8 Jun 2021 11:21:58 +0000 (12:21 +0100)]
specs docs: Improvements
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log