eehouse@eehouse.org
8dad8750ba
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-11-06 14:43:57 -07:00
Andy2
d6adc84ee3
tweak two prefs strings
2010-11-06 14:40:28 -07:00
Eric House
98716b755a
get rid of menuitem that was there only for development testing
2010-11-06 08:30:45 -07:00
Andy2
c125edd2cb
make text bulleted -- easier to read/follow
2010-11-05 05:53:28 -07:00
eehouse@eehouse.org
fc739e2c67
Merge branch 'android_branch' into relay_proxy
2010-11-05 05:19:16 -07:00
eehouse@eehouse.org
6d205011f5
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-11-05 05:12:59 -07:00
Andy2
145ab6f356
remove wordy explanation
2010-11-05 05:11:40 -07:00
eehouse@eehouse.org
64cc199e1a
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-11-05 05:10:24 -07:00
Eric House
0d863d2d3f
fix casting error caught by compiler
2010-11-05 05:06:24 -07:00
Eric House
7b3691662a
version of build.xml modified to pass -xline to javac. For future use...
2010-11-05 05:06:04 -07:00
Andy2
2f38ce3d92
add button leading to the main config dialog plus an explanation of
...
what it's for.
2010-11-04 20:37:59 -07:00
Andy2
23924ff74e
add new activity that's popped up on creation of a networked game to
...
ask only for the room name to make it as easy as possible to
get started.
2010-11-04 19:48:46 -07:00
Andy2
c9239fc921
make method public
2010-11-04 19:46:05 -07:00
Andy2
9c48c91156
init room name to current text -- duh! -- preventing close process
...
from thinking a change has been made (room name nulled) when none had
been.
2010-11-04 06:36:28 -07:00
eehouse@eehouse.org
d04a5870af
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-11-03 21:00:43 -07:00
Andy2
c630697c59
Fix crash on 2.2 emulator by turning of ipv6 on emulator. per
...
workarounds found online. Suggested fix is to use io instead of nio.
2010-11-03 20:54:35 -07:00
Andy2
d1fcdb69da
double max room name len since the old value was too small -- only
...
filled half a text field on android
2010-11-03 18:38:43 -07:00
Andy2
e2ee0755cb
set max len for roomname field (with comment that it should be kept in
...
sync with the C constant)
2010-11-03 18:38:13 -07:00
Andy2
c7febf0d10
nuke unused constant
2010-11-03 18:30:05 -07:00
Andy2
9e05e6c2b3
add lastMsgRcd to status printout
2010-11-03 18:28:54 -07:00
Andy2
c039b92339
don't send 0-length message
2010-11-03 18:26:20 -07:00
Andy2
0148a93f3e
add a constraint to the stored messages table to avoid dupes. Then
...
remove the artificial limit on number of stored messages. This seems
to fix problems where lots of chats in a row clog up the relay so that
messages never get flowing again. Works more cleanly than
artificially ACKing.
2010-11-03 18:14:19 -07:00
Andy2
633d4c95a7
fix buffer overflow sql error with large messages; combine logged messages.
2010-11-03 18:12:26 -07:00
Eric House
31df12747b
fix prev hint to work not just compile
2010-11-01 22:20:35 -07:00
Eric House
892f30692b
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-11-01 21:54:28 -07:00
Eric House
e54bf588ab
fix to compile on wince/win32
2010-11-01 21:54:04 -07:00
Andy2
8bf8383d60
reread preferences in case of an upgrade. Fixes bug where default
...
port was 0 because the new key, meant to change the value, was not
being initialized. It's a hack to use a side-effect to determine
whether this is an upgrade, but since I'm already calculating it
didn't see any point to doing it again.
2010-11-01 18:56:23 -07:00
Andy2
1e5a856287
log host/port connecting to. Too useful to omit.
2010-11-01 18:53:36 -07:00
Andy2
8f55469930
remove strings no longer in English
2010-11-01 18:12:14 -07:00
Andy2
3d70da5a8d
cleanup
2010-11-01 06:57:54 -07:00
Andy2
804070efc7
base comms_canChat() on whether connID's been assigned. It's possible
...
to send a message from a client immediately after its initial message
but init-message dupe-detection in comms will drop that because only
one channel-0 message is expected -- the initial connection message.
So don't encourage platform code to enable the feature before common
code can deliver the message.
2010-11-01 06:57:41 -07:00
Andy2
2d9851902c
replace chat menuitem with chat button enabled using comms_canChat()
2010-11-01 06:55:37 -07:00
Andy2
40e42b79c5
up version numbers and strings -- getting ready for release
2010-10-30 09:11:47 -07:00
Andy2
b2fd178d60
tray->rack; clarify not-again text for 'turn done' button so it isn't
...
stupid when displayed for ending a trade.
2010-10-29 20:24:50 -07:00
Andy2
64a8b1e61a
change confusing const name
2010-10-29 20:20:25 -07:00
Andy2
8c7043d42c
fix crash using undo/redo after a turn has overwritten pending tiles:
...
when redoing need to check that cell is still empty.
2010-10-29 20:07:09 -07:00
Andy2
5b33df4e25
modify model_getTile to take NULL for out parms where the result is
...
often ignored, then pass NULL instead of the address of variables
called 'ignore'. Should be no behavior change.
2010-10-29 19:52:15 -07:00
Andy2
3d52698939
don't show all-here not-again dialog to host host -- already got the
...
first-in version.
2010-10-29 19:14:56 -07:00
Andy2
148fe848c2
get rid of implication that some deletions are undoable.
2010-10-29 19:02:57 -07:00
Andy2
fd1ca2c9c5
confirm single game delete.
2010-10-29 19:02:21 -07:00
Andy2
5b6a5aafe8
add three not-again messages displayed after connection is first made
...
with the relay, for first-in-room, last-in-room, and the less common
middle case. Add confirmation dialog for game reset.
2010-10-29 18:44:07 -07:00
Andy2
6de7fb28e3
add lock-setting checkbox to game config dialog and toggle
...
setEnabled() on most widgets as it's checked. Add not-again dialog
explaining possibility of reset of started game. Don't even show the
checkbox for non-started game.
2010-10-29 07:42:16 -07:00
Andy2
814dd89458
remove unused ivar; override setEnabled to dis/enable delete button
2010-10-29 07:40:41 -07:00
Andy2
30b6a6b54e
remove unused and confusing id
2010-10-29 06:48:45 -07:00
Andy2
a7c1319527
call super only in the default case
2010-10-29 06:48:18 -07:00
Andy2
d98525de95
make chat display dialog blocking. This fixes problem where multiple
...
chats received at once see all but the first dropped, and probably
fixes reported problem where only one message every got displayed.
2010-10-29 06:46:27 -07:00
Andy2
b115ce14ed
add devOrder (= hostID) to params passed on connect. Fix to pass new
...
param from jni; use object to pass params into UI thread since there
are now too many for handler.
2010-10-29 06:34:39 -07:00
Andy2
ab708e4db1
add devOrder (= hostID) to params passed on connect. Make linux apps compile after API change.
2010-10-29 06:32:18 -07:00
Andy2
0d7f2c4f23
add devOrder (= hostID) to params passed on connect. Should make for
...
better explanatory message.
2010-10-29 06:31:33 -07:00
Andy2
4cd15a9c6a
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
...
Conflicts:
xwords4/common/comms.c
2010-10-29 05:27:07 -07:00
