Eric House
2073098a5e
fix crash: adding wrong item to list
2015-01-13 19:53:02 -08:00
Eric House
1139b1d5d1
put some space before all but the first heading
2015-01-13 19:42:19 -08:00
Eric House
ea62b90f61
show conn status based on most recently successful connType
2015-01-12 08:00:20 -08:00
Eric House
fc9c262796
catch exception whose cause I'm not sure of but that make it
...
impossible to launch the app when a game gets into a certain
state. Probably need to catch exceptions at a top level of game
listing process and offer to discard those in which non-recoverable
exceptions occur. Later...
2015-01-12 07:27:24 -08:00
Eric House
5c00e31d95
BT sends fail all the time, e.g. when BT isn't enabled on
...
remote. Until I figure out how to not try BT after some point, don't
log exceptions.
2015-01-12 07:24:39 -08:00
Eric House
951f5462b3
remove assert. Can't always get forceChannel right on creation, and
...
it's mean to be advisory.
2015-01-12 07:23:50 -08:00
Eric House
a49e732371
remove logging
2015-01-12 06:26:03 -08:00
Eric House
2fa0ea3375
fix new game alert titles to differ depending on type being created
2015-01-12 06:25:28 -08:00
Eric House
861aeeb53a
don't crash when ctrl-d hit in console
2015-01-07 07:22:45 -08:00
Eric House
0caf30c4e7
fix forceChannel for NFC invite
2015-01-07 06:53:36 -08:00
Eric House
688b3944bb
fixes to invite: don't allow non-servers to invite; have common code
...
inform of number of missing even when it hasn't dropped to 0 (so
second invite can be sent for 3+ device games); take down older alerts
before posting new (again since number of missing may have changed)
2015-01-05 07:43:45 -08:00
Eric House
50f29383f5
tweak invite message to not require all invitations to be sent at once
2015-01-05 07:41:31 -08:00
Eric House
e394bf01e8
add assertion
2015-01-05 07:40:01 -08:00
Eric House
6da1b54636
add preference controlling whether more than on player is invited per
...
remote device
2015-01-05 06:32:16 -08:00
Eric House
05aaffb933
cleanup
2015-01-05 06:31:46 -08:00
Eric House
af6f01fd9c
tweak drawing and size of status icon background
2015-01-03 22:18:30 -08:00
Eric House
f39b5e8e82
separate heads in new game icon too
2015-01-03 17:22:57 -08:00
Eric House
327b20a9fe
add white space between the heads
2015-01-03 17:20:31 -08:00
Eric House
ddd1efd8dd
modify new game actionbar icons to derive from game status icons
2015-01-03 16:44:13 -08:00
Eric House
641d83ab48
use new game type icons
2015-01-03 15:17:12 -08:00
Eric House
d1d6a2669b
snapshots of icons
2015-01-03 14:57:19 -08:00
Eric House
6f64ff062e
one shot at new one-device game icon
2015-01-03 10:33:32 -08:00
Eric House
4701fe2b90
pass in number of devices already connected so forceChannel can be set
...
more correctly; put up alert when device rejects an invitation as a
duplicate.
2015-01-03 09:50:07 -08:00
Eric House
9e67106adc
fix crash by always initializing
2015-01-03 09:49:10 -08:00
Eric House
a7cc96c697
add ability to invite more than one player per device. This is mostly
...
for testing and needs to be hidden by an "advanced" pref so folks
don't stumble onto it. Works for BT (SMS will crash), but needs
cleaning up.
2014-12-31 06:54:31 -08:00
Eric House
d46c7a39f1
pass forceChannel as part of invitation
2014-12-30 07:25:26 -08:00
Eric House
28bfa3c904
make forceChannel part of CurGameInfo rather than comms, since Android
...
needs to save it there on receipt of an invitation (doesn't create
full game with comms until later.) Passes discon2 tests and seems to
work on a single Android device. (Haven't tested inviting on Android
yet.)
2014-12-29 07:39:28 -08:00
Eric House
e8bb624b0b
add preference checkbox for hiding newgame buttons (which are
...
duplicated by menu items)
2014-12-29 07:02:56 -08:00
Eric House
3209fc1b74
log sqlite error codes as strings in attempt to track down the
...
occasional assertions failure.
2014-12-28 21:40:31 -08:00
Eric House
3b7afa4557
pass --server if not setting forceChannel
2014-12-28 21:39:11 -08:00
Eric House
897c4d5786
add param to force a client to connect to host requesting a particular
...
channel. Works well enough that relay test script works. Not yet
integrated for let alone tested on Android.
2014-12-21 17:40:00 -08:00
Eric House
d81f022c78
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/linux/scripts/discon_ok2.sh
2014-12-15 16:48:10 -08:00
Eric House
4123de3560
merge android branch heads
2014-12-15 16:44:32 -08:00
Eric House
30d2c84dcc
so tests can continue, comment out an assertion that indicates a relay
...
bug that neverless doesn't prevent games from running to completion.
2014-12-15 16:43:24 -08:00
Eric House
26b01acf23
fix crash on duplicate connect packet: drop it, but keep the
...
connection alive if the duplicated packet set up addressing correctly.
2014-12-15 16:42:34 -08:00
Eric House
eb5ae9edd3
declare as little-a array so key will be listed in numeric order
2014-12-15 16:41:15 -08:00
Eric House
45ef4fcb65
add --dup-packets calling through to linux client
2014-12-15 16:14:59 -08:00
Eric House
92fd048eef
signature change: return void instead of always returning true
2014-12-15 15:33:12 -08:00
Eric House
4835afbe4a
simplify and print in order
2014-12-15 15:29:37 -08:00
Eric House
7560156351
summarize the number of tiles left every 20 passes to give better view
...
into games' progress
2014-12-15 15:11:29 -08:00
Eric House
1eb7d01be5
add option to turn on duplicate packets -- which fires an assert on
...
the relay instantly.
2014-12-11 20:23:51 -08:00
Eric House
ddc9f7994c
Merge remote-tracking branch 'sf/android_branch' into android_multi2
...
Conflicts:
xwords4/relay/crefmgr.h
2014-12-11 06:22:17 -08:00
Eric House
bf53481aad
log unexpected condition rather than asserting
2014-12-11 06:18:30 -08:00
Eric House
16c4e74e04
ignore client index of 0, since it means the device needs a slot
...
assigned.
2014-12-10 08:04:56 -08:00
Eric House
2e9c033a29
If client provides its index, honor that when placing it in game. This
...
allows a game where indices have already been established over some
transport other than relay to start using the relay mid-game.
2014-12-10 08:03:39 -08:00
Eric House
39b0d40e41
add local variable to prevent some dereferencing
2014-12-10 08:02:20 -08:00
Eric House
f0cf77d7d6
fix overwriting of addresses that happened for most (relay-only) games
...
run by my test script: match records based on channel number only.
This has yet to be tested on multi-addressing Android builds.
2014-12-10 07:54:50 -08:00
Eric House
00d19eada6
log a few more message checksums
2014-12-10 07:48:51 -08:00
Eric House
68441c60f6
add local variable to prevent some dereferencing
2014-12-10 07:48:38 -08:00
Eric House
9ff7cd1ff9
comment out dead code so I stop trying to debug it
2014-12-10 07:47:36 -08:00
