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
Andy2
28e5c39845
get rid of stringstream where it wasn't working (maybe because of user
...
error -- whatever); fix error check to avoid false conclusion that
query didn't work so that update of num bytes sent in background works.
2011-09-30 18:20:28 -07:00
Andy2
22382b3a19
reduce logging some more
2011-09-30 18:11:08 -07:00
Andy2
d9e97d2f32
reduce logging
2011-09-30 18:10:22 -07:00
Andy2
9bc36cd431
not an error when wait fails
2011-09-30 06:51:48 -07:00
Andy2
2af4888098
unlink socket file before trying to bind to it
2011-09-30 06:51:24 -07:00
eehouse@eehouse.org
554e497593
Merge branch 'send_in_background' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into send_in_background
2011-09-30 06:39:23 -07:00
Andy2
6553546642
cleanup; add logging for debugging background packets stuff.
2011-09-30 06:36:56 -07:00
Andy2
cb6a16f8f8
add ability to connect on nbs socket and use as destination for
...
messages fetched from relay, and to receive replies on same socket for
forwarding to relay.
2011-09-30 06:34:09 -07:00
Andy2
c992c65015
changes to support automated testing of background messages sends: new
...
param gives name of Unix domain socket to be used to accept connection
that passes in messages from relay and receives messages to be sent
back. Works once but needs debugging....
2011-09-30 06:32:21 -07:00
Andy2
c952ebd8e6
cleanup
2011-09-30 06:29:14 -07:00
Andy2
9c586efb02
new script for testing this branch's changes: replying to
...
messages delivered in the background.
2011-09-30 05:43:24 -07:00
Andy2
4a49db5c2a
initialize variable
2011-09-30 05:42:44 -07:00
Eric House
2520c1b6d2
Merge branch 'send_in_background' of ssh://xwords.git.sf.net/gitroot/xwords/xwords into send_in_background
2011-09-28 22:52:35 -07:00
Andy2
8e0e8d911e
fix compile errors
2011-09-26 18:12:16 -07:00
Eric House
26ba812aff
cleanup
2011-09-22 17:31:57 -07:00
Eric House
f0c3e2c5f0
Merge branch 'android_branch' into send_in_background
2011-09-22 17:22:01 -07:00
Eric House
8a5667f011
add missing language codes
2011-09-22 17:16:27 -07:00
Andy2
b7691d2997
Merge branch 'android_branch' into two_phase_lookup
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
2011-09-22 06:53:45 -07:00
Andy2
fcdbed0920
fix to work with changed C api
2011-09-22 06:49:34 -07:00
Andy2
35a0a3a291
passing pool into word-listing code a mistake as it put tiles back
...
when undoing and so the pool grew each time. Fix, and remove server
API as it's unneeded.
2011-09-22 06:41:48 -07:00
Andy2
d000c430b9
thought there was an internal problem with pool and wrote debug-only
...
code to check. There wasn't, and it's unused, but no point writing it
again.
2011-09-22 06:40:44 -07:00
Andy2
b10453bd25
cleanup
2011-09-22 06:14:22 -07:00
Andy2
e887d0a116
make word lookup two-stage, first a dialog to pick the word then
...
another to pick the URL. Hacky code takes us back to the first after
the second is dismissed while only showing either if there's a choice
to be made. Also add menu item to lookup all words in the game --
useful for testing when robot refuses to play multiple words but maybe
also worth shipping.
2011-09-21 19:04:33 -07:00
Andy2
c44a884184
try another item layout -- need to fix the background instead.
2011-09-21 05:47:12 -07:00
Andy2
617de4eb7e
make lookup dialog two-part, with list of lang-supporting URLs at top
...
and words at bottom. You choose a URL/site, then tap a word, and
repeat until you're done.
2011-09-20 19:01:37 -07:00
