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
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
878a16b3bc
snapshot: android compiles, and works well enough to exchange moves
...
via relay! Lots of changes, mostly around treating connTypes as a Set
inside the java world. Jni to translate to that is a pain.
2014-10-16 06:45:24 -07:00
Eric House
fe4c7b52f2
snapshot: relay test script works with a second address type set
...
(though with its actual transport stubbed out). Android doesn't even
compile.
2014-10-15 07:26:18 -07:00
Eric House
52465b3e1e
merge android_branch
2014-10-14 06:57:52 -07:00
Eric House
c73eec567b
fix some const confusion the stricter android gcc found
2014-10-14 06:24:41 -07:00
Eric House
0362bf5cc9
Merge branch 'android_branch' into android_multi2
...
Conflicts:
xwords4/common/board.c
xwords4/common/comtypes.h
xwords4/common/model.c
xwords4/common/strutils.c
2014-10-13 07:03:20 -07:00
Eric House
b12d12590a
don't memcpy 0 bytes
2014-10-09 21:21:41 -07:00
Eric House
4eb836ab2b
fix to compile -- graft missed a constant defined earlier
2014-10-09 21:21:27 -07:00
Eric House
badc40f90b
move dividerLoc into model and use to limit sorting to tiles to its
...
right
2014-10-09 20:09:24 -07:00
Eric House
195371ea2e
as proof of concept, skip the first 3 tiles when sorting newly
...
assigned. Later '3' will be replaced by the location of the tray
divider, but that has to be moved from board to model first.
2014-10-09 20:08:41 -07:00
Eric House
c98a5cd5f0
move dividerLoc into model and use to limit sorting to tiles to its
...
right
2014-09-30 05:57:21 -07:00
Eric House
1346aa6ee5
as proof of concept, skip the first 3 tiles when sorting newly
...
assigned. Later '3' will be replaced by the location of the tray
divider, but that has to be moved from board to model first.
2014-09-29 20:04:54 -07:00
Eric House
93526d38d7
cleanup (version upgrade test works)
2014-09-25 22:24:09 -07:00
Eric House
43bd3c018a
make an addr's conType a bitfield rather than holding a single value.
...
Works for large numbers of relay games in test, but will not yet
actually hold more than one value. Should be safe to merge to main
branch once stream upgrade is verified.
2014-09-25 20:05:37 -07:00
Eric House
aa566ad1f0
call util_informMissing when the pendingPlayers count drops to 0
2014-09-25 06:36:07 -07:00
Eric House
3668b7d8a7
merge android_branch -> android_shipbt
2014-09-24 20:51:23 -07:00
Eric House
1e80109c3e
add assert, and don't pass pendingRegistrations to clients -- it confuses them
2014-09-24 19:33:59 -07:00
Eric House
743d532fc7
putting back recent change: this works for automated test and gtk
...
manual app. I'm not sure what's up with pendingRegistrations but it
needs more studying before I can change it.
2014-09-24 19:16:06 -07:00
Eric House
64b30b68d2
merge android_branch -> android_shipbt
2014-09-23 21:33:57 -07:00
Eric House
3d6f972e9e
fix number of missing players not being calculated correctly
2014-09-23 21:30:31 -07:00
Eric House
a485480496
make divider wider
2014-09-22 07:05:45 -07:00
Eric House
6f07098cf3
return succes from server_initClientConnection()
2014-09-14 13:42:11 -07:00
Eric House
7d8b9b4270
return succes from server_initClientConnection()
2014-09-14 13:41:33 -07:00
Eric House
4d2f49d33f
when sending and don't have an address for channel yet, send the one
...
comms was created with, which is what client will have to do anyway.
2014-09-14 13:41:12 -07:00
Eric House
b333e3959f
remove assert: it's fine to close without saving
2014-09-10 06:37:32 -07:00
Eric House
9e86874e77
catch bt version up
2014-08-27 20:23:57 -07:00
Eric House
8407d3b300
cleanup and list changes
2014-08-26 22:17:34 -07:00
Eric House
d8266f6a2c
tweak title and body of notification
2014-08-26 21:53:28 -07:00
Eric House
88248131da
show new client-formatted turn summary in notification; remove old
...
common-formatting code.
2014-08-26 21:37:33 -07:00
Eric House
2d08848715
snapshot: toward having a better description of the last move in
...
notifications.
2014-08-26 06:55:26 -07:00
Eric House
e42dd971cb
Hide crosshairs once drag leaves the initial cell UNLESS a tile is
...
being dragged
2014-08-21 07:51:06 -07:00
Eric House
b77d529099
fix linux-side compile errors
2014-08-21 07:15:20 -07:00
Eric House
d921a386d5
remove logging
2014-08-19 07:21:02 -07:00
Eric House
e998fbfcba
log less
2014-08-09 17:11:35 -07:00
Eric House
56336f7178
double the max size of a tile, fixing board not using full screen in
...
portrait mode on Nexus 10.
2014-07-24 20:36:37 -07:00
Eric House
a902bdcbad
limit width of scoreboard too
2014-07-17 21:31:17 -07:00
Eric House
d51a5e67f0
fix for super-wide screen: tiles are never wider than tall. Next:
...
scoreboard.
2014-07-17 08:01:00 -07:00
Eric House
40d63be58b
too much logging
2014-06-24 08:18:42 -07:00
Eric House
c2c81dbbf1
use tmp model to find words crossing a point to avoid undoing pending turns
2014-03-20 18:52:57 -07:00
Eric House
b869940997
fix another 64-bit bug, this one prevening opening new SOWPODS.
2014-03-12 19:24:00 -07:00
Eric House
2bb9a12b63
add missing (for android build) header
2014-03-11 22:04:30 -07:00
Eric House
d1a9b716bb
protect refcount operations with mutex
2014-03-11 22:01:11 -07:00
Eric House
fbcd953a3e
define as void instead of <empty>
2014-03-11 19:38:51 -07:00
Eric House
7d8f5844bd
fix to compile without DEBUG defined
2014-03-11 19:38:08 -07:00
Eric House
a3e9562654
put related fields together -- no code change
2014-03-11 07:02:10 -07:00
Eric House
a4302897e2
enlarge dictmgr to track a compile-time defined number of dicts
2014-03-10 21:01:24 -07:00
Eric House
3c32ca6402
add option to log callsites of dictmgr put and get for easier ref leak tracking
2014-03-10 18:59:10 -07:00
Eric House
fec1ce3bed
use pthreads mutex to protect with will become critical sections in dict mgr, as will be accessed from several threads on android
2014-03-10 18:56:39 -07:00
