Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-03 23:04:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4722 commits 21 branches 243 tags 33 MiB
Commit graph

4692 commits

Author SHA1 Message Date
Andy2
9ff149fe2d fix race: if we get a cid from the DB while another thread has claimed 
that cid, then by the time we can claim it there's no longer space for
us.  Call new method after the claim succeeds to make sure there's
still room, and if not relinquish and loop back to the DB for another
try.
 2011-06-23 19:00:32 -07:00
Andy2
c51e5e41f4 fix ClaimSocket: it was neither marking claims nor checking for marks. 2011-06-23 18:58:50 -07:00
Andy2
63a4e6c953 get rid of per-cref mutex: it's redundant now that access is 
synchronized.  Add method to check if new players are still welcome to
allow fix for race.
 2011-06-23 18:57:48 -07:00
Andy2
a5bab1232f deal with changing connnames: use the last 2011-06-23 18:12:38 -07:00
Andy2
e886a1aefe lots more changes -- another snapshot, this, rather than stuff 
carefully polished and reviewed.  Shows progress, though, in getting
through tests.
 2011-06-23 07:12:50 -07:00
Andy2
b4381e8403 drop-packets off, not on, by default 2011-06-22 18:17:47 -07:00
Andy2
3ebcc01e86 beginning -- this is a snapshot -- of rewrite of how relay keeps 
multiple thread out of a single game.  Add new class that locks
per-cid and start using it.  Very incomplete.
 2011-06-22 06:51:26 -07:00
Andy2
c87df3ce16 add option to drop incoming packets randomly (rather than 1st, then 
2nd, then 3rd etc.)
 2011-06-20 18:55:57 -07:00
Andy2
aecdd8922f don't show times -- not interesting for debugging right now 2011-06-20 18:55:17 -07:00
Eric House
85d484a881 major mod to deal with devices that fail to receive ACK and then 
reconnect.  I was putting both (i.e. the same device twice) in the
same game.  Now I detect this based on the seed being duplicated and
treat the device as having failed to ACK then proceed with the CONNECT
as if it were new.  Tested pretty heavily but only with two-device
games.
 2011-06-20 18:13:15 -07:00
Eric House
44af266db6 add logging 2011-06-20 18:10:42 -07:00
Eric House
238fac3696 add new ack column to track whether devices have ACKd yet. 2011-06-20 18:10:07 -07:00
Andy2
9b4034f409 fix undefined variable by updating script before possibly deleting it 2011-06-16 18:35:08 -07:00
Andy2
7eb099d3a6 show seeds 2011-06-15 06:49:32 -07:00
Andy2
3f7cd851f2 use new drop-nth-packet option, incrementing by 1 each time. 
Currently this breaks the relay -- which must be fixed.
 2011-06-15 06:49:15 -07:00
Andy2
2d7a1f13b8 add drop-nth-packet option 2011-06-15 06:47:08 -07:00
Andy2
cb5fa56a90 Tweak a couple of messages. Bye Luke! 2011-06-14 06:40:10 -07:00
Andy2
ecc5211791 Bug: don't refuse to update preference summary just because it's empty. 2011-06-14 06:16:11 -07:00
Eric House
5fc430c6da Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-06-14 05:47:16 -07:00
Eric House
cb3e33ef72 update for months-old param name changes 2011-06-14 05:46:27 -07:00
Andy2
7a5549cc43 set selectAllOnFocus on player name edit. Can't figure out how to 
force focus to that field though....
 2011-06-14 05:38:37 -07:00
Andy2
d470a1c1e0 add a newbie-info for new-from menuitem. Still need one for reset. 2011-06-13 18:47:42 -07:00
Andy2
a318021308 title that won't surprise on upgrade 2011-06-13 18:26:12 -07:00
Andy2
d18ac741b7 add new debug pref for redirecting host so it and relay can live on 
different machines.
 2011-06-13 18:17:37 -07:00
