Andy2
69b1b4da27
break dict iteration stuff out into new files. No code change
...
otherwise.
2011-10-31 18:30:55 -07:00
eehouse@eehouse.org
916d817ef2
Merge remote branch 'origin/android_branch' into android_branch
2011-10-31 07:02:30 -07:00
Andy2
1d34c26ebc
remove unneeded parama
2011-10-31 06:37:53 -07:00
Andy2
dc58d123d5
combine params into single struct
2011-10-31 06:34:21 -07:00
Eric House
491c9d06d6
reverse sense of option to mmap dicts by default
2011-10-29 20:31:47 -07:00
Andy2
8f3c4f6426
add config option to enable face-up tile picking
2011-10-28 22:24:47 -07:00
Andy2
8d228ae190
turn on face-up tile picking for Android (though there's no prefs UI
...
to enable it for a game yet). In common code, break pick tile utils
method in two, one for blank and the other for tray tiles. In java,
implement dialog for picking the tiles. Works, though is a bit clumsy
to have the dialog come and go after every pick. Better would be a
dialog that stays up and accumulates picks -- but it'd have to know to
reduce the set of tile choices as letters are chosen. This'll do for
now.
2011-10-28 22:15:56 -07:00
Eric House
f6ff3e85c6
Merge remote branch 'origin/android_branch' into android_branch
...
Conflicts:
xwords4/common/dictnry.c
xwords4/common/dictnry.h
xwords4/linux/linuxmain.c
2011-10-28 20:54:55 -07:00
Eric House
71450b02b3
use indexing (and add binary search) to double speed of getNthWord
2011-10-28 20:27:16 -07:00
Eric House
ff89ffb168
add missing backup button to fully test tile picking
2011-10-28 20:23:59 -07:00
Eric House
42d1a48a1d
don't include indices for prefixes that don't exist.
2011-10-26 22:25:21 -07:00
Eric House
412a58f6b9
make dict_makeIndex work for depth > 1.
2011-10-26 22:20:21 -07:00
Eric House
f2c4e39cd4
add dict_makeIndex(). Works, but only for depth==1 so far (A, not AA or AAA).
2011-10-26 07:10:50 -07:00
Andy2
b62fe13c97
move dict iterator test into separate function and add test for
...
dict_getNthWord(). Still ifdef'd out.
2011-10-25 06:48:59 -07:00
Andy2
fc973079dc
add first cut at dict_getNthWord. Works. Is slow.
2011-10-25 06:48:16 -07:00
Andy2
ac214236c4
add code to walk dict backwards as well, and test code that
...
succesfully walks huge dicts in both directions turning out the same
list of words either way. Still compile-time disabled.
2011-10-24 18:27:16 -07:00
Andy2
c237717de5
dict_getInfo returns false if the dict doesn't parse so can be used to
...
test validity of downloaded dict. Internally (in jni), add lots of
checks that format is correct and we don't run off end of ptr walking
truncated dict.
2011-10-23 14:21:57 -07:00
Andy2
7c7cd82e0a
add code to iterate over words in a dict. Works on Linux (iterating
...
forward only) but disabled at compile time. Idea's to have a dict
browser. There was some simple refactoring in common code Android
uses, and that tests fine.
2011-10-21 18:51:33 -07:00
Andy2
201c32e4db
add support for download directory as a place where we look for dicts
...
and to/from which dicts can be moved. Right now it's just
/sdcard/download. Dunno if that's universal. There seems not to be
API except in newer SDK versions for finding it.
2011-10-20 20:22:36 -07:00
Andy2
4eee7f8aa7
Pass selected tiles into new util function, and from there into java
...
world, so confirming query can include them.
2011-10-19 18:34:26 -07:00
Andy2
d63f6961d4
fix log comment to correctly identify site.
2011-10-18 21:29:59 -07:00
Andy2
c2a7a5c347
fix crash: don't destroy stream if for some reason it's null. Not
...
sure how that happens, but it does.
2011-10-18 21:29:40 -07:00
Andy2
90b0a4e46f
if words stream is null, don't pass into java code (where current impl
...
will get a NPE)
2011-10-18 21:28:50 -07:00
Andy2
652b7e703a
Remove difference between debug- and non-debug stream format.
2011-10-18 21:27:28 -07:00
Andy2
b31e829414
Remove file-format differences between debug and non-debug versions.
...
Fix curses to compile non-debug.
2011-10-18 18:52:37 -07:00
Andy2
028c416587
don't disable player listing when game is in play and locked; allow
...
users to see info about players and change dict.
2011-10-18 06:46:46 -07:00
Andy2
71fabdac95
add changelist change
2011-10-18 06:35:26 -07:00
Andy2
214debca47
up strings for beta 37
2011-10-18 06:16:15 -07:00
Andy2
ff82c20b2c
fix brokenness (black-on-black text in lookup dialog) on 2.2 and
...
beyond by copying in layout for built-in list items and hard-coding
white text color. This is risky/fragile but I can't find another fix.
2011-10-17 21:33:11 -07:00
Andy2
dc84cfcb97
cleanup/reformat. No code change.
2011-10-17 20:27:51 -07:00
Andy2
235259ef45
a bit more tuning of model_listWordsThrough()...
2011-10-17 18:26:04 -07:00
Andy2
3b7532aba8
improve stack_redo() to return the redone move, and use that to avoid
...
making a copy of the move stack in model_listWordsThrough()
2011-10-17 18:16:19 -07:00
Andy2
9109396ae9
in model_listWordsThrough, only undo as much as needed to find the
...
move tile that places a tile on the cell we're interested in.
2011-10-17 06:48:59 -07:00
Andy2
8062a027e7
cleanup: NULL's a legal value now.
2011-10-17 06:48:13 -07:00
Andy2
b02e0eb9cf
actually list words: makes a better test.
2011-10-17 06:47:49 -07:00
Andy2
29eec38821
remove unused strings
2011-10-16 17:59:00 -07:00
Andy2
6793742f0f
remove option to list all words played in a single lookup dialog, and
...
supporting code in the jni/common C.
2011-10-14 22:32:30 -07:00
Eric House
46392da205
Fix crash when password dialog comes up second time: don't be cute and
...
reuse custom views as they remember their parent and that needs to be
cleared. Just recreate each time and let gc() do its job.
2011-10-14 19:07:19 -07:00
Eric House
851b2d296f
Should have gone with last checkin: delete of file due to renaming.
2011-10-14 19:05:07 -07:00
Eric House
e848b150b5
rename LookupActivity->LookupView since it's not an Activity any more.
2011-10-14 18:45:47 -07:00
Eric House
0b54b190b6
make lookup dialog a mere dialog rather than an activity to fix
...
too-slow transitions to and from it. Works by keeping code in
separate custom view and not setting buttons or anything else on the
dialog.
2011-10-14 18:39:39 -07:00
Andy2
0e6b4d749f
When pen held on committed tile on board, cons up list of all words
...
played that include that tile and pass to new util_cellSquareHeld()
method. In java implementation of that method, use existing lookup
activity code to display list of words. Enabled on the C side by a
compile-time flag in case it has problems. Right now the time spent
saving a game before launching the lookup activity, and reloading it
after, is pretty apparent, but that's in emulator which is slow.
2011-10-13 19:14:08 -07:00
Andy2
7449923328
log tiles left in pool -- makes progress of automated/test games
...
easier to follow.
2011-10-13 19:10:13 -07:00
Andy2
01459285d5
show dict as comment beside player name in players list. And since
...
dicts change when language does, put language choice above players
list.
2011-10-12 18:37:31 -07:00
Andy2
0dfa69b1b2
implement pen timer with timeout, not idle.
2011-10-11 19:38:26 -07:00
Eric House
f86b0dfcc5
fix to compile on x86 (with newer compiler that doesn't like unused variables)
2011-10-10 22:42:02 -07:00
Andy2
9551f29335
up strings for beta 36. I'm skipping b35 rather than try to move the tag.
2011-10-10 22:30:38 -07:00
Andy2
4bb61401bd
fix crash: src and dest stream params were reversed.
2011-10-10 22:24:44 -07:00
Andy2
92a2fb1a1f
attach newbie info to the lookup button
2011-10-10 18:24:06 -07:00
Andy2
cdf57d3bb7
cleanup
2011-10-10 06:53:46 -07:00
