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
Eric House
363215841d
add assert
2014-11-24 07:50:54 -08:00
Eric House
963b0e23cf
don't send bt pings on non-bt addresses
2014-11-21 23:00:16 -08:00
Eric House
80229376e9
include connection types string in header text
2014-11-21 08:02:55 -08:00
Eric House
38e37bfbb9
use gameID as inviteID when it's not provided. Originally it was a
...
relay-only thing, but it's associated with being not-standalone in
places and this seems like the easiest fix.
2014-11-21 08:02:18 -08:00
Eric House
67d41f34a3
remove loggin
2014-11-21 07:58:17 -08:00
Eric House
6c917f34ba
fix race-condition assert by dropping message. This needs a better fix.
2014-11-21 07:57:58 -08:00
Eric House
c3ca257a10
oops: new style
2014-11-20 19:13:15 -08:00
Eric House
d08a7f8d24
use a style for new game buttons
2014-11-20 19:12:56 -08:00
Eric House
8d021aa11e
trying to hide the buttons when they take too much space. Leaving
...
commented out for now
2014-11-20 19:11:22 -08:00
Eric House
301ce8bc3c
spelling error in comment :-)
2014-11-20 18:57:57 -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
d3d83b3557
cleanup
2014-11-20 06:21:22 -08:00
Eric House
a35527ae88
need to copy in BT address too
2014-11-20 06:21:14 -08:00
Eric House
e236a32c20
forgot a mutex
2014-11-20 06:04:11 -08:00
Eric House
56121fdcd4
stop (or at least greatly reduce) leakage of thread->env mappings in
...
jni, mostly by having jnithread explicitly announce that it's closing.
Yuck. This stuff *should* obey a stacking protocol but the callback
stuff I'm doing makes me unsure that can work.
2014-11-19 21:42:21 -08:00
Eric House
a1bbbe3371
separate the new-game icons into two (as stubs)
2014-11-19 19:26:08 -08:00
Eric House
ae81404215
remove assert that was firing
2014-11-19 19:25:42 -08:00
Eric House
7977c8f799
cleanup
2014-11-19 19:19:12 -08:00
Eric House
1962371fe2
flesh out MultiMsgSink so that subclasses invoked e.g. in response to
...
BT traffic can send messages via other means as well. Relay games
with both participants on one device work again.
2014-11-19 18:46:35 -08:00
Eric House
f14a1c095f
print all conn types, not just the first
2014-11-17 07:06:56 -08:00
Eric House
11f7083eb6
remove dead classes and layouts; add menu to create networked games.
2014-11-15 20:42:09 -08:00
Eric House
64276b041e
echo so I know it's doing something
2014-11-15 20:37:22 -08:00
Eric House
2465017e46
add buttons that create new games, bypassing the NewGame activity for
...
a simpler experience.
2014-11-15 17:59:59 -08:00
Eric House
d848c17d03
use real strings rather than enum's toString() result in prefs UI
2014-11-14 07:53:12 -08:00
Eric House
e750811836
add relay and bt as default address types when there's no preference set
2014-11-14 07:32:27 -08:00
Eric House
76fe26a057
include the list of currently selected conn types as pref summary
2014-11-14 07:24:24 -08:00
Eric House
2e8f4097d9
remove unused widget
2014-11-14 07:23:54 -08:00
Eric House
15e380291b
snapshot: invite by BT now works well enough that moves can be
...
exchanged. Haven't checked whether the relay's also seeing traffic.
2014-11-14 07:12:03 -08:00
Eric House
f625332782
add preference (dialog) to set default address types. Not used yet,
...
and still ugly.
2014-11-13 07:27:29 -08: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
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
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