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
552ab8fa48
fix assertion (leaving the confusion in the code about tracking the
...
open relay socket)
2014-11-11 07:36:55 -08:00
Eric House
ba44863381
add simple tell() as wrapper on ask()
2014-11-11 07:35:56 -08:00
Eric House
10a960930c
collect number to be invited. (Not tested: whether a number other than 1 works)
2014-11-11 07:35:14 -08:00
Eric House
ba6151c385
remove param that causes assert to fire
2014-11-10 07:31:51 -08:00
Eric House
c704b7ff4f
remove dead code
2014-11-10 07:31:33 -08:00
Eric House
e82589a526
replace overloaded method with diff-named one, avoiding call to wrong
...
one when compiled on old 32-bit Atom. 32-bit issue, or what? This is
quick and sure to fix it. Should be grafted back to main branch.
2014-11-10 06:43:42 -08:00
Eric House
94cfaecfb1
replace overloaded method with diff-named one, avoiding call to wrong
...
one when compiled on old 32-bit Atom. 32-bit issue, or what? This is
quick and sure to fix it. Should be grafted back to main branch.
2014-11-08 23:07:34 -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
786d775878
don't pass null address
2014-11-07 20:25:13 -08:00
Eric House
8e616095ad
add a bit more logging of channelNos
2014-11-06 20:28:51 -08:00
Eric House
70f4541bbe
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/common/comms.c
2014-11-06 20:09:20 -08:00
Eric House
a34a859d18
log channelNo more consistently
2014-11-06 18:44:19 -08:00
Eric House
540d3e9622
wire disabling checkboxes into comms. They work -- and show that
...
multi-addressing needs debugging still.
2014-11-06 06:35:28 -08:00
Eric House
b1de8663d6
fix to compile with DEBUG undefined
2014-11-06 06:32:00 -08:00
Eric House
2426e04a70
fix overwriting of address info so that, AFAICT, both address types
...
are successfully being used through much of a test game.
2014-11-05 21:57:25 -08:00
Eric House
3d9ee4b9f9
use app define, not relay's
2014-11-05 21:45:14 -08:00
Eric House
68e7f303b0
oops -- here's the relay md5sum logging. app side went in prior.
2014-11-05 21:42:45 -08:00
Eric House
c516e1f77c
add code to log md5 sums of udp packets sent and received. These match
...
relaycon logging to be added shortly.
2014-11-05 21:42:03 -08:00
Eric House
405b3eef93
remove dead/commented out code
2014-11-05 21:33:54 -08:00
Eric House
564e671b47
quick hack to add checkboxes for turning off transport sends and
...
receives to be used for testing after it's actually hooked up. This
is just the UI.
2014-11-05 18:48:53 -08:00
Eric House
8aae7ae10a
fix crash: don't use comms before initialized
2014-11-05 07:49:17 -08:00
Eric House
17bc0ab47c
snapshot of work toward communicating when two addresses are in use.
...
An invitation works with relay and (fake) SMS on, and the invited
client connects successfully using both (the second to arrive being
correctly identified as a dupe.) While the game can be played after,
only SMS messages are being received. And opening a saved game
crashes.
2014-11-05 07:41:20 -08:00
Eric House
fc6ccf217f
fix formatting of types: don't crash on too-small buffer, and add
...
separator only when needed.
2014-11-02 17:25:56 -08:00
Eric House
e1a10508e1
when preprocessing a message, limit search to the address type of the
...
channel it came in on if known.
2014-11-02 17:24:37 -08:00
Eric House
f853aad904
add checkbox to tab label when selected
2014-11-02 11:55:46 -08:00
Eric House
71fbae622a
clean up code a bit
2014-10-28 20:13:48 -07:00
Eric House
1ca5515b07
Add checkbox to each type tab indicating whther the game will use that
...
addressing type to communicate.
2014-10-28 08:08:11 -07:00
Eric House
9b336bde49
fix crash: must iterate when multiple types are possible
2014-10-28 08:04:05 -07:00
Eric House
b624867cb4
add addr_rmType()
2014-10-28 08:03:19 -07:00
Eric House
1789d442ba
let me look at another player's tiles, regardless of pref setting,
...
when game is over
2014-10-27 19:24:22 -07:00
Eric House
2163d25a27
let me look at another player's tiles, regardless of pref setting,
...
when game is over
2014-10-27 19:23:52 -07:00
Eric House
3024bcbd50
get rid of bt and sms new game options
2014-10-27 19:12:38 -07:00
Eric House
93f0b626af
snapshot: invite sent by NFC connects two devices using relay with BT
...
ability passed too (though not yet used.)
2014-10-27 07:51:25 -07:00
Eric House
7a1cd06486
fix crash in dict iteration: add to thread map the env that creates globals
2014-10-23 07:44:41 -07:00
Eric House
c3e7b12103
merge android_branch
2014-10-23 06:33:28 -07:00
Eric House
51a1ddfe39
include robot name in report of his score
2014-10-23 06:32:24 -07:00
Eric House
8486bad44b
add default robot name to prefs
2014-10-23 06:21:16 -07:00
Eric House
9886d5a6e6
merge over changes to run with new bash
2014-10-22 18:57:33 -07:00
Eric House
3fe3b1724a
replace stacked tracking of env with explicit mapping from pthread to
...
env for that thread to fix occasional assertion failure that indicated
I was using the wrong env occasionally. I'm not super confident in
this because I've seen the env for a thread change, but that could be
due to reuse of the thread id.
2014-10-22 06:58:42 -07:00
Eric House
d1b05749eb
ignore core files
2014-10-20 20:23:05 -07:00
Eric House
046710dd54
hide core files
2014-10-17 18:37:08 -07:00
Eric House
452729fb9d
merge android_branch
2014-10-17 18:36:08 -07:00
Eric House
53d2c2f0f2
rename method
2014-10-17 18:35:14 -07:00
Eric House
f1e6e2f8f5
can't assert yet -- breaks upgrade
2014-10-17 07:58:26 -07:00
Eric House
df093e1c10
preexisting db field now a set, so treat it that way in the other place it's read
2014-10-17 07:55:04 -07:00
Eric House
4e37947d94
assert, for now at least, no unexpected types being added from jni world
2014-10-17 07:54:34 -07:00
Eric House
7cef0c8c06
un-stub-out summary info
2014-10-17 07:47:48 -07:00
Eric House
2e74b97b4a
oops: set typeset field in java struct
2014-10-17 07:46:32 -07:00
