Eric House
b04604595f
change assertion to log -- fails very infrequently which is probably to be expected.
2011-12-15 18:37:20 -08:00
Eric House
af7398ce20
fix undeclared variable.
2011-12-15 18:36:47 -08:00
eehouse@eehouse.org
9e979a9e7f
Merge branch 'android_branch' into send_in_background
2011-12-08 20:59:24 -08:00
Eric House
7c9519f80f
remove translations of translations of strings no longer there
2011-12-08 18:13:20 -08:00
Eric House
78672c01a3
there's room to spell out length
2011-12-08 18:12:10 -08:00
eehouse@eehouse.org
b2a3c444f3
Merge branch 'android_branch' into send_in_background
2011-12-07 19:09:36 -08:00
eehouse@eehouse.org
4581046954
Merge remote branch 'origin/android_branch' into android_branch
2011-12-07 19:07:37 -08:00
eehouse@eehouse.org
20fa54ba59
Merge branch 'android_branch' into send_in_background
2011-12-07 19:06:26 -08:00
Andy2
46efe15f4e
up version and change notes for new release
2011-12-07 19:06:03 -08:00
Andy2
2992c33396
Merge branch 'android_branch' into send_in_background
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
(conflicts were for formatting changes only)
2011-12-07 18:46:59 -08:00
Andy2
0d4e839dba
log an error and drop bad fwd packet rather than assert
2011-12-07 18:43:13 -08:00
Eric House
6cc3770cd1
script to trace history of one game in db by polling db and listing
...
changes
2011-12-07 18:37:28 -08:00
Andy2
2d7ac8e7b0
use SystemClock.elapsedRealtime() rather than 0 as initial fire time
...
when setting background update timer.
2011-12-07 18:33:26 -08:00
Andy2
c12f64cc03
save pendingMsgLevel flag as part of summary. This fixes reset games
...
being displayed with the sync icon if they had it before the reset.
I'm not sure if not saving was an omission or if I've forgotten the
reason. There *is* separate API for clearing the flags stored in that
variable but it requires a second DB write.
2011-12-07 18:24:22 -08:00
Andy2
7b985fcbae
fix formatting -- no code change
2011-12-07 06:16:11 -08:00
Andy2
17edc79aaf
Merge branch 'android_branch' into send_in_background
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2011-12-06 19:56:10 -08:00
Andy2
ded7ffc6fe
Attempting to fix occasional stalls of background proxy checker. It
...
could be caused by the timer not running after an install, so always
launch it when the app is launched. (There's no notification
available on [re]install.) So that the check doesn't happen
immediately, which would be silly, make the initial wait same as
interval when not called in response to check-relay menu.
2011-12-06 19:52:01 -08:00
Andy2
20446bcf32
for style points, don't return from middle of function. No behavior
...
change.
2011-12-06 19:49:41 -08:00
Andy2
5d01de4c0c
found a better send email menu icon
2011-12-06 19:24:22 -08:00
Andy2
5d09c7bbed
add git describe for version to email body
2011-12-06 19:19:50 -08:00
eehouse@eehouse.org
88b0535866
Merge remote branch 'origin/android_branch' into android_branch
2011-12-06 18:51:50 -08:00
Eric House
7015ae500b
exit after showing usage
2011-12-06 18:50:04 -08:00
Andy2
7884246d7a
add menu to main screen for sending me email. TODO: find a darker
...
menu icon; add git revision to outgoing text.
2011-12-06 18:49:48 -08:00
Andy2
3b48c3ca60
use title rather than a field in custom view for title of lookup
...
dialog.
2011-12-06 18:25:55 -08:00
Andy2
7c76af30b2
remove excessing logging
2011-12-06 18:21:48 -08:00
Andy2
ebca62b25e
don't specify text file for view used in Dialog -- device will set it.
...
Prevents invisible text on HTC MyTouch.
2011-12-06 18:21:33 -08:00
Andy2
0474984b82
export new preference from jni and add a checkbox setting for it
2011-12-06 18:18:50 -08:00
Andy2
b0470d5276
add new preference that when set prevents calculation and drawing of
...
crosshairs.
2011-12-06 18:17:55 -08:00
Andy2
daa64a19a4
need to generate local.properties now that it's not checked in
2011-12-04 19:32:06 -08:00
Andy2
2918e8f059
need to generate local.properties now that it's not checked in
2011-12-02 21:35:12 -08:00
eehouse@eehouse.org
e1e8516e1b
Merge branch 'android_branch' into send_in_background
2011-12-02 19:04:12 -08:00
Andy2
52d02f04dd
pass tile value into drawCell(). Java code doesn't use it yet, but I
...
want to play with drawing cells tray-tile-style when they're big
enough.
2011-12-02 18:58:52 -08:00
Eric House
dc42e63974
fix read_packet() logging
2011-12-02 18:55:47 -08:00
Eric House
964d2dfb0b
allow, by default, more than one-player-per-device, but require that
...
roomnames be unique to eliminate risk of devices not matching up
correctly.
2011-12-02 18:55:20 -08:00
Eric House
b706486b6e
get rid of stringstream: it's either buggy or I'm using it
...
incorrectly, but regardless postgres doesn't like random chars
terminating queries.
2011-12-02 18:32:37 -08:00
Eric House
3f5e62c9b7
remove logging
2011-12-02 18:31:05 -08:00
Andy2
ae2e27e651
Put the values button back (and remove the corresponding menuitem).
2011-12-02 18:14:26 -08:00
Andy2
08063d9444
Merge branch 'android_branch' into send_in_background
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2011-12-01 21:18:37 -08:00
Andy2
4c320a52e7
allow scrolling to go a bit deeper
2011-12-01 21:10:04 -08:00
Andy2
fc00102384
don't leak/fail to install zoom-out button when chat enabled
2011-12-01 21:09:37 -08:00
Andy2
3e21b7845a
comment
2011-12-01 21:04:31 -08:00
Andy2
85fdb950bb
init board so deeper scrolling possible
2011-12-01 21:04:18 -08:00
Eric House
cbd455148d
comment only. I tracked down the most recent network proto change
...
from before which devices probably can't upgrade mid-game once the
MAX_COLS=32 change is enabled and wanted to record it.
2011-12-01 20:23:58 -08:00
Eric House
4a32942e57
two fixes that seem to allow old- and new-proto devices to play games
...
with 15x15 and 17x17 (and presumably larger) with the old games being
upgraded mid-game: when server's new and wants to use a larger board
but not all clients are capable, shrink the board; and, when new
server is opening state saved by pre-upgrade code, assume a non-0
proto version for clients that registered earlier (as old code didn't
save the client's proto version.)
2011-12-01 20:22:16 -08:00
Eric House
6691c0713c
Merge remote branch 'origin/android_branch' into android_branch
2011-12-01 20:16:15 -08:00
Eric House
0065f5078e
add variable controlling odds of "upgrading" -- which still needs tweaking.
2011-12-01 20:16:09 -08:00
Eric House
1e48a8d615
Merge remote branch 'origin/android_branch' into android_branch
...
Conflicts:
xwords4/common/model.c
2011-12-01 20:12:27 -08:00
Eric House
7da7dbc731
shoulda tried compiling before committing a large merge....
2011-12-01 19:54:56 -08:00
Eric House
9d42e3f4d0
move logf and showf into their own DbgUtils class
2011-12-01 19:51:02 -08:00
Eric House
47884b8387
ignore new tools-generated file
2011-12-01 19:50:22 -08:00
