Merge remote branch 'origin/android_branch' into android_branch

This commit is contained in:
Eric House 2011-11-09 06:52:32 -08:00
commit 36c267ad88
3 changed files with 20 additions and 16 deletions

View file

@ -8,12 +8,16 @@
<b>Crosswords 4.4 beta 38 release</b>
<ul>
<li>Make toolbar buttons slightly wider and the whole thing
scroll</li>
<li>Added a wordlist browser, which you can get to by tapping a
wordlist in the Wordlist screen, or by using the wordlist
button at the bottom of the game board. Eventually you'll be
button on the game board. Eventually you'll be
able to filter based on length, chosen tiles, etc. Right now
you can scroll through all the words (even 2.7 million of them
if you're playing in Polish.)</li>
if you're playing in Polish) and tap to look them up.</li>
<li>Added the "download directory" to locations I search for
wordlists. This means that if you're using a browser like
@ -21,9 +25,9 @@
of data you can still use a wordlist you've downloaded.</li>
<li>Added "Pick tiles face up" option, settable when you create a
game. This is primarily useful if you want to populate a
board to match a game that already exists, say in a newspaper
puzzle or online wordgame.</li>
game. This is primarily useful if you want to populate a board to
match a game that already exists, say in a newspaper puzzle or
online wordgame.</li>
<!--
TODO: test various bogus dicts in downloads/

View file

@ -62,7 +62,7 @@ public class Utils {
SharedPreferences sp
= PreferenceManager.getDefaultSharedPreferences( context );
String key = context.getString( R.string.key_logging_on );
boolean on = true;//sp.getBoolean( key, false );
boolean on = sp.getBoolean( key, false );
logEnable( on );
}

View file

@ -139,7 +139,7 @@ build_cmds() {
CMD="./obj_linux_memdbg/xwords --room $ROOM"
CMD="$CMD --robot ${NAMES[$DEV]} --robot-iq $((1 + (RANDOM%100))) "
CMD="$CMD $OTHERS --game-dict $DICT --port $PORT --host $HOST "
CMD="$CMD --file $FILE --slow-robot 1:3 --skip-confirm --use-mmap"
CMD="$CMD --file $FILE --slow-robot 1:3 --skip-confirm"
CMD="$CMD --drop-nth-packet $DROP_N $PLAT_PARMS"
CMD="$CMD $PUBLIC"