chiark / gitweb /
otter.git
4 years agoRevert "add links to game state"
Ian Jackson [Sun, 3 Jan 2021 01:00:38 +0000 (01:00 +0000)]
Revert "add links to game state"

This reverts commit 8ea776a18e7e54191a4b10590f4525de12f7d408.

4 years agoadd links to game state
Ian Jackson [Sun, 3 Jan 2021 00:59:28 +0000 (00:59 +0000)]
add links to game state

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agomake ships flippable
Ian Jackson [Sun, 3 Jan 2021 00:46:22 +0000 (00:46 +0000)]
make ships flippable

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoAvoid need for bundled-sources
Ian Jackson [Sat, 2 Jan 2021 03:32:54 +0000 (03:32 +0000)]
Avoid need for bundled-sources

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agofix blocking bug
Ian Jackson [Sat, 2 Jan 2021 03:27:24 +0000 (03:27 +0000)]
fix blocking bug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocument tests
Ian Jackson [Sat, 2 Jan 2021 02:56:55 +0000 (02:56 +0000)]
document tests

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotests wired up to makefile
Ian Jackson [Sat, 2 Jan 2021 02:50:00 +0000 (02:50 +0000)]
tests wired up to makefile

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoit runs a test!
Ian Jackson [Sat, 2 Jan 2021 02:20:39 +0000 (02:20 +0000)]
it runs a test!

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoit updated a piece!
Ian Jackson [Sat, 2 Jan 2021 02:10:40 +0000 (02:10 +0000)]
it updated a piece!

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agocoords doesn't work yet
Ian Jackson [Sat, 2 Jan 2021 02:09:20 +0000 (02:09 +0000)]
coords doesn't work yet

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip coords matrix
Ian Jackson [Sat, 2 Jan 2021 01:53:36 +0000 (01:53 +0000)]
wip coords matrix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip coords matrix
Ian Jackson [Sat, 2 Jan 2021 01:16:33 +0000 (01:16 +0000)]
wip coords matrix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip coords matrix
Ian Jackson [Sat, 2 Jan 2021 01:13:32 +0000 (01:13 +0000)]
wip coords matrix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip coords matrix
Ian Jackson [Sat, 2 Jan 2021 00:47:42 +0000 (00:47 +0000)]
wip coords matrix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip coords matrix
Ian Jackson [Sat, 2 Jan 2021 00:42:01 +0000 (00:42 +0000)]
wip coords matrix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip pos thing
Ian Jackson [Thu, 31 Dec 2020 00:55:13 +0000 (00:55 +0000)]
wip pos thing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip pos thing
Ian Jackson [Thu, 31 Dec 2020 00:51:56 +0000 (00:51 +0000)]
wip pos thing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip pos thing
Ian Jackson [Thu, 31 Dec 2020 00:39:58 +0000 (00:39 +0000)]
wip pos thing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocument geckodriver stuff
Ian Jackson [Thu, 31 Dec 2020 00:08:39 +0000 (00:08 +0000)]
document geckodriver stuff

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodebugging to prove rectangle manglement bug
Ian Jackson [Wed, 30 Dec 2020 23:54:35 +0000 (23:54 +0000)]
debugging to prove rectangle manglement bug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agothis shows that webdriver is stabbing in wrong place
Ian Jackson [Wed, 30 Dec 2020 13:06:03 +0000 (13:06 +0000)]
this shows that webdriver is stabbing in wrong place

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agofix log capture
Ian Jackson [Wed, 30 Dec 2020 12:58:42 +0000 (12:58 +0000)]
fix log capture

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodrag claims to work but problems with log capture
Ian Jackson [Wed, 30 Dec 2020 12:50:36 +0000 (12:50 +0000)]
drag claims to work but problems with log capture

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoeasier to reuse stuff from formal tests
Ian Jackson [Wed, 30 Dec 2020 12:33:22 +0000 (12:33 +0000)]
easier to reuse stuff from formal tests

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoit compiles again yay
Ian Jackson [Wed, 30 Dec 2020 12:15:36 +0000 (12:15 +0000)]
it compiles again yay

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoRevert "attempt to split up OnlineError, wip"
Ian Jackson [Wed, 30 Dec 2020 11:49:04 +0000 (11:49 +0000)]
Revert "attempt to split up OnlineError, wip"

