Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
8395 commits 20 branches 240 tags 30 MiB
Commit graph

8395 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Eric House
53bfe9812d add const 2014-11-24 07:52:03 -08:00
Eric House
363215841d add assert 2014-11-24 07:50:54 -08:00
Eric House
a1cdef6ad8 fix log format 2014-11-24 06:30:58 -08:00
Eric House
f3828ab7c9 merge android_branch -> android_multi2 2014-11-22 17:15:22 -08:00
Eric House
83a79963d4 Merge remote branch 'origin/android_branch' into android_branch 2014-11-22 17:11:40 -08:00
Eric House
4b635791d7 crash fix: provide missing param to format string 2014-11-22 17:08:17 -08:00
Eric House
963b0e23cf don't send bt pings on non-bt addresses 2014-11-21 23:00:16 -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
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
4b30d98bd0 fix to compile with DEBUG off 2014-11-20 07:16:37 -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
1d1af9ffb3 fix some asserts: we have BT working now 2014-11-14 07:06:02 -08:00