chiark / gitweb /
Ian Jackson [Thu, 1 Apr 2021 09:58:52 +0000 (10:58 +0100)]
Revert "cmd updates: Improve arguments to accumulate"
This is no longer needed, then.
This reverts commit
b2ea5402ca1d60dc2d2249b021e7134ae2acd935.
Ian Jackson [Wed, 31 Mar 2021 18:36:59 +0000 (19:36 +0100)]
Revert "cmd updates: Restart updates when insert follows delete"
This is not sufficient - it happens just too late.
This reverts commit
0dd82eda76f4750e39ca18b586c7f7a1cf8ed9c7.
Ian Jackson [Wed, 31 Mar 2021 18:14:13 +0000 (19:14 +0100)]
cmd updates: Restart updates when insert follows delete
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 18:14:04 +0000 (19:14 +0100)]
cmd updates: Improve arguments to accumulate
We'll need this in a moment.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 17:21:49 +0000 (18:21 +0100)]
cmd updates: In UpdateHandlerBulk, use a HashMap not a SlotMap
Otherwise if a slot gets reused, this can go wrong.
It is easier to do this than think about whether the separation of
inserts from deletes would be sufficient.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 17:08:42 +0000 (18:08 +0100)]
cmd updates: Refactor to make it clearer we don't drop uh
No actual functional change. I suspected a bug here but this wasn't it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 16:51:34 +0000 (17:51 +0100)]
cmd updates: Add some tracing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 16:34:00 +0000 (17:34 +0100)]
cmd updates: Do not restart PreparedUpdates if no actual xupdates
In pravtice, the Delete command would otherwise always restart the
PreparedUpdates and this would defeat the Bulk update and make a game
reset very slow.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 15:02:30 +0000 (16:02 +0100)]
wasm: Provide main window attributes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 11:00:51 +0000 (12:00 +0100)]
table size html attrs: Centralise html attr formatting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 10:53:44 +0000 (11:53 +0100)]
table size html attrs: Split out into base
We are going to want these for dynamic reset.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 14:59:46 +0000 (15:59 +0100)]
cargo: Move `extend` dependency to otter-base
We're going to want this there soon.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 18:23:53 +0000 (19:23 +0100)]
specs: Make `pieces` default
So you can have an empty table, if you want.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 18:23:47 +0000 (19:23 +0100)]
spec: Make table size and colour defaulted in serde
This way `reset` works properly, always resetting the colour to the
default.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 18:22:01 +0000 (19:22 +0100)]
spec: Rename `implementation` module to `imp`
For brevity.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 22:37:45 +0000 (23:37 +0100)]
ReportViaResponse: Provide and use From<IE>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 19:26:04 +0000 (20:26 +0100)]
html: Fix hjoin
Practical effect is to fix the formatting of the Links table.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 20:28:31 +0000 (21:28 +0100)]
penultima: Fiddle with player labels
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 20:25:08 +0000 (21:25 +0100)]
penultima: Add player labels to game spec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 20:25:02 +0000 (21:25 +0100)]
PlayerLabel: fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 23:03:18 +0000 (00:03 +0100)]
wdriver: Increase some debug re gen update
There seems to be some intermittent failure here. Try to get more
info.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 23:00:47 +0000 (00:00 +0100)]
apitest/run1: Fix logfile names
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 20:10:17 +0000 (21:10 +0100)]
PlayerLabel: wip provide
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 20:06:01 +0000 (21:06 +0100)]
hand generalisation: wip use Sort
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 19:49:04 +0000 (20:49 +0100)]
hand generalisation: wip use Sort
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 19:44:53 +0000 (20:44 +0100)]
hand generalisation: wip use Sort
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 19:41:47 +0000 (20:41 +0100)]
hand generalisation: wip use Sort
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 19:04:55 +0000 (20:04 +0100)]
hand generalisation: Introduce Sort
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 09:35:43 +0000 (10:35 +0100)]
clock: Show expired player nick in correct colour
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 09:34:52 +0000 (10:34 +0100)]
Revert "clock: Refactor Show"
We don't actually need this to fix the expired clock nick text,
just to actually put the text colour in!
This reverts commit
b2ddd5e4b16d497623813ffc9e3e4b84baa3565b.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 09:30:59 +0000 (10:30 +0100)]
clock: Refactor Show
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 01:37:34 +0000 (02:37 +0100)]
Use new Html everywhere
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 01:36:35 +0000 (02:36 +0100)]
New Html handling - introduce file
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 21:42:57 +0000 (22:42 +0100)]
item names: Launder OccultIlk too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 21:25:54 +0000 (22:25 +0100)]
item names: Launder properly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 20:48:36 +0000 (21:48 +0100)]
cargo: Add trailing newlines back plus a guard comment
Somehow I seem to keep stripping these and it is annoying. Maybe this
will help make it noticeable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 20:46:14 +0000 (21:46 +0100)]
script: Record a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 20:37:16 +0000 (21:37 +0100)]
shapelib: Make the colour a ColourSpec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 20:34:46 +0000 (21:34 +0100)]
Make UnsupportedColourSpec its own type
We're going to want it for LibraryLoadError too.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 19:44:35 +0000 (20:44 +0100)]
PieceLabel: Properly run through the colour checker
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 00:44:46 +0000 (01:44 +0100)]
pass player nick to client
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 27 Mar 2021 11:39:14 +0000 (11:39 +0000)]
otter cli: list-accounts: Use Display not Debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 27 Mar 2021 11:40:38 +0000 (11:40 +0000)]
otter cli: Provide ListAccounts
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 19:54:39 +0000 (19:54 +0000)]
Fix description of ListGames
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 19:22:37 +0000 (19:22 +0000)]
otter cli: change the meaning of list and list-all
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 27 Mar 2021 11:40:46 +0000 (11:40 +0000)]
global: Unauthorised: Provide lock_even_poisoned
We're going to want this for list-games
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 19:03:35 +0000 (19:03 +0000)]
otter cli: Provide list-pieces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 19:03:25 +0000 (19:03 +0000)]
otter cli: Drop a rogue dbg!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 00:47:58 +0000 (00:47 +0000)]
apitest: try resetting the game after hidden_hand
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 18:51:05 +0000 (18:51 +0000)]
cmdlistener: DeletePiece: Do not delete the ipc right away eitheer
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 18:50:53 +0000 (18:50 +0000)]
cmdlistener: Add a trace dbg
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 18:19:01 +0000 (18:19 +0000)]
hidden: enforce via types that Scrambled is the only view
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 00:47:43 +0000 (00:47 +0000)]
apitest: Provide --specs-dir argument to otter(1) when we run it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 20:17:55 +0000 (20:17 +0000)]
mao: badgers: Make them have backs (pfah, again!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 20:13:31 +0000 (20:13 +0000)]
Makefile: make deploy: Do not push random odd branches
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 19:23:55 +0000 (19:23 +0000)]
piece aliases: Use new alias machiner
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 19:04:03 +0000 (19:04 +0000)]
piece aliases: tolerate missing alias for shapelib backs
We might be running in an environment where the alias is not defined.
Eg, otterlib.
This is a bit nasty really, since it means that broken game specs,
where some of the cards are busted, don't get spotted.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:46:41 +0000 (18:46 +0000)]
piece aliases: Define the new aliases, according to the game spec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:44:05 +0000 (18:44 +0000)]
commands etc.: Delete old aliases when resetting the game
* Make ListPieces return the aliases too (changing its ABI)
* Make list_pieces return the aliases too, so we make sure we
don't miss any
* Actually delete old aliases in the game reset in otter(1)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:34:09 +0000 (18:34 +0000)]
piece aliases: Commands for defining/deleting them
Nothing generates these commands yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 19:16:50 +0000 (19:16 +0000)]
piece aliases: Provide the Alias PieceSpec
You can't use this because nothing every populates the aliaes array.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:25:11 +0000 (18:25 +0000)]
PieceSpec: make count fallible
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:21:15 +0000 (18:21 +0000)]
piece aliases: Pass about everywhere, esp. to PieceSpec methods
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:13:03 +0000 (18:13 +0000)]
piece aliases: Add to Instance
Nothing populates this or looks at it. We just save and restore it.
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 17:18:39 +0000 (17:18 +0000)]
global: Unpack InstanceSaveAccesses with nicer syntax
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 17:16:41 +0000 (17:16 +0000)]
instance save: Make various things non-optional
We recently totally broke savefile compatibility anyway.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 17:01:15 +0000 (17:01 +0000)]
library: add a maroon card back
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 16:52:17 +0000 (16:52 +0000)]
selection display: Totally redo, solid is now normal self
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 16:43:29 +0000 (16:43 +0000)]
script: Show pieces with solid line when over occulted, even moved
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 16:41:18 +0000 (16:41 +0000)]
script: Show pieces with solid line when over occulted
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 16:38:21 +0000 (16:38 +0000)]
script: Do not constantly redisplay_ancillaries when moving (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 16:38:13 +0000 (16:38 +0000)]
script: break out piece_xy
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 14:57:40 +0000 (14:57 +0000)]
script: Track occregions
Nothing uses this yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 14:57:13 +0000 (14:57 +0000)]
wasm: RegionList: Have methods return a `changed` bool
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 14:57:00 +0000 (14:57 +0000)]
geometry: ipl Ord and Eq for Rect
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 13:08:46 +0000 (13:08 +0000)]
Rect[Shape]: rename from Rectangle and from Square
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 12:43:16 +0000 (12:43 +0000)]
geometry: Rename Region::Rectangle to Rect
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 12:31:38 +0000 (12:31 +0000)]
occregion: json-encode it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 12:00:03 +0000 (12:00 +0000)]
geometry: Massive overhaul of types and fields
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 11:10:15 +0000 (11:10 +0000)]
geometry: Some code motion
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 11:09:17 +0000 (11:09 +0000)]
rename Area to Rect
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 11:06:00 +0000 (11:06 +0000)]
rename Region to RegionC, in line with PosC and AreaC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 11:01:18 +0000 (11:01 +0000)]
occregion: Send to client (but this is wrong, it should be json string)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 10:56:11 +0000 (10:56 +0000)]
Refactor PieceOccult to provide active_occ
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 01:43:59 +0000 (01:43 +0000)]
Provide distinction betwene Region and Area
The latter will always be rectangle.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 11:02:48 +0000 (11:02 +0000)]
wasm: Provide RegionList
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 01:16:00 +0000 (01:16 +0000)]
serde_json: Move dependency to base, so it's common
wasm is about to want it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 01:13:09 +0000 (01:13 +0000)]
geometry: Relax Ord to PartialOrd
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 00:37:51 +0000 (00:37 +0000)]
wasm: Sections
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 00:36:02 +0000 (00:36 +0000)]
provide otter_base::Region
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 23:59:34 +0000 (23:59 +0000)]
move geometry to base
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 00:00:54 +0000 (00:00 +0000)]
base: Introduce a prelude module here
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 23:57:08 +0000 (23:57 +0000)]
geometry: Move to new module
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 23:40:07 +0000 (23:40 +0000)]
deck: When Enabled, stack neatly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 20:30:29 +0000 (20:30 +0000)]
deck: Do update count
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 20:29:51 +0000 (20:29 +0000)]
Provide for occultation_notify_hook
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:56:16 +0000 (19:56 +0000)]
updates: Allow ToRecompute to return UnpreparedUpdates
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:31:18 +0000 (19:31 +0000)]
updates: Provide PrepareUpdatesBuffer::spontaneous_image
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:25:52 +0000 (19:25 +0000)]
deck count: Rename ToPermute
We are going to use this to plant our hook
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:15:06 +0000 (19:15 +0000)]
hidden: Provide no-op consistency_check in not(debug_assertions)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log