This reverts commit 52e8f7c84a7838d919e9cae37f52975bbd767851.

4 years agoattempt to split up OnlineError, wip
Ian Jackson [Wed, 30 Dec 2020 11:44:00 +0000 (11:44 +0000)]
attempt to split up OnlineError, wip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobefore split up OnlineError for trait coherence
Ian Jackson [Wed, 30 Dec 2020 11:39:43 +0000 (11:39 +0000)]
before split up OnlineError for trait coherence

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip untangle
Ian Jackson [Wed, 30 Dec 2020 11:11:25 +0000 (11:11 +0000)]
wip untangle

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agomake it build again
Ian Jackson [Wed, 30 Dec 2020 10:35:44 +0000 (10:35 +0000)]
make it build again

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobreak out otter-daemon into own crate
Ian Jackson [Sat, 28 Nov 2020 00:14:32 +0000 (00:14 +0000)]
break out otter-daemon into own crate

Re-apply 1d4f8f10aaeb9f613688285cd8600646b19d2faf

This time we are going to try just moving bits that use Rocket.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip testing tidy
Ian Jackson [Wed, 30 Dec 2020 01:16:58 +0000 (01:16 +0000)]
wip testing tidy

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosynch works
Ian Jackson [Wed, 30 Dec 2020 01:07:51 +0000 (01:07 +0000)]
synch works