Andy2
c9c470b724 remove logging 2011-06-13 06:27:55 -07:00
Andy2
5232186b1d path starts with //, not / 2011-06-13 05:28:06 -07:00
Andy2
dfc8519c9c wrap password query field in layout too so it can have some margins. 2011-06-11 06:06:42 -07:00
Andy2
e9e8211050 capitalize names in player config too 2011-06-11 06:06:03 -07:00
Andy2
6620b42abd clean up new game dialog (thanks K.T.!): remove title bar, add some 
spacing and make it scrollable for when in landscape mode.
 2011-06-10 22:51:54 -07:00
Andy2
8c65ed5548 have default name text selected for easier replacement 2011-06-10 22:28:49 -07:00
Andy2
bb82831fb4 put EditText into a layout so can have some margins. 2011-06-10 20:55:18 -07:00
Andy2
1a89ed1f14 use new Utils.inflate where appropriate 2011-06-10 20:09:38 -07:00
Andy2
d058e3fd4b use a layout instead of a raw text widgit. 2011-06-10 20:02:14 -07:00
Andy2
1cc2717d50 tweak text for consistency 2011-06-10 20:01:22 -07:00
Andy2
a7851f3c55 on initial startup check if the default name's been set for Player 1. 
If not, give a chance to set it and a welcome message.  Whatever
happens, wind up with some sort of default name so the query isn't
repeated unless user clears all defaults.
 2011-06-10 18:58:49 -07:00
Andy2
1d5cfd49fa remove second URL that was meant to allow user to install Crosswords 
if it's not installed (because SMS apps confuses with the way it
presents multiple URLs.)  Will try to do the same thing with the
redirect .php script whose output will stick around if the redirect
fails.  Also, use URI.Builder instead of a format string to build the
redirect URL.  It's cleaner.  Still need to have a space in the format
string to keep sentence-finishing period from becoming part of the
room name.  Not sure how to fix that without moving to html messages
which I assume don't work in SMS.
 2011-06-10 06:49:32 -07:00
Andy2
d089c29ada factor uri parsing and creating code into its own class -- in case 
there are matching operations required.  I thought one would be for
URLEncoder.encode() but seems not to be: spaces are un-escaped just
fine.
 2011-06-09 20:56:29 -07:00
Eric House
dd97a81191 make constant string a static final rather than a resource. 2011-06-09 20:48:06 -07:00
Eric House
265ebc5e3e add download url in csse redir fails 2011-06-09 18:30:59 -07:00
Andy2
6c4f35b425 wrap parsing of new-game URI in a try so don't crash when they're 
badly formatted.
 2011-06-09 06:49:55 -07:00
Andy2
e097b15071 room names are user-created and need to be URLEncoded to e.g. escape 
spaces.
 2011-06-09 06:38:43 -07:00
Andy2
d43d789820 move socket creation inside Thread's run() in attempt to fix too-long 
UI freeze when deleting individual games.
 2011-06-07 20:51:26 -07:00
Andy2
cb8e162080 Progress toward getting invites going. Seems to work but is very 
clunky: email and sms both send messages with URLs that work on the
receiving end.
 2011-06-07 18:38:10 -07:00
eehouse@eehouse.org
484bb295d0 Merge branch 'android_branch' into android_invite 2011-06-06 22:08:49 -07:00
Andy2
07be547151 fix array OOB exception by avoiding the dereference. Better would be 
to remember the dict name from before "download" was chosen and always
fall back to it.
 2011-06-06 22:07:57 -07:00
Andy2
54777c8dbd catch exception (and put up a explanatory Toast) that occurs, says 
google's crash report site, when I try to launch something to handle
http and nothing can.  Maybe people are installing Crosswords on
devices that don't have browsers.
 2011-06-06 20:40:12 -07:00
Andy2
7fc267bb24 google reports a crash in warnIllegalWord that only makes sense if I'm 
passing a 0-length array of bad words.  Which should never happen, and
would be caught by asserts in a debug build, but: when there are no
bad words don't call back into the java world.
 2011-06-06 20:35:34 -07:00
