Eric House
517cfe6fda
bring over saved file format change from relay_conn branch so builds
...
from each will be able to open each other's files.
2015-08-10 06:24:40 -07:00
Eric House
b500a4646d
use different uuid for dbg variant so it's not cross-sending BT
...
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
2015-08-03 04:50:56 -07:00
Eric House
75cd6c6693
fix logic behind "unable to find move" alert
2015-07-26 13:17:59 -07:00
Eric House
0bb51e8b93
show a toast when hint can't find anything, on the principle that user
...
should see some response to every action.
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-07-26 12:09:15 -07:00
Eric House
2e8c7695f3
fix failure to connect using means (e.g. BT) that becomes available
...
partway through a game. Problem was that once a channel was working
with one means we wouldn't fall back to default addressing for the
means for which we didn't have a return address yet. (NOTE: Not yet
fully tested...)
2015-06-11 07:29:47 -07:00
Eric House
90dbd52bfd
On client, when game ends locally set turn to -1 (nobody) so that
...
display won't be confusing during the interval before the server
receives the move and responds with a game-over message.
2015-06-10 07:35:39 -07:00
Eric House
f0c3c11dc8
invalidate all tiles after committing a turn in order to force redraw
...
of the Pts. display in case where fewer than seven tiles remain and
the board isn't being switched.
2015-06-10 07:31:00 -07:00
Eric House
e66260950e
change final score formatting so it can be properly localized.
...
Note: because the substitution is done in common code I can't use the
positional specifiers (%1$s vs %s) and so this breaks the generated
"translations". The scripts that do the generation need to be fixed to
understand the formatted="false" attribute.
2015-05-13 07:51:32 -07:00
Eric House
1d6d8e46a3
add missing <CR> to game history (game over case only)
2015-05-13 06:36:43 -07:00
Eric House
e52d5c4077
fix crash sorting tiles when there are fewer to sort than there is
...
space to the left of the divider, i.e. when the game's nearly over.
2015-04-07 20:20:40 -07:00
Eric House
669ef0745b
increase buffer size to remove overlow formatting history in French
2015-03-25 05:45:13 -07:00
Eric House
75a805634f
increase buffer size so French strings don't overflow and get
...
truncated.
2015-03-19 06:28:40 -07:00
Eric House
5f33d99c2e
toward making full use of getQuantityString(): add util method to pass
...
quantity through to java world, use it, convert English <string>
resources to <plurals> (using python script) based on parallel changes
in French, and modify callsites to call getQuantityString() where
R.string.xxx became R.plurals.xxx.
2015-03-18 21:23:30 -07:00
Eric House
f2f5fb22e6
use new comms header to transmit isServer bit
2015-02-23 18:28:31 -08:00
Eric House
86d8a46da2
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/common/comms.c
2015-02-18 19:40:36 -08:00
Eric House
b23c4d0a73
change comms header format to add a version and flags, marking with an
...
almost unique 16-bit quantity. 1 in 2^16 new games will fail because
its connID will match, but that's ok in part because it can only
happen during the time between when this is released and follow-on
version that assumes all older versions are gone.
2015-02-18 19:19:36 -08:00
Eric House
159a1a8dd2
use TAGFMT stuff for comms_resendAll()
2015-02-17 20:45:39 -08:00
Eric House
615ec72ea7
fix channelNo equality test so it doesn't break relay games, which
...
connect a bit differently.
2015-02-10 07:26:23 -08:00
Eric House
72a1d8b7d4
clear any server bits that happen to have been set in older games.
2015-02-10 07:05:34 -08:00
Eric House
cf4431402b
additional check for misdelivered messages that fixes
...
three-participant SMS games on a single device: if message arrived on
a different channel from what its header says it was meant for, drop
it.
2015-02-10 06:55:08 -08:00
Eric House
ad6be1bb7e
add debug-only "tag" to open games so logging can more easily track
...
what's going on when multiple participants in a single game are on the
same device. But for a couple of strings passed into the jni the
changes are only in DEBUG code.
2015-02-09 19:15:43 -08:00
Eric House
a34f4e4954
don't save unset channelSeed
2015-02-09 07:28:11 -08:00
Eric House
9e403ac6b2
add assert around the new bit that's -- bitten -- me once already
2015-02-09 06:46:34 -08:00
Eric House
5a28f8dedf
fix recent message header hack to not break addressing of messages
2015-02-08 18:42:38 -08:00
Eric House
88dd25fb21
fix channel comparison so messages actually get deleted after they're
...
ack'd.
2015-02-08 13:39:35 -08:00
Eric House
fb011624bb
add another assertion meant to find threading problems, and fix assert
...
firing because flag was set too late and sometimes bypassed.
2015-02-08 10:37:54 -08:00
Eric House
7e634ecc64
hijack a bit from channelNo to indicate whether message sender is
...
server or guest so that sender can tell when it receives a message
from itself (and reject it.) This fixes a lot of confusion in testing
where both participants in a networked game are on the same device,
but might also work around e.g. relay bugs.
2015-02-08 09:58:34 -08:00
Eric House
c6b42c539c
add assert to ensure there are no thread issues: mutex may be required
...
if the assert winds up getting hit.
2015-02-08 07:51:08 -08:00
Eric House
17307f910b
fix problem with misdelivered message forever locking out future
...
messages: when comms thinks a message is an init but server drops it,
give comms that info so it can remove it and give the next one a
chance.
2015-02-07 13:24:09 -08:00
Eric House
f039ee8338
reject message for client that arrives for server rather than asserting
2015-02-07 13:20:47 -08:00
Eric House
cf3c219b69
fix non-DEBUG compile
2015-02-07 12:54:46 -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
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
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
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
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
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
5935681b82
in getDestID, deal with possibility game was consumated via a
...
non-relay channel, and allow client to use HOST_ID_SERVER.
2014-12-05 06:19:02 -08:00
Eric House
a6f9f6608a
drop relay connect meta-messages (as well as game messages) when relay
...
send is disabled.
2014-12-02 06:52:48 -08:00
Eric House
53bfe9812d
add const
2014-11-24 07:52:03 -08:00
Eric House
a1cdef6ad8
fix log format
2014-11-24 06:30:58 -08:00
Eric House
142861656e
don't send when channel address doesn't have the right type yet
2014-11-21 22:53:48 -08:00
Eric House
fbea67e479
don't kill relay when bluetooth turned off: pass comms type into
...
comms_transportFailed()
2014-11-20 07:12:25 -08:00
Eric House
1d1af9ffb3
fix some asserts: we have BT working now
2014-11-14 07:06:02 -08:00
Eric House
f2ecefd573
copy bt address info too
2014-11-13 07:27:03 -08:00
Eric House
74afdbd8b6
add more asserts
2014-11-12 06:52:58 -08:00
Eric House
c008f55133
add invite button only if I'm a host and am missing players
2014-11-12 06:52:40 -08:00
Eric House
0e2bbfc1ad
augment addresses even when message received is a duplicate. Now games
...
using (fake) SMS and relay work whichever of the address modes is
disabled during the game, on either side. At least for two-device
games.
2014-11-11 07:46:01 -08:00
Eric House
c087824b47
snapshot with a bit of debugging added, mostly to tranfer to another machine
2014-11-07 20:26:02 -08:00
Eric House
8e616095ad
add a bit more logging of channelNos
2014-11-06 20:28:51 -08:00