OTTER_WDT_LOG=otter_webdriver_tests=trace CARGO_MANIFEST_DIR=~ian/Rustup/Game/server time target/debug/wdt-simple --geckodriver-args=

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agouse window global
Ian Jackson [Wed, 30 Dec 2020 01:06:31 +0000 (01:06 +0000)]
use window global

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip await gen
Ian Jackson [Tue, 29 Dec 2020 23:56:59 +0000 (23:56 +0000)]
wip await gen

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip await gen
Ian Jackson [Tue, 29 Dec 2020 23:56:21 +0000 (23:56 +0000)]
wip await gen

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip await gen
Ian Jackson [Tue, 29 Dec 2020 23:56:07 +0000 (23:56 +0000)]
wip await gen

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip await gen
Ian Jackson [Tue, 29 Dec 2020 23:38:29 +0000 (23:38 +0000)]
wip await gen

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agogen_update_hook
Ian Jackson [Tue, 29 Dec 2020 22:59:34 +0000 (22:59 +0000)]
gen_update_hook

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotype of Generation
Ian Jackson [Tue, 29 Dec 2020 03:12:56 +0000 (03:12 +0000)]
type of Generation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosplurge less junk to log
Ian Jackson [Tue, 29 Dec 2020 02:36:15 +0000 (02:36 +0000)]
splurge less junk to log

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoplumb log through, it works now really
Ian Jackson [Tue, 29 Dec 2020 02:31:50 +0000 (02:31 +0000)]
plumb log through, it works now really

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoplumb log through, it works now!
Ian Jackson [Tue, 29 Dec 2020 02:10:20 +0000 (02:10 +0000)]
plumb log through, it works now!

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodebug template injection
Ian Jackson [Tue, 29 Dec 2020 02:05:47 +0000 (02:05 +0000)]
debug template injection

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodebug template injection
Ian Jackson [Tue, 29 Dec 2020 02:05:04 +0000 (02:05 +0000)]
debug template injection

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoformat log better
Ian Jackson [Tue, 29 Dec 2020 01:21:51 +0000 (01:21 +0000)]
format log better

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agofetch_log
Ian Jackson [Tue, 29 Dec 2020 01:14:26 +0000 (01:14 +0000)]
fetch_log

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip console logging
Ian Jackson [Tue, 29 Dec 2020 01:05:11 +0000 (01:05 +0000)]
wip console logging

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip console logging
Ian Jackson [Tue, 29 Dec 2020 00:42:19 +0000 (00:42 +0000)]
wip console logging

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip random flail
Ian Jackson [Tue, 29 Dec 2020 00:12:24 +0000 (00:12 +0000)]
wip random flail

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoproduces some kind of Xul error but none of my script's output
Ian Jackson [Tue, 29 Dec 2020 00:01:58 +0000 (00:01 +0000)]
produces some kind of Xul error but none of my script's output

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotrying to get console log output somewhere (!)
Ian Jackson [Mon, 28 Dec 2020 23:58:41 +0000 (23:58 +0000)]
trying to get console log output somewhere (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agogeckodriver args
Ian Jackson [Mon, 28 Dec 2020 23:41:50 +0000 (23:41 +0000)]
geckodriver args

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agologging etc.
Ian Jackson [Mon, 28 Dec 2020 23:39:18 +0000 (23:39 +0000)]
logging etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip synch
Ian Jackson [Mon, 28 Dec 2020 23:00:55 +0000 (23:00 +0000)]
wip synch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip synch etc.
Ian Jackson [Mon, 28 Dec 2020 22:58:05 +0000 (22:58 +0000)]
wip synch etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip otter cmd debug
Ian Jackson [Mon, 28 Dec 2020 22:54:46 +0000 (22:54 +0000)]
wip otter cmd debug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip instances etc.
Ian Jackson [Mon, 28 Dec 2020 22:44:44 +0000 (22:44 +0000)]
wip instances etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agocargo update
Ian Jackson [Mon, 28 Dec 2020 22:38:28 +0000 (22:38 +0000)]
cargo update

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoget rid of spurious &
Ian Jackson [Mon, 28 Dec 2020 19:45:38 +0000 (19:45 +0000)]
get rid of spurious &

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoreduce monomorphisation
Ian Jackson [Mon, 28 Dec 2020 19:44:29 +0000 (19:44 +0000)]
reduce monomorphisation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agomake subst more generic
Ian Jackson [Mon, 28 Dec 2020 19:34:04 +0000 (19:34 +0000)]
make subst more generic

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agorustc panics, probably due to syntax error
Ian Jackson [Mon, 28 Dec 2020 18:15:42 +0000 (18:15 +0000)]
rustc panics, probably due to syntax error

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoMake connection to server
Ian Jackson [Mon, 28 Dec 2020 18:12:51 +0000 (18:12 +0000)]
Make connection to server

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agomove cmd into mgmtchannel
Ian Jackson [Mon, 28 Dec 2020 17:58:08 +0000 (17:58 +0000)]
move cmd into mgmtchannel

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agomove MgmtChannel::connect to mgmtchannel.rs
Ian Jackson [Mon, 28 Dec 2020 17:52:42 +0000 (17:52 +0000)]
move MgmtChannel::connect to mgmtchannel.rs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip synch
Ian Jackson [Mon, 28 Dec 2020 17:47:25 +0000 (17:47 +0000)]
wip synch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoset timeouts
Ian Jackson [Mon, 28 Dec 2020 17:29:39 +0000 (17:29 +0000)]
set timeouts

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoadjust demo spec to fit on test server screen
Ian Jackson [Mon, 28 Dec 2020 17:01:02 +0000 (17:01 +0000)]
adjust demo spec to fit on test server screen

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoscreenshots
Ian Jackson [Mon, 28 Dec 2020 16:59:00 +0000 (16:59 +0000)]
screenshots

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip screenshots etc.
Ian Jackson [Mon, 28 Dec 2020 16:43:53 +0000 (16:43 +0000)]
wip screenshots etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agochange check_window_name
Ian Jackson [Mon, 28 Dec 2020 11:58:41 +0000 (11:58 +0000)]
change check_window_name

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoloads url in other window yay
Ian Jackson [Mon, 28 Dec 2020 01:42:17 +0000 (01:42 +0000)]
loads url in other window yay

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobefore make Window not borrow Setup
Ian Jackson [Mon, 28 Dec 2020 00:42:15 +0000 (00:42 +0000)]
before make Window not borrow Setup

We want to borrow it mut so screenshot works
We need to not borrow it mut so you can have many windows

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip windows
Ian Jackson [Mon, 28 Dec 2020 00:32:16 +0000 (00:32 +0000)]
wip windows

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip FnMut thing
Ian Jackson [Sun, 27 Dec 2020 19:06:13 +0000 (19:06 +0000)]
wip FnMut thing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoadd parking_lot
Ian Jackson [Sun, 27 Dec 2020 18:45:36 +0000 (18:45 +0000)]
add parking_lot

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoseems to add players
Ian Jackson [Sun, 27 Dec 2020 01:36:19 +0000 (01:36 +0000)]
seems to add players

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubst more wip
Ian Jackson [Sat, 26 Dec 2020 20:31:43 +0000 (20:31 +0000)]
subst more wip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubst more
Ian Jackson [Sat, 26 Dec 2020 17:31:50 +0000 (17:31 +0000)]
subst more

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip subst more
Ian Jackson [Sat, 26 Dec 2020 17:19:45 +0000 (17:19 +0000)]
wip subst more

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoruns otter to create table
Ian Jackson [Sat, 26 Dec 2020 12:26:53 +0000 (12:26 +0000)]
runs otter to create table

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoscreenshotting etc.
Ian Jackson [Sat, 26 Dec 2020 11:31:28 +0000 (11:31 +0000)]
screenshotting etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoarrange to split log_config from config
Ian Jackson [Fri, 25 Dec 2020 18:05:13 +0000 (18:05 +0000)]
arrange to split log_config from config

Mostly to make debug better

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip sort out test case config
Ian Jackson [Fri, 25 Dec 2020 17:50:20 +0000 (17:50 +0000)]
wip sort out test case config

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip prepare game
Ian Jackson [Thu, 24 Dec 2020 22:01:47 +0000 (22:01 +0000)]
wip prepare game

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodebug from wdt exe
Ian Jackson [Thu, 24 Dec 2020 01:28:39 +0000 (01:28 +0000)]
debug from wdt exe

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agouse logging
Ian Jackson [Thu, 24 Dec 2020 01:27:30 +0000 (01:27 +0000)]
use logging

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agologging
Ian Jackson [Thu, 24 Dec 2020 01:24:25 +0000 (01:24 +0000)]
logging

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agojust_warn
Ian Jackson [Thu, 24 Dec 2020 01:05:11 +0000 (01:05 +0000)]
just_warn

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip actually show a thing
Ian Jackson [Wed, 23 Dec 2020 18:32:38 +0000 (18:32 +0000)]
wip actually show a thing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agostartup protocol
Ian Jackson [Wed, 23 Dec 2020 18:26:53 +0000 (18:26 +0000)]
startup protocol

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip startup protocol
Ian Jackson [Wed, 23 Dec 2020 18:21:21 +0000 (18:21 +0000)]
wip startup protocol

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agouse structopt for server args
Ian Jackson [Wed, 23 Dec 2020 18:12:56 +0000 (18:12 +0000)]
use structopt for server args

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoclarify messages
Ian Jackson [Wed, 23 Dec 2020 15:30:41 +0000 (15:30 +0000)]
clarify messages

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agonow our test daemon-otter starts up
Ian Jackson [Wed, 23 Dec 2020 15:26:21 +0000 (15:26 +0000)]
now our test daemon-otter starts up

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agowip dir handling
Ian Jackson [Wed, 23 Dec 2020 15:18:13 +0000 (15:18 +0000)]
wip dir handling

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoshow completions
Ian Jackson [Wed, 23 Dec 2020 14:47:43 +0000 (14:47 +0000)]
show completions

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosort out pausing
Ian Jackson [Wed, 23 Dec 2020 14:39:16 +0000 (14:39 +0000)]
sort out pausing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosort out env some more, etc.
Ian Jackson [Wed, 23 Dec 2020 14:29:22 +0000 (14:29 +0000)]
sort out env some more, etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>