Andy2
1bc70f2c8f google reports a crash in warnIllegalWord that only makes sense if I'm 
passing a 0-length array of bad words.  That in turn suggests a
screwup where a move's rejected for some reason other that a word not
being in the dictionary.  This is all supposition, and all stuff
that'd be caught by asserts in a debug build, but: when there are no
bad words don't report them -- even if the move's rejected.
 2011-06-06 20:33:10 -07:00
Andy2
f58eded796 fix (assuming diagnosis is correct) NPE crash reported on google site. 2011-06-06 20:06:59 -07:00
Andy2
53b2a3a6b5 Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/res/values/common_rsrc.xml
 2011-06-06 18:55:21 -07:00
Andy2
845b277c01 rename m_path->m_name for consistency 2011-06-06 18:44:29 -07:00
Andy2
c21a494e0b remove unnecessary setAction call. (Haven't tested if others can go.) 2011-06-06 18:32:17 -07:00
Andy2
2ce4c1417c do a better job of figuring out whether to use black or white to 
outline blank tiles.
 2011-06-06 18:28:20 -07:00
Andy2
1f664fa9e8 fix crash launching chat activity -- due to incorrect removal of URI 
code recently.
 2011-06-06 18:15:02 -07:00
eehouse@eehouse.org
b2d62f0f3d Revert "extend code for choosing whether to make arrow white or black based on" 
This reverts commit 1ef67e74eb.
 2011-06-06 18:10:05 -07:00
Andy2
37a2fa0aa1 update release notes 2011-06-06 07:02:16 -07:00
Andy2
1ef67e74eb extend code for choosing whether to make arrow white or black based on 
background to apply to blank-mark ring.  Fixes disappearing mark when
tile background gets dark.
 2011-06-06 06:52:10 -07:00
Andy2
056261fe9e up version number/strings 2011-06-06 06:49:47 -07:00
Andy2
a6a668881f Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
 2011-06-05 10:49:17 -07:00
Andy2
84572c1ed6 get rid of the other places where Uri's being used but a simple name 
is needed.
 2011-06-05 10:44:26 -07:00
Andy2
c46015c514 fix crash on K's G2X due to URI.fromFile() returning a really strange 
path.  I don't need a URI anyway as the path is now just a key for DB
lookup.  So just pass the name as an extra -- and rename variable to
reflect.
 2011-06-05 10:29:33 -07:00
Andy2
d0f0fa04ce set background color of board root view from prefs on creation and 
whenever pref color might have changed.
 2011-06-05 10:20:23 -07:00
Andy2
65efbe38c9 set background color of board root view from prefs on creation and 
whenever pref color might have changed.
 2011-06-03 23:35:06 -07:00
Andy2
f29dff4ff5 add icon for new add-game menuitem 2011-05-26 18:46:29 -07:00
Andy2
3b78bab89d sort by creation time rather than name 2011-05-20 22:55:07 -07:00
Andy2
c9be5b464c actually set the creation timestamp 2011-05-20 22:51:30 -07:00
Andy2
13e8667634 use Player %d when no default player name set 2011-05-20 06:51:13 -07:00
Andy2
3df47f8fe2 separate string for missing player 2011-05-20 06:50:38 -07:00
Andy2
815490fb87 update gi before creating summary. In case of networked game, 
incoming messages may have changed the version inside the jni
(reordered or renamed players) and we want those changes in the
summary.
 2011-05-20 06:44:06 -07:00
Andy2
d554f71e8a cleanup: move invariant out of loop 2011-05-20 06:39:39 -07:00
Andy2
a29f08616e what I meant to check in. 2011-05-19 22:53:58 -07:00
Andy2
232e4ec1e9 track missing players -- players for whom space is reserved locally 
and whose names have not yet been received from host/server -- as part
of summary.  They can be drawn differently to give a clear visual
indication which games are not in play and for which the user might
want to issue an invitation.
 2011-05-19 22:53:04 -07:00
Andy2
0b2ca44fa9 we need *name and *namef forms 2011-05-19 22:50:39 -07:00
Andy2
89911ecaa4 add server_getMissingPlayers to return a bitvector indicating players 
not yet received on device.  Meant to be included in summary.  I'm not
happy with how much code it took to figure this.  I don't know
server.c all that well any more.
 2011-05-19 22:48:21 -07:00
Andy2
0f45c26aea remove, for now, test that prevents multiple games from a single email 
so on-device testing possible.  Later need to improve the test.
 2011-05-19 06:54:46 -07:00
Andy2
362eb10d9d remove, for now, test that prevents multiple games from a single email 
so on-device testing possible.  Later need to improve the test.
 2011-05-19 06:54:27 -07:00
Andy2
7349a61f5a add market url to install and break ugly/non-localized url out of 
localized strings.xml.
 2011-05-19 06:52:42 -07:00
Andy2
4c5c435fb5 add new parameter so client always gets notified on connection 
including how many players are still missing.
 2011-05-19 05:51:00 -07:00
Andy2
0c3a6d362c when a networked game connects and is missing player, offer to invite 
someone.  Factor out code from create-and-invite path to support this.
Move invite-related strings into resources.  Still untested with
networked device (to send email.)
 2011-05-18 19:00:32 -07:00
Andy2
71afbf617c add empty view so screen is never completely blank 2011-05-18 06:28:44 -07:00
Andy2
55278ab2a2 what I meant to check in. 2011-05-17 18:44:57 -07:00
Andy2
bf4b3c3058 fix hint text to mention only one button, hide that button along with 
the text -- and make the add-game menu item actually work.
 2011-05-17 18:44:34 -07:00
Andy2
7389b3b4c8 disable the three unused name prefs 2011-05-17 18:26:53 -07:00
Andy2
0763e7d5b3 put the two dictionary settings into their own subscreen -- like 
player names.
 2011-05-17 18:20:21 -07:00
Andy2
bc3e5b5ca4 add defaults for first through fourth player names. Apply them only 
to local, non-robot players, which at the moment means only the first
will get used.  Not sure what the right strategy is now so maybe all
but the first goes away.
 2011-05-17 18:12:23 -07:00
eehouse@eehouse.org
574194cb4f Merge branch 'android_branch' into android_invite 2011-05-16 19:38:25 -07:00
Andy2
9cc2dfca34 include language in set-default-dict message to reinforce connection 
between dict and language.  I really want to lock the two defaults --
force to change both if one is a different language -- but am not sure
it that's easy enough to do quickly (for next beta.)
 2011-05-16 17:58:31 -07:00
Andy2
903b412046 add note that storage location decision isn't permanent 2011-05-16 17:37:52 -07:00
eehouse@eehouse.org
2fae0842c4 Merge branch 'android_branch' into android_invite 2011-05-16 06:44:04 -07:00
Andy2
740c5dd46c up constants and change message for new release 2011-05-16 06:43:42 -07:00
Andy2
6b4320e727 start to fill in text for new-game dialog. 2011-05-16 06:35:49 -07:00
Andy2
3762fc07d1 express size in K (rounding up) 2011-05-15 08:02:06 -07:00
Andy2
94f582cdc0 switch size and wordcount columns 2011-05-15 08:01:36 -07:00
Andy2
332767105c express size in K (rounding up) 2011-05-15 07:37:29 -07:00
Andy2
7ccacdc26d switch size and wordcount columns 2011-05-15 07:28:10 -07:00
Andy2
a89d81587d Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-05-14 11:54:31 -07:00
Andy2
53f1bc8858 fix to use positional params in format strings 2011-05-14 11:44:13 -07:00
Andy2
ba6968c937 remove strings no longer used 2011-05-14 11:29:05 -07:00
Andy2
c996e98624 replace two menuitems, default-robot and default-human, with a single 
that invokes a dialog giving an explanation and three choices: robot,
human and both.
 2011-05-14 11:04:19 -07:00
Andy2
54a793f6c2 fix to use positional params in format strings 2011-05-14 10:25:58 -07:00
Andy2
6ee8c171be implement moveDict and redraw row with new location if successful. 2011-05-14 10:12:30 -07:00
Andy2
aedc3c6cdc fix title -- not showing wordcount any more 2011-05-14 10:10:24 -07:00
Andy2
f914a15b97 comment field GONE by default; revealed when used 2011-05-14 10:07:34 -07:00
Eric House
c99093fb35 Merge branch 'android_branch' into android_invite 2011-05-11 22:04:06 -07:00
Andy2
fe1bec74f5 add context menuitem to move dicts, dialog to confirm, and call 
stubbed-out method to do the actual move.  Still need a title and to
inval so gets redrawn (and to implement the actual move.)
 2011-05-11 19:01:13 -07:00
Andy2
644100a005 Add generic Object cache to work around being unable to subclass an 
object that's defined in a layout file (class cast to the subclass
fails, as you'd expect.)  Will use this to cache a dict's location.
Eventually there needs to be a DB for dict details.
 2011-05-11 18:59:41 -07:00
Andy2
e51b6f3322 add dict's locations to display 2011-05-11 18:07:07 -07:00
Andy2
19ed409dda add notion of dict location, method to get it, and rewrite a couple of 
others to use that.
 2011-05-11 18:06:43 -07:00
Andy2
7d38a629b5 add comment field to XWListItem and its layout. Get elements by id 
rather than position.
 2011-05-11 18:05:41 -07:00
Andy2
8b130521fa Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-05-10 18:55:13 -07:00
Andy2
b4b54c5fb9 quick hack to open up all groups. Need eventually to remember how 
user sets 'em.
 2011-05-10 18:52:47 -07:00
Andy2
ec1e8674ec replace placeholder language names with empty strings so, maybe, can 
elect not to display
 2011-05-10 18:36:48 -07:00
Andy2
782a9f1f70 get rid of strings that don't seem to be used anymore. Still need to 
pull from localized files.
 2011-05-10 18:36:04 -07:00
Andy2
af96e184d7 don't refresh public room names when game is locked. 2011-05-10 18:34:39 -07:00
eehouse@eehouse.org
bad8a5e19b Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-05-10 18:30:00 -07:00
Eric House
dd27a0ebcd first cut at script to do stuff with xml string resources, e.g. find strings that aren't used 2011-05-10 18:26:54 -07:00
Andy2
8a8e1c9db0 remove no-op method and call of same 2011-05-10 18:25:27 -07:00
Andy2
472ffd02bf fix getting wrong networked window title even when configuring a 
non-networked game.  And remove no-op method call.
 2011-05-10 18:24:57 -07:00
Andy2
75e41caf90 go back to using XWListItem (with its delete-me X) and get rid of 
delete context menu item.
 2011-05-10 06:31:09 -07:00
Andy2
2dbf1ac489 add formatted=false to postpone fix suggested by new version of SDK 2011-05-10 06:27:58 -07:00
Andy2
085748e201 hook up context menus, and add a delete item to replace the 
checkboxes.  Still need to disable it when dict is built-in.  And
maybe add a different menu for languages.
 2011-05-09 18:59:51 -07:00
Andy2
c990900913 cache list of langs. Performance is otherwise abysmal. May need to 
add mechanism to notify when the list is invalidated.  (Or move
caching into DictsLangCache class.)
 2011-05-09 06:49:45 -07:00
Andy2
a559fdaae9 use a built-in layout for top-level rows to get the expander drawn right. 2011-05-09 06:32:30 -07:00
Andy2
9dfcb2dda2 first step toward using an expandable list for dicts browser, with 
languages as first-level items each containing all of the dictionaries
in that language.  This is a snapshot: it's broken visually and
functionally.
 2011-05-08 22:50:42 -07:00
Andy2
129a9e97ef fix compile error 2011-05-06 19:01:15 -07:00
Andy2
d407880dc1 complete the work of handling an incoming intent sent via a 
new-game-invite URI.  Seems to work, but requires two devices to test.
 2011-05-06 18:56:30 -07:00
Andy2
249402758a add new activity for starting a new game. Has four buttons and 
(eventually) explanatory text.  Currently more-or-less works,
including sending an email with a link that when clicked launches
Crosswords.  (Still need to respond to that link on receipt, but I'm
at least pulling out the necessary fields.)
 2011-05-06 06:52:10 -07:00
Andy2
77bf5e2d36 php file to be run on server to enable via redirection clickable links 
in SMS app that will launch Crosswords.
 2011-05-06 06:49:43 -07:00
Andy2
f05e02144c move setting gameID (if not already set) to creation of C version of 
the struct so it always happens, and also set it back into the java
version at the same time.  Makes creation of new games easier.
 2011-05-06 06:47:44 -07:00
Andy2
2294159c7c change sufficient to get a custom scheme in browser to launch me. Had 
to duplicate an activity element which is bad and maybe won't work
everywhere so try to fix this.  But this *does* work in 2.2 emulator.
 2011-05-04 19:04:02 -07:00
Andy2
4d31c9cbe5 update release notes 2011-05-03 18:55:51 -07:00
Andy2
a87f90b6e9 up version for b26 2011-05-03 18:47:16 -07:00
Andy2
b4bfea0d93 handle missing-dict downloads through DictsActivity too. Now 
everything routes through that class via static methods that kick the
activity off if needed.
 2011-05-03 18:25:46 -07:00
Andy2
6e973ba48d tweak wording 2011-05-02 18:40:35 -07:00
Andy2
0b7891ad8f look in sd dir too when asking if file exists 2011-05-02 18:33:19 -07:00
Andy2
d11ef3c390 From game config's download-more spinner items, launch DictsActivity 
rather than a separate download.  This uses DictsActivity's query for
where the downloaded item should be stored.
 2011-05-02 08:04:04 -07:00
Andy2
7cf412dd50 implement test for presence of external storage; don't crash if not present. 2011-05-02 07:39:07 -07:00
Andy2
5886f0ed85 cleanup; use dialog id from the right range. 2011-04-30 15:23:36 -07:00
Andy2
0171d0ccb2 inval new file from main thread after async task finished. Seems to 
prevent attempts to read file while it's still being written (but only
on external storage.)
 2011-04-30 15:23:14 -07:00
