Eric House
9db54a5461
make linux version's gameToken combine game's seed with rowid so we
...
can test that the relay is keeping them straight
2013-07-11 20:01:17 -07:00
Eric House
f27d8d5d8f
list java files first so their methods, which tend to be more
...
numerous, will be found last.
2013-07-11 19:56:37 -07:00
Eric House
d6658c5c08
don't show other_disconnected error message
2013-07-10 23:14:48 -07:00
Eric House
7dfd19a7a2
name change
2013-07-10 23:14:24 -07:00
Eric House
5814febad5
better client token logging
2013-07-10 23:13:50 -07:00
Eric House
2060aa4577
don't match on empty devID
2013-07-10 23:12:57 -07:00
Eric House
a522266ce4
add message checksumming for android too by making it part of util
...
(compiled out by default)
2013-07-10 08:05:47 -07:00
Eric House
dbf156fca7
remove excess logging
2013-07-10 08:02:28 -07:00
Eric House
5462a05692
Merge branch 'gtk_multigame' into android_branch
2013-07-09 19:35:26 -07:00
Eric House
bf1cdf225c
print queue less frequently
2013-07-09 19:32:49 -07:00
Eric House
4bde445c48
fix so gtk mode works too by providing storage for CurGameInfo
2013-07-09 18:19:22 -07:00
Eric House
5a20cc282c
fix so curses app works well enough that discon_ok2.sh script runs
...
successfully. GTK mode is untested and certainly broken.
2013-07-09 18:10:41 -07:00
Eric House
48fbf15a69
needed to quote variable
2013-07-09 18:07:03 -07:00
Eric House
f5696334a9
changes to get the merged code to compile but not included by git in the commit
2013-07-09 07:25:23 -07:00
Eric House
79f07e8751
cleanup
2013-07-09 07:19:20 -07:00
Eric House
d50c808f96
Merge branch 'android_branch' into gtk_multigame
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
xwords4/common/comms.c
xwords4/linux/cursesmain.c
xwords4/linux/cursesmain.h
xwords4/linux/gtkmain.c
xwords4/linux/gtkmain.h
xwords4/linux/linuxmain.c
xwords4/linux/main.h
xwords4/linux/scripts/discon_ok2.sh
xwords4/relay/xwrelay.cpp
(Note: The curses app crashes on exit with mempool assertions, but that's a problem before the merge.)
2013-07-09 07:18:00 -07:00
Eric House
db26c32c3e
revert accidental part of commit
2013-07-08 07:14:42 -07:00
Eric House
7d968f8502
target is now hard-coded since I reliably can't derive it from the
...
manifest file.
2013-07-08 07:13:48 -07:00
Eric House
7e36171046
add comment
2013-07-08 07:13:04 -07:00
Eric House
11994d06f8
quote variable to make shell happy
2013-07-08 07:09:03 -07:00
Eric House
e7d20fd2a3
change API version configured by build script to be what I'm using now
2013-07-08 07:03:57 -07:00
Eric House
008cce8f37
Revert "pass additional param into java world so don't show toast every time connect to relay"
...
This reverts commit e9615cb154
2013-07-08 06:30:26 -07:00
Eric House
bb68b25429
remove suggestion I don't have permission to use icons!
2013-07-07 19:53:12 -07:00
Eric House
a3de759d9e
fix to compile on Android when DEBUG set
2013-07-07 19:40:07 -07:00
Eric House
e9615cb154
pass additional param into java world so don't show toast every time connect to relay
2013-07-07 13:31:49 -07:00
Eric House
923d41e0ee
fix to compile when DEBUG not set
2013-07-07 13:17:26 -07:00
Eric House
0f104db88c
list another change
2013-07-07 13:07:12 -07:00
Eric House
2c5ac1c293
remove excess logging
2013-07-07 13:07:02 -07:00
Eric House
fb32c847ae
more changes from translator
2013-07-05 21:37:38 -07:00
Eric House
bbac923f68
assert queueLen at the point where it'll be easier track why it's overgrowing
2013-07-05 21:32:41 -07:00
Eric House
232b27e06a
combine two log lines
2013-07-05 21:31:39 -07:00
Eric House
f87ffe7a96
display new column
2013-07-05 21:28:27 -07:00
Eric House
e8022d44ea
correctly parse hid from relayID, fixing assertion failure. I'm not
...
sure how it ever worked....
2013-07-05 21:26:17 -07:00
Eric House
713551fa43
only log recv() errors that aren't related to non-blocking sockets
2013-07-05 21:23:54 -07:00
Eric House
7ecaf76b22
Merge remote-tracking branch 'origin/android_branch' into android_branch
2013-07-05 21:21:19 -07:00
Eric House
254b82104c
reduce priority of log message
2013-07-05 08:03:31 -07:00
Eric House
2cd84c4229
test that address is good each time through loop
2013-07-05 08:03:03 -07:00
Eric House
23c66e93ab
add flag required to compile on some linux systems
2013-07-05 08:02:22 -07:00
Eric House
a93eb4a511
fix assertion failure: log and drop packet when hid outside of accepted range.
2013-07-05 08:01:31 -07:00
Eric House
883cec0652
log whether b64 encoding is being used
2013-07-05 06:56:43 -07:00
Eric House
7419e3506a
add missing string to translation
2013-07-05 06:19:28 -07:00
Eric House
cd1886a751
changes from translator
2013-07-04 20:46:59 -07:00
Eric House
4b5af7ebdf
don't try to read from socket after it's been closed
2013-07-04 12:37:55 -07:00
Eric House
e6248210a5
when formatting final scores, print all players with top score as
...
Winner (fixing bug that occurred in case of a tie)
2013-07-04 12:37:10 -07:00
Eric House
7229535be7
insist on non-0 channel ID *net of mask*; don't send acks when we
...
don't have a connID yet, as this confuses the server. This fixes
assertions in testing that were pretty common when chat was enabled;
it may also fix the reported problem on Android that games get hosed
when people are using chat, as the server's response (without the
assert) was to add a new channel.
2013-07-03 07:39:05 -07:00
Eric House
8e12a8ef84
when we get a fatal error from postgres server, try killing then
...
recreating the connection. This is untested, as fatal errors are
rare.
2013-07-03 07:36:15 -07:00
Eric House
3364dcbf46
remove unused enum
2013-07-03 07:26:23 -07:00
Eric House
858d00332a
when an initial message from a client arrives with channel already
...
set, drop it (after asserting in debug code.) I'm not yet sure why
this happens, but giving it a new channel is not the right move.
2013-07-02 18:49:48 -07:00
Eric House
6cd3ebd780
improve logging
2013-07-02 18:31:02 -07:00
Eric House
0ac5d6d9e2
don't send more than three unanswered chats per boot -- to avoid
...
filling up the queues in a way that doesn't reflect real use.
2013-07-02 18:30:23 -07:00
