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
Eric House
e961756f12
give up on hard-coding size of thread->env map: expand it as needed.
2014-12-08 20:43:24 -08:00
Eric House
97092e361c
update grepped string to match changes in logging
2014-12-08 06:23:18 -08:00
Eric House
c70fcf64a7
ignore client index of 0, since it means the device needs a slot
...
assigned.
2014-12-08 06:22:30 -08:00
Eric House
f84f9aa85f
include timestamp of switch to UDP -- in case it needs to be
...
correlated with logs
2014-12-08 06:20:47 -08:00
Eric House
a80293ba82
include timestamp in "new day" post-crash line
2014-12-05 06:39:10 -08:00
Eric House
b8660470f7
include timestamp in "new day" post-crash line
2014-12-05 06:35:31 -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
9ba9d258f3
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-04 06:03:42 -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
b2b60d6c48
add commandline params that disable comms types on game creation so
...
relay not connecting initally can be tested.
2014-12-02 06:49:35 -08:00
Eric House
c8e55a85a3
use a constant; log a bit more for now
2014-12-02 06:08:58 -08:00
Eric House
a1b967033f
summarize role based on relay if in use, bt or sms otherwise
2014-12-02 06:08:18 -08:00
Eric House
73851b285e
fix a couple of NPEs
2014-12-01 07:01:10 -08:00
Eric House
fe76cfa1a1
remove logging
2014-11-26 07:21:27 -08:00
Eric House
9bdf9b2f5e
pass conType into java world from jni send proc, eliminating loops
...
e.g. sending relay setup traffic over BT.
2014-11-26 07:18:29 -08:00
Eric House
eac026a1a1
remove unused string
2014-11-25 07:18:16 -08:00
Eric House
0250f42b36
remove dead invite code
2014-11-25 07:17:52 -08:00
Eric House
8974407a67
setTitle: it's either networked or not
2014-11-25 07:17:03 -08:00
Eric House
2df8c68e60
remove commented-out logging
2014-11-25 07:16:43 -08:00
Eric House
938756a34f
switch for loop to using C99-style variable declarations; no other change
2014-11-25 06:09:18 -08:00