Andy2
e1e181949e offer user a choice between using internal and external storage when 
downloading dicts.  Still to do: check if external is available before
offering; and either remove ability to download from within config
dialog or offer that choice there.  Or just use a preference to
determine where storage happens.  Also, on emulator game hangs during
download when using external storage.
 2011-04-30 14:28:35 -07:00
Andy2
8caefef406 test for null lock. Market reports a NPE that this fixes, though it 
can only happen if an onClick handler gets called after onPause().
Assuming that's true, this fixes it.
 2011-04-29 18:58:02 -07:00
Andy2
f53f2dd224 remove GameConverter -- it's been months 2011-04-29 06:40:00 -07:00
Andy2
e89c6f94b6 update with changes since b24 2011-04-29 06:39:34 -07:00
Andy2
d49a20867a new default robot dictionary 2011-04-29 06:25:16 -07:00
Andy2
deeb2f3cba fix compile-command 2011-04-29 06:24:41 -07:00
Andy2
61c33ca783 new smallish English dictionary. See the Makefile for origins. 2011-04-29 06:24:25 -07:00
Andy2
02f23ac1ec In list item loading async task, don't wait on lock. Give up if it's 
not available and wait to be called again.  Fixes occasional assertion
failure when lock held for even five seconds.  Screen jerks around a
bit but otherwise seems to work well.
 2011-04-28 21:08:24 -07:00
