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
861a24dfeb
Merge branch 'android_branch' into send_in_background
2011-10-10 22:42:28 -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
Eric House
eb60bfade7
fix to compile on x86 (with newer compiler that doesn't like unused variables)
2011-10-10 22:40:05 -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
eehouse@eehouse.org
99707e4029
Merge branch 'android_branch' into send_in_background
2011-10-10 18:31:30 -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
Andy2
d5ca5bbd0d
remove misplaced assert: in network games illegal words may well
...
arrive.
2011-10-10 06:48:07 -07:00
Andy2
c3ba50c905
up strings for beta 35
2011-10-07 18:59:32 -07:00
Andy2
03543c17ea
fix NPE I got once, presumably when activity shutting down.
2011-10-07 18:59:17 -07:00
Andy2
febf32040e
don't kill xwords; it'll exit when it's done
2011-10-07 18:51:27 -07:00
Andy2
da5da3dd89
wait for connection rather than asserting immediate success so can be
...
started before server.
2011-10-07 18:50:37 -07:00
eehouse@eehouse.org
8712918e73
Merge branch 'android_branch' into send_in_background
2011-10-07 05:49:52 -07:00
Andy2
f03699f701
add newbie warning/request for languages with only google as
...
word-lookup site.
2011-10-06 19:03:07 -07:00
Andy2
f084661ec3
Never meant to check in having lookup menuitem at top level.
2011-10-06 18:47:08 -07:00
Andy2
152a9175c6
use dialog theme for lookups -- just works now, though didn't at first.
2011-10-06 18:44:59 -07:00
Andy2
a129f353f5
fix assertion by skipping states only when applicable, and running in
...
a loop so works in either direction. Cleanup -- this is done.
2011-10-06 18:44:24 -07:00
Andy2
0a474804ce
fix to work with bundling, i.e. by removing configChanges entry in
...
AndroidManifest.xml and changing orientation.
2011-10-06 18:25:17 -07:00
Andy2
d8c1e3822b
fix problems with skipping singleton words and URLs; replace window
...
title with TextView.
2011-10-06 17:47:00 -07:00
eehouse@eehouse.org
6bf8d5abeb
Merge branch 'android_branch' into send_in_background
2011-10-06 06:51:05 -07:00
Andy2
a9b467c903
make adapter based on static array static
2011-10-06 06:31:04 -07:00
Andy2
e292056b9c
add new activity (with layout) to replace dialogs for word lookup.
...
Lots of code moved there from BoardActivity.
2011-10-06 06:26:46 -07:00
eehouse@eehouse.org
471a9d988d
Merge branch 'android_branch' into send_in_background
2011-10-05 07:10:52 -07:00
Andy2
aaf0ba34e4
add a couple of French word lookup URLs.
2011-10-05 06:55:25 -07:00
Andy2
90f11abc37
add to game state passed into java world whether it's the cur selected
...
player's turn, and use that to enable/disable Pass/Turn done button.
2011-10-05 06:36:01 -07:00
Andy2
179560867f
for symmetry, remove default menu title from res file and set in code
...
either way.
2011-10-05 06:14:48 -07:00
Andy2
c5c0fbccae
remove unused DrawFocusState params from jni interface
2011-10-04 19:03:27 -07:00
Andy2
dc20b04a4c
remove unused param (on the C/jni side)
2011-10-04 18:54:53 -07:00
Andy2
3ec97d5c07
Turn "Turn done" into "Pass" when the pending score is 0. To do that
...
I had to pass the score into draw_trayBegin since
draw_drawPendingScore() isn't called until the first tile's placed.
Note: as long as I'm messinng with this menuitem it should be disabled
when it's not the player's turn.
2011-10-04 18:48:33 -07:00
eehouse@eehouse.org
82615f409b
Merge branch 'android_branch' into send_in_background
2011-10-04 06:49:19 -07:00
Andy2
f4b8b2806e
remove unused parameter
2011-10-04 06:48:53 -07:00
Andy2
5dd21a16ea
don't crash if words stream is null, as it will be when turn's a pass.
2011-10-04 06:45:16 -07:00
Andy2
c04f981442
fix new word-list reporting to work for networked games too: create
...
and save a second stream parallel to the existing one reporting the
move scoring. Requires bump in stream version.
2011-10-04 06:44:29 -07:00
Andy2
3cf1d07df3
optimization: set up word-tracking invariants on init rather than each
...
time used
2011-10-04 06:21:02 -07:00
Andy2
5773466fb6
prevent lookup dialogs from coming up before button pressed by not
...
assigning m_words too early.
2011-10-04 06:19:06 -07:00
eehouse@eehouse.org
9152609bdd
Merge branch 'two_phase_lookup' into android_branch
2011-10-03 06:48:12 -07:00
eehouse@eehouse.org
686211843e
Merge branch 'two_phase_lookup' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into two_phase_lookup
2011-10-03 06:47:54 -07:00
eehouse@eehouse.org
fe1bfead87
Merge branch 'two_phase_lookup' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-10-03 06:46:24 -07:00
Andy2
072516655e
Use words list passed into informMove rather than query when user
...
presses button. Include word in button text when there's only one.
2011-10-03 06:43:20 -07:00
Andy2
35e4c21f17
add util_informMove to jni. Use it, but not to advantage yet.
2011-10-02 16:42:10 -07:00
Andy2
77b9fa11a5
improving lookup words experience: replace
...
util_userQuery(QUERY_ROBOT_MOVE) with new util_informMove(), into
which the number of words formed and the words themselves are passed.
The process of consing up the score explanation was already passing
over the model, so storing the words is very little effort, and will
save a call back into the model where the user actually wants to do
the lookup.
2011-10-02 16:21:09 -07:00
Andy2
8650c997e0
nuke noisy logging -- that stuff works now.
2011-09-30 18:34:31 -07:00
Andy2
38adeb9160
improve script to be more patient but exit after there stop being
...
messages -- which usually means the games finished. With this and
previous changes the background stuff works most of the time. Now to
debug why it's not all of the time.
2011-09-30 18:22:25 -07:00
Andy2
dee826c6b1
hide script log directories
2011-09-30 18:20:41 -07:00