Andy2
ba026f761d get rid of unused parameter 2011-04-28 18:47:16 -07:00
Andy2
2572af039d fix NPE by refusing to calc font info when don't have char set, and by 
resusing to draw when don't have font info.  Until other bugs got
fixed this must meant lots of all-white boards, and it's not strictly
necessary, but is an improvement.
 2011-04-28 18:43:18 -07:00
Andy2
09100dcb2c track lang code of last dict sent and don't send repeats. 2011-04-28 18:41:39 -07:00
Andy2
3b3a822dcc a gmae may have several dictionaries in several places, but all should 
share the same language.  So pick one to send to draw_dictChanged
rather than sending all (some of which may be null.)
 2011-04-28 18:40:44 -07:00
Andy2
2886458814 assign dicts in constructor. Makes new games have the right dicts 
even if not configured after, assuming defaults are set.
 2011-04-27 06:51:30 -07:00
Andy2
9013897a5a assign dicts as soon as language is changed. 2011-04-27 06:39:52 -07:00
Andy2
399fc081d7 add menuitem to set default robot dict. 2011-04-27 06:38:45 -07:00
Andy2
17fd65fb2d list cur value for robot dict too 2011-04-27 06:38:07 -07:00
Andy2
0c9d33da3f Add infrastructure to sort dicts by wordcount so robot can have 
smallest and human largest.  Sorting works.  Still need to fix when
new dicts get assigned after lang change -- too often all players wind
up inheriting the default.
 2011-04-26 18:59:11 -07:00
Andy2
a5fd4cef30 move setRemoveOnDismiss into delegate, and call it from a dialog 
that's been crashing when called from performRestoreInstanceState.
The hope is that this will prevent the crash by forcing the dialog to
always be recreated.  But it may be that I just need to test for
m_missingDictNames being null....
 2011-04-26 18:26:21 -07:00
Andy2
83f2882589 what I mean to check in (without commented out stuff) 2011-04-26 06:43:06 -07:00
Andy2
4113d92be7 need to replace the main dict too 2011-04-26 06:41:31 -07:00
Andy2
33c81ec7ec check for null to fix NPE. 2011-04-25 21:08:51 -07:00
Andy2
7a5920e9f2 use game dict if no player dict (to avoid NPE) 2011-04-25 21:01:15 -07:00
Andy2
ecc5357ef8 up version info, and collapse two locations into one resource entry. 2011-04-25 20:46:23 -07:00
Andy2
024f7e0541 per-gi dictName matters again: preserve it, include it in lists passed 
to jni, and don't bother to assign a per-player dict when it'd be the
same as the game dict.  Allows many games to have just the one, and
also fixes problems opening games saved with older versions.  Duh.
 2011-04-25 20:24:56 -07:00
Andy2
af08b2e5b0 add a couple of asserts 2011-04-25 20:17:54 -07:00
Andy2
bf67a88c5a expect the array of dicts passed to include the game dict (as part of 
changes to always have a game dict and to have player dicts only when
they're different.)
 2011-04-25 20:16:38 -07:00
Andy2
6aa0d38c45 don't call through to java draw_dictChanged unless it's for the main 
game dict.
 2011-04-25 20:15:34 -07:00
Andy2
9d973cca15 load summaries for game list items via async tasks whenever a cached 
View isn't present.  Fixes failure to redraw after changing language,
and also should speed inital load.  Needs testing.
 2011-04-23 22:58:11 -07:00
Andy2
e9fadd4d96 Rework list item code to deal with when the summary isn't available: 
have update icon hidden by default, and print the game name (which we
know.)
 2011-04-23 18:19:35 -07:00
Andy2
20ec6dd011 Avoid relocking game after downloading: don't set lock checkbox 
in onResume() unless it's the first time through.
 2011-04-23 07:51:31 -07:00
Andy2
3c30cbd23a move ownership of language and dict lists used in spinners into 
DictLangCache where they can be updated when a dict is added via the
"download more..." item (inclusion of which is a hack.)  Now as soon
as you return to the spinner after downloading you'll have the new
dict or lang to choose.
 2011-04-23 07:39:56 -07:00
eehouse@eehouse.org
325ac65c05 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-04-21 18:44:46 -07:00
Andy2
60922baf72 bunch of changes moving UI from using one dict per game to one per 
player: remove dictName from CurGameInfo and GameSummary classes and
from DB; deal with missing dicts (the warning, fetching and replacing)
when opening games and deleting dicts.  Etc.  Trivial testing passes.
 2011-04-21 18:37:11 -07:00
Andy2
3970a3ef8a no need to make new string to copy since they're immutable 2011-04-21 18:35:10 -07:00
Andy2
c814226a08 get rid of gi.dictName: don't pass it across the jni boundary 2011-04-21 18:29:37 -07:00
Andy2
4e7570020f remove mistaken (I think) assert 2011-04-20 22:13:44 -07:00
Eric House
1ab5aa02b9 Makefile for new dict containing 4288 words: good for the robot. 2011-04-14 22:09:44 -07:00
eehouse@eehouse.org
5a21aea2e5 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-04-13 06:58:58 -07:00
Eric House
3cc105da0b add ability to dump board (model) as text, protected by ifdef that 
will likely only get set on Linux.  Uses lower-case to designate
blanks.  For that and maybe string size assumptions is very broken for
non-ascii languages, including Spanish.
 2011-04-13 06:45:22 -07:00
Eric House
0474fda127 reverse (back) sense of show-other option 2011-04-13 06:41:49 -07:00
Eric House
baedbdff2c remove logging 2011-04-12 22:17:56 -07:00
Eric House
92ac25ed3f don't require MAX_NUM_PLAYERS==4 2011-04-12 22:17:45 -07:00
Andy2
002bb40a09 report counts/values using language rather than dictionary name. To 
support that, pass lang name from java into jni.
 2011-04-11 18:55:42 -07:00
Andy2
40116d792f format "game_name (lang)" using string in resource. 2011-04-11 18:52:10 -07:00
Andy2
3c0cf176ef show language as part of game name, not dict as separate line 2011-04-11 06:54:31 -07:00
Andy2
3fb368692c dammit -- proofread those checkins! 2011-04-11 06:52:07 -07:00
eehouse@eehouse.org
819adbe236 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-04-11 06:43:00 -07:00
Andy2
c6cd60deef Save and restore per-player dicts; load games that have 'em correctly. 
Robots default to BasEnglish dict and humans to CollegeEng.  Add new
per-game default for robot dict.  Still need to deal with language
changes and non-English case in general.
 2011-04-11 06:42:17 -07:00
Andy2
96254ad8b5 when opening saved game, notify draw of per-player dicts as well as of 
a single game-wide one.
 2011-04-11 06:39:31 -07:00
Andy2
092dfdd590 not supposed to be checked in with debugging on 2011-04-11 06:33:31 -07:00
Andy2
2b3398e6a2 pass Context in constructor rather than to methods that need it 2011-04-11 06:31:48 -07:00
Andy2
dc70db5ba4 catch up with API change 2011-04-11 06:16:25 -07:00
Eric House
d6165deb47 anything beyond the 15th char in a bonus-square line is a comment (ignored) 2011-04-10 13:13:45 -07:00
Eric House
26eadb3b99 add commandline option to set bonus square pattern via an external 
file.  (Effects only Linux versions.)
 2011-04-10 13:04:05 -07:00
Eric House
3310645a12 test files for new bonus-squares-settable feature 2011-04-10 13:02:45 -07:00
Andy2
4272686034 Makefile for new smaller Dutch wordlist 2011-04-08 22:13:31 -07:00
Andy2
97d54c86eb snapshot: track dictName per player in addition to per game. Not yet 
used yet; need to pass into jni next.
 2011-04-08 06:50:08 -07:00
Andy2
fc4e454d92 bugfix: add background to set of colors restored. 2011-04-08 06:17:35 -07:00
Eric House
c77d3039cc add XP_FREEP. Should be no change in behavior. 2011-04-07 18:07:45 -07:00
Eric House
0ce963336a Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-04-04 16:16:09 -07:00
Andy2
55221c70b0 fix for new API 2011-04-03 21:51:51 -07:00