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

4410 commits

Author SHA1 Message Date
Andy2
b506673946 use only one thread until race condition's fixed 2011-01-19 18:36:50 -08:00
Andy2
3ae62e4704 use an index rather than a ptr to track fd array (so a parallel array 
can be added)
 2011-01-19 18:36:24 -08:00
Eric House
4202ea5fac Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-01-19 09:10:51 -08:00
Andy2
a8f4d772f8 set one timestamp when saving game, and another on game creation. 2011-01-19 06:54:23 -08:00
Andy2
7d6e136ca3 fix comment 2011-01-19 06:21:31 -08:00
eehouse@eehouse.org
a9c65aa950 Revert "add ctime and mtime timestamps to DB when creating, and upgrade to new" 
This reverts commit 465370bac6.

Better to work with the existing timestamps as ints than mess with largely unsupported TIMESTAMP type.
 2011-01-19 06:19:33 -08:00
Andy2
7f866da8da draw dragged tiles translucent 2011-01-18 22:03:17 -08:00
Andy2
46f085f479 drop rather than asserting failure when unable to create a dialog. 2011-01-18 21:19:02 -08:00
Andy2
f6b95f93a1 use HashSet rather than String[] for faster lookup. 2011-01-18 18:47:24 -08:00
Andy2
bce4a11595 more work on color prefs. Add a list pref at the same level as colors 
for setting "scheme".  Implement that as changing potentially several
colors but only empty cell color for now.  Remove prefs for whether
cell letters follow user colors (they always will) and the new one for
frame color -- it'll always be dark grey.
 2011-01-18 18:42:25 -08:00
Andy2
8d52149c28 cache the background color on which arrow is based so don't have to 
compute its blackness each time.
 2011-01-17 20:39:35 -08:00
Andy2
e9e54ba379 toward supporting a light-on-dark theme: add pref for cell border 
color; add pref for whether highlight is black-on-white or the
reverse; and remake the board arrow in white if the background is a
dark color.  It's now possible to configure various colors so that
black empty cells looks good.  Next need a single control to do it.
 2011-01-17 18:55:36 -08:00
Andy2
33d5246b7a add a new-user hint, displayed the first time the arrow's drawn on the 
board, explaining what the arrow's for and how to move and disable it.
Implementation required passing XWActivity into BoardView so the
newbie hint method could be called on it.
 2011-01-15 21:46:28 -08:00
Andy2
465370bac6 add ctime and mtime timestamps to DB when creating, and upgrade to new 
version by adding them.  Can't have them default to 'now' because
that's not supported for ADDs.  Can't remove columns either, so at
some point I'll need to migrate to get rid of accumulated cruft.
Timestamps are not set nor read yet.
 2011-01-14 19:03:08 -08:00
Andy2
c9fec737e5 changes, protected by a disabled compile-time flag, to use cairo-based 
API for drawing instead of now-deprecated gdk ones.  Unfortunately
nothing actually draws and I'm putting the debugging off until I have
some time.
 2011-01-14 18:15:33 -08:00
Eric House
04d8260f01 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-01-14 12:02:15 -08:00
Andy2
13ef8dd098 add hints-allowed to set of defaults for new games 2011-01-13 18:45:38 -08:00
Eric House
e7172fb4af Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-01-13 14:57:24 -08:00
Andy2
9ebbbb0fec replace robot smart checkbox with a spinner having three settings. 
Keep the kludge whereby the settings in all the players are kept the
same.
 2011-01-13 06:48:50 -08:00
Andy2
d2ddc5cee7 turn off tile selection for android 2011-01-12 19:01:04 -08:00
Andy2
cd5dedfa67 add compile-time flag to disable selection of tiles in tray (other 
than as part of an exchange) and to remove feature where tapping empty
cell moves selected tile there.  This is to address user confusion on
Android, and I'll ask for testing before putting this in the main
branch.  This leaves only place-arrow-then-tap as an alternative to
drag-and-drop, and may annoy people.  Worth trying: disable only the
automatic selection of another tile after the selected one is dropped.
 2011-01-12 19:00:48 -08:00
Andy2
e7dbac41a6 fix to compile with new gdk that's on ubuntu 10.10. Need to fix the 
APIs eventually.....
 2011-01-12 19:00:20 -08:00
Andy2
6ccf0c167c fix next-hint which I just broke: need to track whether working on 
behalf of robot after all, though it's not needed in the API, to
distinguish case where moves must be cached (for next-hint feature).
 2011-01-11 18:10:48 -08:00
Andy2
ceab787cdd update to work with robot-smartness changes. At this point the UI's 
unchanged and I'm trying to mimic the old per-game setting using the
new per-robot setting internally.  Still need to change the UI to
allow move than just a boolean choice.
 2011-01-10 20:46:05 -08:00
eehouse@eehouse.org
a656bb8f0c Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-01-10 18:20:42 -08:00
Eric House
2b502a39c6 fix mod-by-zero error when iq == 2 2011-01-10 18:19:10 -08:00
Eric House
b3de3fc91e add --robot-iq param for testing 2011-01-10 18:18:35 -08:00
Andy2
6495bd321f fix to compile with robotiq changes 2011-01-10 06:57:10 -08:00
Andy2
efb54c7b05 fix compile errors the stricter android compiler found. 2011-01-10 06:56:11 -08:00
eehouse@eehouse.org
09da57f165 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-01-10 06:48:25 -08:00
Andy2
f48c1cc8b2 add robot-iq param to test new common code and adapt to its API 
changes; change param from robot-name to robot.
 2011-01-10 06:46:09 -08:00
Andy2
639279f865 up the number of moves saved to 32 to match Android. 2011-01-10 06:44:47 -08:00
Andy2
f111b78714 switch from tracking robot intelligence as a per-game boolean 
implemented (when not smart) as trying to match the human's score to a
per-robot value between 1 and 100 that gives the percentage of best
moves to store before picking randomly from among them.  So a 1 means
save only the best move and always pick it; 100 means save all the
best moves (how many are saved is compile-time configurable) and pick
one of them.  Because it's settable per-robot a smarter robot can be
played against a dumber one (though I may choose not to make it
settable per-robot on shipping versions.)
 2011-01-10 06:44:28 -08:00
Andy2
fc23080120 param name has changed 2011-01-10 06:40:42 -08:00
Eric House
c7b6d799f0 switch to utf8 2011-01-07 18:05:57 -08:00
Andy2
5459631c76 No need for empty .dict when creating empty .dict.gz 2011-01-06 18:20:56 -08:00
Andy2
6f2cde1304 create an index at the top of page; indent dict lines; drop ".xwd" 2011-01-06 18:09:10 -08:00
Andy2
d3717c579e add ACCESS_NETWORK_STATE permission 2011-01-06 08:08:36 -08:00
Andy2
99c26cc0e9 move network state listener into own class so it can live longer than 
a single game (keeping network state across games launches) and be
used by other network clients later.
 2011-01-06 08:08:16 -08:00
Andy2
d832ba6795 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 
Conflicts:
	xwords4/linux/linuxmain.c
	xwords4/linux/scripts/discon_ok2.sh
 2011-01-06 07:44:33 -08:00
Eric House
720f78d18a get rid of ivars used only for http UI 2011-01-04 21:43:10 -08:00
Eric House
46e9ae3c01 up copyright date 2011-01-03 16:33:03 -08:00
Eric House
11d7de5f0d display the number of devices (pids) running 2010-12-21 20:52:01 -08:00
Eric House
64004e9df8 fix to use long-opts 2010-12-21 20:51:36 -08:00
Eric House
9ea5c7462d fix long-opts glitches 2010-12-21 20:51:21 -08:00
Andy2
7fe5e43963 modify to use new long-only flags 2010-12-21 08:02:51 -08:00
Andy2
63e7084cc8 fix a couple of the new options 2010-12-21 08:01:44 -08:00
Andy2
a7aabdc41b use getopt_long_only and a table to make adding params easier, fix 
running out of letters, and force better usage.
 2010-12-21 00:58:02 -08:00
Andy2
2cc46d8a69 get rid of unused but oft-included file 2010-12-17 19:02:01 -08:00
Andy2
ff6fb7070e Android market reports a few crashes going out-of-bounds on array of 
bad words.  Add an assertion on the only path that seems likely to be
causing that.
 2010-12-17 18:57:43 -08:00
Andy2
0ee156c9f0 add empty: case for WINCE type too 2010-12-17 18:55:44 -08:00
Andy2
c0bec75fd8 fix crash when input wordlist is empty by not counting zero-length 
word as a word.
 2010-12-17 18:55:25 -08:00
Andy2
53de4eab9b correctly detect empty dict and set top ptr to null. Fixes crash 
using empty dicts.
 2010-12-17 18:54:27 -08:00
Andy2
c5e0955460 simplify build rule 2010-12-17 17:39:33 -08:00
Andy2
7e46163988 add counts and values -- from wikipedia article, as are Arabic and 
Turkish files just checked in.
 2010-12-17 17:38:47 -08:00
Andy2
18f8b0d4e4 switch to utf-8, adding an iconv call to translate the wordlists. 2010-12-17 17:37:57 -08:00
Andy2
32fccca995 Turkish. As with Arabic, untested. 2010-12-17 17:36:38 -08:00
Andy2
71559e27c6 add Arabic. I have no wordlist but this should still allow play 
between humans, even over the net.  Untested, though, as my phone
doesn't have any Arabic glyphs.
 2010-12-17 17:36:03 -08:00
Andy2
1535f56cd6 adding Turkish and Arabic and language names 2010-12-17 17:34:54 -08:00
Andy2
7e0f025d9e remove logging 2010-12-17 06:51:56 -08:00
Andy2
3336b39d6d add (wordcount) to subst title to make meaning more clear 2010-12-16 20:29:48 -08:00
Andy2
ea85512c4f put word count into list of dicts for substitution. Done by adding 
actual count then stripping it back off to form the dict name again.
 2010-12-16 20:24:04 -08:00
Andy2
0059f92626 use medium sized text for empty view 2010-12-16 18:50:15 -08:00
Andy2
693909ec67 add an empty view along side list view; all setEmptyView to install it 
to be shown when list is empty.
 2010-12-16 18:47:25 -08:00
Andy2
740060f531 remove logging 2010-12-16 18:45:46 -08:00
eehouse@eehouse.org
f0c31956d2 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-16 06:41:30 -08:00
Andy2
95a6982851 use new overridden method 2010-12-16 06:38:47 -08:00
Andy2
993e66da99 add newbie info on launch of dicts activity (and override method so 
don't have to pass null)
 2010-12-16 06:37:05 -08:00
Andy2
6cd22f6461 add newbie info on launch of dicts activity 2010-12-16 06:36:25 -08:00
Andy2
16933d14c1 fix list item layout to have variable height so it doesn't clip dict 
listings that wrap to a second line -- e.g. the Spanish_FAA ones.
 2010-12-16 06:24:47 -08:00
Andy2
647443c03e reintroduce BroadcastReceiver listening for connectivity going up and 
down.  When network's down, return -1 from send proc so that comms
timing can retry.  This works on both cellphone on carrier network
(with airplane mode as the test for loss/gain of network) and on
emulator (with death/restart of relay as the test since I don't know
how to kill the iface itself).  A quick test on phone using wifi this
morning suggested it didn't work, that into/out of airplane mode did
not result in notifications getting set.  Need to test that, and back
this out if can't be fixed since I can't break wifi.
 2010-12-15 18:39:25 -08:00
Eric House
a663b2deae Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-13 22:08:11 -08:00
Eric House
442b3983cf highlight during draw where possible because doing it after isn't 
possible with wide chars -- meaning I haven't figured out how yet.
ncurses documentation is well hidden....
 2010-12-13 22:07:25 -08:00
Andy2
d1605c4493 fix: convert to utf8 and replace grep that didn't work (presuambly 
because ranges have different meanings in utf-8) with one that does.
 2010-12-13 20:39:04 -08:00
Andy2
d78584fddf remove obsolete, pre-utf8 files 2010-12-13 20:09:26 -08:00
Andy2
bb0a79914b add conversion from ISO88591 since the default dict's in that format. 2010-12-13 20:09:09 -08:00
Andy2
dc807c948a use sed instead of tr since as with Slovak a letter was getting 
dropped.  Same one in fact.
 2010-12-13 19:58:37 -08:00
Andy2
cd3ff71efb notify comms layer when unable to establish connection. This allows 
comms logic to retry and fixes failure on device to detect when
network comes up after being down when game was opened.
 2010-12-13 18:30:22 -08:00
Andy2
299c84bb2b use sed rather than tr to uppercase letters. tr was dropping the Á 
letter for some reason.  The sed feature I'm using is a gnu extension
but has the advantage of working.  Should probably do this for all
languages and in the info files.
 2010-12-13 18:16:22 -08:00
Andy2
23a4a7ef64 get rid of unused/stubbed out method 2010-12-13 06:37:26 -08:00
Eric House
2807ee2ce0 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-12 20:50:35 -08:00
Eric House
894afdc0cb take words up to 15 letters long. This makes no difference with any 
dict I've tried as there just aren't any words over 7 letters long
made up of only a-f.
 2010-12-12 20:02:28 -08:00
Eric House
e8e0b25fad go back to old dict -- correcting a change I didn't mean to check in. 2010-12-12 20:01:33 -08:00
eehouse@eehouse.org
9140c8b39a Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-10 05:43:31 -08:00
Eric House
9c5b2c9f4f add for current French list 2010-12-09 21:22:37 -08:00
Eric House
98456dd652 fix to build dicts, wince/android format by default 2010-12-09 21:22:14 -08:00
Eric House
6b58c9031f script to build html page for downloading dicts 2010-12-09 21:21:41 -08:00
Andy2
183d920eb0 update changelog for beta 20 2010-12-09 07:41:43 -08:00
Andy2
1fbdd62372 up version num/strings 2010-12-09 07:21:56 -08:00
Andy2
c4fa9cb707 exit loop rather than trying to use key again after cancelling it. 
Fixes CancelledKeyException raised when launching networked game in
airplane mode.
 2010-12-09 06:58:55 -08:00
Andy2
d5d81fea5b don't return dialog when msgID is 0. This should fix occasional crash 
where OS wants to restore a dialog but the message ID has gotten
cleared -- via a mechanism I'm not quite clear on.
 2010-12-08 18:52:08 -08:00
Andy2
a1c96b5601 change default dict download url so new set can coexist with old and 
get picked up only by new release that can handle it.
 2010-12-08 18:47:21 -08:00
Andy2
65ea075102 when downloading new dict inval the info cache to it'll get reloaded 
-- in case we're overwriting one with the same name.
 2010-12-08 18:46:25 -08:00
Andy2
1b40d1d47b make method public to be used outside 2010-12-08 18:45:31 -08:00
Andy2
5534939407 add inval() to prevent stale data when new dict downloaded over top of 
old.
 2010-12-08 18:44:59 -08:00
Andy2
c83e4cc7a3 all places where dict lang is displayed can also display word count 2010-12-08 05:51:26 -08:00
eehouse@eehouse.org
64bcb8bb2b Revert "replace call to rand() with android_only function that reads two bytes" 
This reverts commit 1653b9f6e9.
 2010-12-08 05:38:41 -08:00
Eric House
efe6d6d95d Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-07 20:47:19 -08:00
Eric House
b65338b643 script for use on relay host 2010-12-07 20:46:02 -08:00
Andy2
3987749079 log calls to set-not-again. I'm getting crashes and that may help 
track it down.  Remove this later.
 2010-12-07 18:57:38 -08:00
Andy2
4a12f7a96f Revert "in attempt to work around non-random rand() in jni world, call back" 
This reverts commit 99c92e779d.

Conflicts:

	xwords4/android/XWords4/jni/utilwrapper.c
 2010-12-07 18:43:53 -08:00
eehouse@eehouse.org
57bfe4c943 Revert "switch from nio to regular old io, with separate reader and writer" 
This reverts commit b23de9a958.
 2010-12-07 18:12:35 -08:00
eehouse@eehouse.org
b389478350 Revert "register for notification of network going up and down; start using" 
This reverts commit 77fe3952da.
 2010-12-07 18:12:02 -08:00
Eric House
eb22322e8d change title until we have column headers 2010-12-06 21:08:38 -08:00
Eric House
2a0151baf7 add BasEnglish dictionary. 2010-12-06 21:08:15 -08:00
Eric House
4ac4b37619 Merge remote branch 'maidu/android_branch' into dawg_fixup 2010-12-06 21:05:41 -08:00
Andy2
77fe3952da register for notification of network going up and down; start using 
that information to connect and not.  There seems to be no way to get
notified when a socket's underlying transport goes down (might not
even want to) so this will be the best way to have the arrows go red
when the device goes into airplane mode.
 2010-12-06 20:19:17 -08:00
eehouse@eehouse.org
fcd179f6b7 Merge remote branch 'origin/android_branch' into dawg_fixup 2010-12-06 18:50:13 -08:00
Andy2
39b40a9a3d build with a header giving word count 2010-12-06 18:31:12 -08:00
Andy2
74fc103e9d opt for the long form of annotated name (includes word count) 2010-12-06 18:28:00 -08:00
Andy2
ad829b74f7 cache DictInfo rather than just lang code; add method that formats 
name with lang and count.  Ideally the dict display would be a table,
but it's not trivial to switch from a list to scrolling table.
 2010-12-06 18:27:00 -08:00
Andy2
f50e6b3f1b turn dict_getLangCode into dict_getInfo, adding a struct that contains 
lang code and new word count.
 2010-12-06 18:25:23 -08:00
Andy2
e4999acc98 add dict_getWordCount() 2010-12-06 18:24:31 -08:00
Andy2
ff9e03ef4b read rather than just skipping word count 2010-12-06 07:30:28 -08:00
Andy2
91c04d3267 switch to new format (with header giving word count) 2010-12-06 07:26:47 -08:00
Andy2
12508b7cd5 cleanup stderr output 2010-12-06 07:23:22 -08:00
Andy2
0072112b5a fix syntax for including newheader so only one gets included. Fixes 
bug building multiple dicts where headers would accumulate.
 2010-12-06 07:23:05 -08:00
Andy2
e2bb50ef62 skip new header if present 2010-12-06 07:22:07 -08:00
Eric House
c4cdc24b78 initial changes to add a header to xwd format so that stuff like 
number of words can be included.  Changed to build dicts and linux to
open them.  Android still needs to learn.  Also, some of the tools in
dawg/ need to be fixed to read old-format (pre-utf8) .xwd files.
 2010-12-05 19:33:10 -08:00
Eric House
eff2324950 fix compile command 2010-12-05 19:30:00 -08:00
Eric House
bef1e125bf ignore .pdb files 2010-12-05 19:29:15 -08:00
Andy2
b23de9a958 switch from nio to regular old io, with separate reader and writer 
threads.  Greatly simplifies things, but only tested for the simplest
case, and I know it won't correctly reconnect when relay goes down.
But folks recommend against nio, and I'd like to see if I'll get
notifications in the form of blocking socket calls returning or
raising exceptions when the network goes down, something that isn't
happenening with nio.
 2010-12-03 18:48:14 -08:00
Andy2
fda21e8d15 save room and player names if leaving simple config dialog via the 
advanced config button (but still drop if back button hit.)
 2010-12-03 06:44:34 -08:00
Andy2
426f990156 fix infinite loop creating networked game: util_rand() can't call into 
java in some cases so needs to fall back to returning rand().
 2010-12-03 06:43:40 -08:00
eehouse@eehouse.org
ddaa368af3 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-02 22:38:16 -08:00
Andy2
984a5d6154 Fix yet again what shouldn't have been checked in. 2010-12-02 22:37:21 -08:00
Eric House
9fd4229384 pass host to rq too 2010-12-02 22:34:59 -08:00
Eric House
328fe7d6dc Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-02 22:31:34 -08:00
Eric House
d1244da284 script encapsulating sql query that's useful to run (with 'watch') along with discon_ok2.sh 2010-12-02 22:29:36 -08:00
Andy2
99c92e779d in attempt to work around non-random rand() in jni world, call back 
into the java world by making it a util_ctxt function.  Do same on
linux to test.  We'll see how it is -- and can back this commit out if
there's no improvement.
 2010-12-02 19:02:36 -08:00
eehouse@eehouse.org
c4a4a39438 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-12-02 05:56:26 -08:00
Eric House
ae9dbd1e5c create mtimes array rather than mtimes timestamp 2010-12-01 21:09:25 -08:00
Eric House
4bd5553596 track mtime per host rather than per game -- make it an array in the db. 2010-12-01 21:08:22 -08:00
Andy2
2e956e2f6e debug is not supposed to be checked in turned on 2010-12-01 18:13:55 -08:00
Andy2
e89feb62d8 second part of manual merge of unicode_branch's dawg/ directory into 
this one.  This adds the directories and their files created inside
dawg.
 2010-11-30 18:38:05 -08:00
Andy2
79990bc7b1 first set of changes formed by applyinig diff of android_branch's 
dawg/ directory against unicode_branch's.  The two branches seem to
have to common ancestor -- probably didn't survive translation from
svn -- so this is the best I can do.

This checkin is all the files that were modified by the patch plus a
couple of simple additions.  Next I'll be adding directories that the
patch created.  It also reintroduced a bunch of .cvsignore files; I
won't check those in.
 2010-11-30 18:35:11 -08:00
Andy2
78be732c64 use min of score ht and cell width for network status icon. Fixes 
problem on 600x800 devices where the icon overlaps the board.
 2010-11-30 18:21:28 -08:00
Andy2
a5c36f37a4 new strings for dict substitution 2010-11-30 06:37:23 -08:00
Andy2
d086dad34e Since you can't add/remove buttons in onCreateDialog(), add a new one 
to use when there are other dicts available in the same langauge as
the missing one that offers to substitute, and another dialog
presenting a list of same-language dicts.  Then substitute the one
tapped.
 2010-11-30 06:37:01 -08:00
Andy2
3a9eb72db3 add static methods to count and list dicts in a given langauge. 2010-11-30 06:34:57 -08:00
Andy2
1653b9f6e9 replace call to rand() with android_only function that reads two bytes 
from /dev/urandom.  rand() has been returning pretty crappy numbers
resulting in lots of clustering of tiles in trays.  Let's see if this
is any better.
 2010-11-29 17:12:12 -08:00
Andy2
b4fb57de9c move thread inside so it can be started and stopped. And exit the 
thread on failure to connect, allowing comms' timer to control when we
retry.  This fixes problem where would try multiple times/second to
connect when relay was down.  Now we try every 15 seconds (per comms,
which can as well back-off), and shortly after the relay comes back up
connect successfully.
 2010-11-24 18:14:34 -08:00
Andy2
8623c569e7 move game data from separate files into a BLOB column in the existing 
summaries db table, using the existing SNAPSHOT column rather than
adding a new one and upping the version.  Includes utility fired at
game-start to convert existing games that seems to work.  Also
improved a few queries and updates to -- I think -- use the API
better.
 2010-11-24 17:22:46 -08:00
Andy2
be35d875b2 move game data from separate files into a BLOB column in the existing 
summaries db table, using the existing SNAPSHOT column rather than
adding a new one and upping the version.  Includes utility fired at
game-start to convert existing games that seems to work.  Also
improved a few queries and updates to -- I think -- use the API
better.
 2010-11-24 17:22:04 -08:00
Andy2
7c96048ba2 add, but comment out because it requires user permission, code to 
notice when cellular data becomes available and notify relay of dead
games then.  Must be a way to notice a network interface cellular or
not without permission since I already have permission to use it.
 2010-11-23 19:01:32 -08:00
Andy2
c3f43dd26c when deleting all games don't inform relay until after the last one so 
a single connection does it.
 2010-11-23 18:28:05 -08:00
Andy2
5bf87b3bea add function to invoke rq once for all the relayIDs in the set of 
devices making up a game.  Actually using it make the script fail for
some reason and so it's commented out, but it helped to debug the
relay.
 2010-11-23 18:12:11 -08:00
Andy2
0bbf7272aa don't create thread if there are no obits in the db -- makes it 
cheaper to call when there may be nothing to do.
 2010-11-23 18:10:51 -08:00
Andy2
7c8622392d send the list of saved deleted relayID/seed pairs off to the relay and 
remove them from db when relay reports success.  TODO: relay always
reports success even if some are malformed and it's aborted parsing.
 2010-11-23 17:56:17 -08:00
Andy2
1720fbbd50 fix parsing of relay ids by replacing separating \n with \0. 2010-11-23 17:46:16 -08:00
Andy2
111c59dd30 toward having game deletion get reported even if network isn't live at 
the moment: create new "obits" table and put dead game info in it.
Change constant for current table name to be less generic.
 2010-11-23 06:44:59 -08:00
Andy2
2127394260 don't allow resignations below a certain point -- which happens to fix 
divide-by-zero error.
 2010-11-22 20:44:28 -08:00
Andy2
daecc807c1 don't init nPerDevice, and deal with it not being inited. 2010-11-22 20:43:37 -08:00
Andy2
eebf5f1252 remove the big dictionary. Ideally I'll figure out how to gracefully 
allow to switch without downloading before the next beta.
 2010-11-22 18:24:37 -08:00
Andy2
983906810c set dropdown view resource on public rooms spinner -- fixes problem 
where it was drawing super-small.
 2010-11-22 07:39:18 -08:00
Andy2
3ee3af8881 init crosshairs correctly so 0th column and row aren't drawn short. 2010-11-22 07:04:51 -08:00
Andy2
edab239060 add one more change 2010-11-21 20:12:45 -08:00
Andy2
ead21206e0 up version to 5 not 6 since prev beta was at 4. 2010-11-21 20:12:34 -08:00
Andy2
7d164f2389 complete list of changes 2010-11-20 21:19:56 -08:00
Andy2
d23dc4aee5 No need to use CurGameInfo for any game summary fields since it's all 
in the summary db now.  Saves opening the game itself just to show it
in a list.
 2010-11-20 20:37:01 -08:00
Andy2
985c3d586c move gameslist summarizing methods from CurGameInfo to GameSummary. 2010-11-20 20:34:41 -08:00
Andy2
b3b9742cdf add serverrole and players summary to summary db 2010-11-20 20:34:00 -08:00
Andy2
a9a1076d02 actually delete dict when no games use it. 2010-11-19 21:47:38 -08:00
Andy2
b2e418436d tweak string 2010-11-19 21:09:36 -08:00
Andy2
e38ac33e00 move dict-missing dialog from DlgDelegate into GamesList because 
that's the only place that is or should be calling it.  And since we
can usually figure out the exact url for the dictionary go ahead and
try to download that.
 2010-11-19 21:08:09 -08:00
Andy2
0578a0e4f6 When deleting dictionaries, just do it unless the dictionary's in use 
in which case tell user how many games are using it when asking for
confirmation.  To do that, add dict into summary DB, and to do that
add CurGameInfo into GameSummary's constructor.  Also, when there's no
summary for a game, make one on the spot and add it to the db.  This
will crash if the game's dict has been deleted.  Need to deal with
that, probably by deleting unsummarazible games, becuase now if
somebody installs this on top of a device where a game's dict is
missing and it has no summary I'll never boot.
 2010-11-19 18:37:00 -08:00
Andy2
586b211b04 add dict name and language to summary database. Probably eventually 
want to move everything for the display here -- and maybe the file
contents too as a BLOB.
 2010-11-19 18:24:56 -08:00
Andy2
71059e6dff remove nPlayers from game_summarize 2010-11-19 18:23:34 -08:00
Andy2
92940e6638 add model_getNPlayers() 2010-11-19 18:22:39 -08:00
eehouse@eehouse.org
d261aa8184 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-11-18 22:42:43 -08:00
Eric House
a1caaeb183 simulate games being deleted before they're finished 2010-11-18 22:27:46 -08:00
Eric House
7a2d279308 add logging so script can better track what state relay game is in 2010-11-18 22:27:06 -08:00
Andy2
43be0183a5 just assert that dict can be opened as part of opening game. GamesList 
is now responsible for not launching a game if its dict is gone.
 2010-11-18 19:05:22 -08:00
Andy2
3eb8b723de don't assume no-dict dialog should call finish on its calling 
Activity() on exit -- we're not letting the Activity launch any more.
 2010-11-18 19:04:43 -08:00
Andy2
198534dce3 check if dict missing and warn rather than do anything that will crash 
if it's not there.  Ideally I could open the config dialog so user
could change the dict but that isn't working.  Maybe just offer to
open it after swapping in the default dict?
 2010-11-18 19:00:49 -08:00
Andy2
7921ddca10 don't crash when asked to reset a game whose dict has been deleted. 2010-11-18 18:52:04 -08:00
Andy2
163c124072 update for b19 2010-11-17 06:13:31 -08:00
Andy2
fc88742978 up constants for b19 2010-11-16 21:06:43 -08:00
Eric House
b91187d6a5 test result when parsing; drop if didn't parse 2010-11-16 20:30:43 -08:00
Eric House
f33466b6db exit with non-0 on failure so calling script/loop can exit too 2010-11-16 20:29:55 -08:00
Eric House
4c6c3c1ded when marking a device in a dead game, negate its nperdevice entry rather than always using -1. 2010-11-16 20:28:53 -08:00
Andy2
635ae053b6 cut down on printing; don't assert-fail when relay's crashed. 2010-11-15 20:40:59 -08:00
Andy2
2c5c7a0dd1 init m_nRoomsFilled -- not sure when this http view feature broke 2010-11-15 20:08:59 -08:00
Andy2
a1be555910 improve string for deleted remote game -- but really needs a "delete 
now" button.
 2010-11-15 19:02:12 -08:00
Andy2
3b30aff613 use external relayID.sh script 2010-11-15 19:01:38 -08:00
Andy2
ea292c7e2f exclude dead games when looking for open public rooms 2010-11-15 19:01:11 -08:00
Andy2
58cd93ef6f given a log file, generates an ID that can be passed with the -d 
option to relay/rq.
 2010-11-15 18:34:56 -08:00
Andy2
c6bd2125a4 java uses '/' to delimit device id, so we'll make that standard. 2010-11-15 18:27:36 -08:00
Andy2
c36679fe13 init isDead to false. Fixes prolem where if DB entry's missing the 
value is uninitialized and so device gets warned that other device
resigned even if none did.
 2010-11-15 18:21:40 -08:00
Andy2
a69e2ad8be add test for device-gone notification by calling rq after gleaning 
required params from logs.  So far testing only after game is over;
need to test mid-game deletion too.
 2010-11-15 06:52:35 -08:00
Andy2
d4e810c9cb delimiter changed 2010-11-15 06:51:05 -08:00
Andy2
ce5738a4e1 write the count 2010-11-15 06:50:09 -08:00
Andy2
edf0c40904 track isDead when creating SafeCref for devgone 2010-11-15 06:49:41 -08:00
Andy2
2c9f2572a8 use GameFull() 2010-11-15 06:48:57 -08:00
Andy2
feca7345dc add GameFull -- database, not in-memory state, knows if game is full. 2010-11-15 06:48:36 -08:00
eehouse@eehouse.org
14579c6e30 Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-11-14 19:40:35 -08:00
Eric House
528ae0c986 allow more than one device death per message 2010-11-14 15:19:38 -08:00
Eric House
a8ac30b180 add -d option to test dev-gone on relay 2010-11-14 15:18:49 -08:00
Andy2
9026d5c149 remove obsolete script I keep accidentally invoking 2010-11-12 18:26:01 -08:00
Andy2
43896ff187 remove unused method and variable 2010-11-12 18:25:15 -08:00
Andy2
fc8cac3b6a handle new device-gone message by posting timed-out dialog. 2010-11-11 06:43:36 -08:00
Andy2
b0a4790ce0 respond to new game-gone message by passing to utils. 2010-11-11 06:41:24 -08:00
Andy2
0787a06eb5 accept new message from device announcing the death of a game 
(including seed so it's harder to spoof); respond to that by setting a
DEAD column in the db and flagging the device as gone.  Notify any
connected device of the fact.  Refuse to accept new connections to
that game.  As already-connected devices reconnect, allow them to do
so but send a new status message that their game is dead.  Not heavily
tested yet.
 2010-11-11 06:40:50 -08:00
Andy2
3d59bc7e39 add new DEAD column to track when a game's been deleted 2010-11-11 06:29:21 -08:00
Andy2
04e1b0c22b new constants, include new status event type, for relay to accept 
notification of deleted game and communicate that to others in the
game as they connect.
 2010-11-11 06:26:59 -08:00
Andy2
d809db7b21 plug into delete and reset code to notify relay that game's forever gone. 2010-11-11 06:25:08 -08:00
Andy2
cf84cce41a define and handle new other-was-deleted error relay is about to start 
returning.
 2010-11-11 06:23:48 -08:00
Andy2
e3f373039a add informOfDeath to communicate to relay when game is deleted 2010-11-11 06:22:38 -08:00
eehouse@eehouse.org
048eff92b8 Merge branch 'relay_proxy' of /home/andy2/dev/git/LOCAL_ORIGIN into relay_proxy 2010-11-10 07:17:39 -08:00
eehouse@eehouse.org
7929167129 Merge branch 'android_branch' into relay_proxy 2010-11-10 07:06:10 -08:00
Andy2
f373b52d45 fix bug drawing tile letters when drawScaled() got triggered (e.g. for 
W on non-std-sized screen): pass null as scr rect to drawBitmap so the
whole bitmap gets used.
 2010-11-10 07:05:40 -08:00
Andy2
d3e644db83 stop requiring 1.6 sdk when runs fine on 1.5 2010-11-10 06:57:45 -08:00
Andy2
c8d7ca40a5 use \1 instead of \n as delimiter -- in case somebody passes as string 
containing a \n.
 2010-11-09 18:02:22 -08:00
Andy2
0f111ab363 use PQexecParams instead of PQexec for queries involving strings from 
users (i.e. room names) to avoid crashes when the contain apostrophes
-- and in general to be safer.
 2010-11-09 17:27:33 -08:00
Eric House
966616cbc4 throw in the public flags; disallow unset variables 2010-11-09 05:54:23 -08:00
Eric House
2a2f4d4395 been a while since cvs... 2010-11-09 05:53:49 -08:00
Andy2
42481a31cc add seed to db; get and set it. 2010-11-08 17:23:54 -08:00
Andy2
82876bda06 add seed and fetch it in jni 2010-11-08 17:23:16 -08:00
Andy2
22f7a42c1d make comms_getChannelSeed non-static so jni can call it 2010-11-08 17:22:38 -08:00
Andy2
b49015c9a1 map out-of-range lang codes to 0. Otherwise we get outOfBounds 
exceptions once Hex dict is installed.
 2010-11-07 15:42:09 -08:00
Andy2
d893632e1b map out-of-range lang codes to 0. Otherwise we get outOfBounds 
exceptions once Hex dict is installed.
 2010-11-07 15:34:40 -08:00
Andy2
83ae8d316c switch to RelativeLayout, putting lock checkbox at top and play game 
button in the middle with everything else scrolling in between.  This
particular application of RelativeLayout works on 1.5 (in emulator).
 2010-11-07 15:13:39 -08:00
Andy2
aff3c9a931 stop requiring 1.6 sdk when runs fine on 1.5 2010-11-07 15:12:37 -08:00
Andy2
1e5ac393c1 update for b18 (but leave b17 description below since that represents 
two months of work and b18 two hours.)
 2010-11-07 14:13:04 -08:00
Andy2
6da013af9d up constants for beta-18 2010-11-07 14:04:37 -08:00
Andy2
c2472c0cb5 don't call java code if rect width is 0. Fixes crash (but not design 
problem) where first to connect in room specifies a timer and second
does not.  Second eventually gets message saying there's a timer but
has not layed out space in the board and java freaks out when later
asked to make a 0-width image.  This fix leaves the device not drawing
the timer until the game is reopened.  The better fix would trigger a
re-layout as soon as the change is made.
 2010-11-07 14:03:24 -08:00
Andy2
cfd4345287 remove too-frequent logging 2010-11-07 13:31:43 -08:00
Andy2
99a557a604 fix blanks-first option to assign one blank per tray rather than all 
to first.  Makes for more realistic test.
 2010-11-07 12:20:39 -08:00
Andy2
83f6ebca79 work around bug -- or design flaw -- where when timer is set hint or 
robot with blank in tray keeps flashing the in-progress indicator by
flagging CMD_TIMER_FIRED as a non-ui event so busy() won't return when
it's what's on the queue.  Problem with that is that the timer stops
advancing during a hint which is clearly not what's happened.
 2010-11-07 12:13:07 -08:00
Andy2
2c95179050 don't complain about empty room name for standalone game 2010-11-07 11:50:01 -08:00
Andy2
57838c0436 improve script. Allow pass either branch or tag on commandline, 
defaulting to branch of tree from which called.  Add usage().  set -u
-e and deal with [ -n "$1" ] being an error in that case.
 2010-11-07 08:16:36 -08:00
Andy2
46a01ace56 work around occasional crash in on-device testing by checking for 0 
before passing to getString.  Not sure of the circumstances but the
crash is coming from restoreManagedDialogs() -- might be related to
screen orientation changes.
 2010-11-06 21:34:16 -07:00
Andy2
dd3bd1f661 don't show hint buttons until there are tiles assigned 2010-11-06 21:31:53 -07:00
Andy2
a6a7f1899d remove logging 2010-11-06 21:01:50 -07:00
Andy2
2fc48cbd97 nuke unused constant 2010-11-06 21:01:29 -07:00
Andy2
92ec742f90 script to build from a clean tree. I'm getting emacs and git tmpfile 
picked up by the android build system and incorporated into .apks;
this will avoid that.
 2010-11-06 20:19:07 -07:00
Andy2
d2782af487 do case-insensitive comparison of room names 2010-11-06 18:52:10 -07:00
Andy2
73d7c7a27b use new field to determine if simple relay config dialog can handle 
the game or if user's already changed it enough that the full-on
dialog is required.
 2010-11-06 18:26:09 -07:00
Andy2
f36b253ae7 add number of players to GameSummary. Changes DB but it's already 
changed since last beta so I'm not upping the version.
 2010-11-06 18:24:44 -07:00
Andy2
9fccbcc6b4 Problem with new minimal-config relay dialog: user can accidentally 
tap "play game" and wind up connecting and creating an empty-room-name
game; or can dismiss the dialog and be confused because there's no way
back to it.  Solution: define empty-room-name as an illegal case.
Check for it when "play game" is tapped in either config dialog and
raise an alert.  And when user wants to open a game from the GamesList
activity go to the minimal config dialog if it's a relay game without
a room name.
 2010-11-06 16:41:12 -07:00
Andy2
8213c9a5c1 add showOKOnlyDialog 2010-11-06 16:38:33 -07:00
Andy2
248c758b1c add a bit of space around bullet items 2010-11-06 16:37:59 -07:00
Andy2
b7fc678e3d tweak changes, removing steps to create networked game since that's 
part of the UI now.
 2010-11-06 15:29:05 -07:00
eehouse@eehouse.org
58317afb28 Merge branch 'android_branch' into relay_proxy 2010-11-06 15:06:08 -07:00
Andy2
ceec9eda28 set m_invalPath so new network game will be drawn correctly first time 
back in GamesList
 2010-11-06 15:01:06 -07:00
Andy2
a72e029f40 add name field to and use a style for bulleted items in simplified 
relay-connect dialog; remove not-again text and dialog attached to
new-relay-game button; tweak text.
 2010-11-06 14:55:57 -07:00
eehouse@eehouse.org
8dad8750ba Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-11-06 14:43:57 -07:00
Andy2
d6adc84ee3 tweak two prefs strings 2010-11-06 14:40:28 -07:00
Eric House
98716b755a get rid of menuitem that was there only for development testing 2010-11-06 08:30:45 -07:00
Andy2
c125edd2cb make text bulleted -- easier to read/follow 2010-11-05 05:53:28 -07:00
eehouse@eehouse.org
fc739e2c67 Merge branch 'android_branch' into relay_proxy 2010-11-05 05:19:16 -07:00
eehouse@eehouse.org
6d205011f5 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-11-05 05:12:59 -07:00
Andy2
145ab6f356 remove wordy explanation 2010-11-05 05:11:40 -07:00
eehouse@eehouse.org
64cc199e1a Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-11-05 05:10:24 -07:00
Eric House
0d863d2d3f fix casting error caught by compiler 2010-11-05 05:06:24 -07:00
Eric House
7b3691662a version of build.xml modified to pass -xline to javac. For future use... 2010-11-05 05:06:04 -07:00
Andy2
2f38ce3d92 add button leading to the main config dialog plus an explanation of 
what it's for.
 2010-11-04 20:37:59 -07:00
Andy2
23924ff74e add new activity that's popped up on creation of a networked game to 
ask only for the room name to make it as easy as possible to
get started.
 2010-11-04 19:48:46 -07:00
Andy2
c9239fc921 make method public 2010-11-04 19:46:05 -07:00
Andy2
9c48c91156 init room name to current text -- duh! -- preventing close process 
from thinking a change has been made (room name nulled) when none had
been.
 2010-11-04 06:36:28 -07:00
eehouse@eehouse.org
d04a5870af Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-11-03 21:00:43 -07:00
Andy2
c630697c59 Fix crash on 2.2 emulator by turning of ipv6 on emulator. per 
workarounds found online.  Suggested fix is to use io instead of nio.
 2010-11-03 20:54:35 -07:00
Andy2
d1fcdb69da double max room name len since the old value was too small -- only 
filled half a text field on android
 2010-11-03 18:38:43 -07:00
Andy2
e2ee0755cb set max len for roomname field (with comment that it should be kept in 
sync with the C constant)
 2010-11-03 18:38:13 -07:00
Andy2
c7febf0d10 nuke unused constant 2010-11-03 18:30:05 -07:00
Andy2
9e05e6c2b3 add lastMsgRcd to status printout 2010-11-03 18:28:54 -07:00
Andy2
c039b92339 don't send 0-length message 2010-11-03 18:26:20 -07:00
Andy2
0148a93f3e add a constraint to the stored messages table to avoid dupes. Then 
remove the artificial limit on number of stored messages.  This seems
to fix problems where lots of chats in a row clog up the relay so that
messages never get flowing again.  Works more cleanly than
artificially ACKing.
 2010-11-03 18:14:19 -07:00
Andy2
633d4c95a7 fix buffer overflow sql error with large messages; combine logged messages. 2010-11-03 18:12:26 -07:00
Eric House
31df12747b fix prev hint to work not just compile 2010-11-01 22:20:35 -07:00
Eric House
892f30692b Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-11-01 21:54:28 -07:00
Eric House
e54bf588ab fix to compile on wince/win32 2010-11-01 21:54:04 -07:00
Andy2
8bf8383d60 reread preferences in case of an upgrade. Fixes bug where default 
port was 0 because the new key, meant to change the value, was not
being initialized.  It's a hack to use a side-effect to determine
whether this is an upgrade, but since I'm already calculating it
didn't see any point to doing it again.
 2010-11-01 18:56:23 -07:00
Andy2
1e5a856287 log host/port connecting to. Too useful to omit. 2010-11-01 18:53:36 -07:00
Andy2
8f55469930 remove strings no longer in English 2010-11-01 18:12:14 -07:00
Andy2
3d70da5a8d cleanup 2010-11-01 06:57:54 -07:00
Andy2
804070efc7 base comms_canChat() on whether connID's been assigned. It's possible 
to send a message from a client immediately after its initial message
but init-message dupe-detection in comms will drop that because only
one channel-0 message is expected -- the initial connection message.
So don't encourage platform code to enable the feature before common
code can deliver the message.
 2010-11-01 06:57:41 -07:00
Andy2
2d9851902c replace chat menuitem with chat button enabled using comms_canChat() 2010-11-01 06:55:37 -07:00
Andy2
40e42b79c5 up version numbers and strings -- getting ready for release 2010-10-30 09:11:47 -07:00
Andy2
b2fd178d60 tray->rack; clarify not-again text for 'turn done' button so it isn't 
stupid when displayed for ending a trade.
 2010-10-29 20:24:50 -07:00
Andy2
64a8b1e61a change confusing const name 2010-10-29 20:20:25 -07:00
Andy2
8c7043d42c fix crash using undo/redo after a turn has overwritten pending tiles: 
when redoing need to check that cell is still empty.
 2010-10-29 20:07:09 -07:00
Andy2
5b33df4e25 modify model_getTile to take NULL for out parms where the result is 
often ignored, then pass NULL instead of the address of variables
called 'ignore'.  Should be no behavior change.
 2010-10-29 19:52:15 -07:00
Andy2
3d52698939 don't show all-here not-again dialog to host host -- already got the 
first-in version.
 2010-10-29 19:14:56 -07:00
Andy2
148fe848c2 get rid of implication that some deletions are undoable. 2010-10-29 19:02:57 -07:00
Andy2
fd1ca2c9c5 confirm single game delete. 2010-10-29 19:02:21 -07:00
Andy2
5b6a5aafe8 add three not-again messages displayed after connection is first made 
with the relay, for first-in-room, last-in-room, and the less common
middle case.  Add confirmation dialog for game reset.
 2010-10-29 18:44:07 -07:00
Andy2
6de7fb28e3 add lock-setting checkbox to game config dialog and toggle 
setEnabled() on most widgets as it's checked.  Add not-again dialog
explaining possibility of reset of started game.  Don't even show the
checkbox for non-started game.
 2010-10-29 07:42:16 -07:00
Andy2
814dd89458 remove unused ivar; override setEnabled to dis/enable delete button 2010-10-29 07:40:41 -07:00
Andy2
30b6a6b54e remove unused and confusing id 2010-10-29 06:48:45 -07:00
Andy2
a7c1319527 call super only in the default case 2010-10-29 06:48:18 -07:00
Andy2
d98525de95 make chat display dialog blocking. This fixes problem where multiple 
chats received at once see all but the first dropped, and probably
fixes reported problem where only one message every got displayed.
 2010-10-29 06:46:27 -07:00
Andy2
b115ce14ed add devOrder (= hostID) to params passed on connect. Fix to pass new 
param from jni; use object to pass params into UI thread since there
are now too many for handler.
 2010-10-29 06:34:39 -07:00
Andy2
ab708e4db1 add devOrder (= hostID) to params passed on connect. Make linux apps compile after API change. 2010-10-29 06:32:18 -07:00
Andy2
0d7f2c4f23 add devOrder (= hostID) to params passed on connect. Should make for 
better explanatory message.
 2010-10-29 06:31:33 -07:00
Andy2
4cd15a9c6a Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 
Conflicts:
	xwords4/common/comms.c
 2010-10-29 05:27:07 -07:00
Eric House
e069a268cd implement dialog to edit chat text 2010-10-28 21:31:40 -07:00
Andy2
c087b4b031 add room name to callback used when device connects: pass the new 
parameter through and format into messages posted via Toast.
 2010-10-28 18:48:07 -07:00
Andy2
645a042481 add room name to callback used when device connects: fix jni to compile 2010-10-28 18:46:28 -07:00
Andy2
7e0bcee6d2 add room name to callback used when device connects: fix linux to compile 2010-10-28 18:46:07 -07:00
Andy2
41fc05106b add room name to callback used when device connects 2010-10-28 18:45:55 -07:00
Andy2
5400fad50d log timeout-dlg messages so there's a record 2010-10-28 18:44:37 -07:00
Andy2
ddeb744ff7 init room name to empty string 2010-10-28 18:43:06 -07:00
Eric House
4ae58342da test, don't assert: comms can be null 2010-10-28 05:45:56 -07:00
Eric House
670f7982ea add comms_isConnected 2010-10-27 21:58:36 -07:00
Eric House
1b83b13101 make player name and password single-line 2010-10-27 21:58:02 -07:00
Eric House
eba5b77494 add comms_isConnected; public room variables default to false 2010-10-27 20:50:11 -07:00
Andy2
7ad4a43468 use new confirm-delete-all dialog to confirm deletion of dictionary 2010-10-27 06:33:13 -07:00
Andy2
4c17ea8802 generalize confirm-delete-all dialog into confirm-then-do 2010-10-27 06:25:29 -07:00
eehouse@eehouse.org
3ffc93a637 Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-10-27 05:51:54 -07:00
Eric House
b878599f7b remove comment 2010-10-26 20:57:27 -07:00
Eric House
fd85bd35da set dictLang to 0 (unknown) when reading old-version stream 2010-10-26 20:56:41 -07:00
Andy2
559f933ef5 tweak not-again hint wording 2010-10-26 19:33:38 -07:00
Andy2
11c68797bf unique title for not-again dialogs 2010-10-26 19:28:22 -07:00
Andy2
eb41e24c4e show language of dict that can't be found 2010-10-26 18:48:28 -07:00
Andy2
84e6d94919 add languages to dict names in set-default spinner 2010-10-26 18:35:54 -07:00
Andy2
c8a6f453c9 dismiss underlying activity when no-dict dialog is cancelled too. 2010-10-26 18:28:54 -07:00
Andy2
1ceea2cde2 check that default dict exists and if it doesn't use same as if hadn't 
been specified.  Catches case where dict is downloaded, made new-game
default, and then deleted.
 2010-10-26 18:20:49 -07:00
Andy2
26210e1cf2 new function for reporting missing dict called from two places 2010-10-26 18:08:53 -07:00
Andy2
89c7e02928 add CollegeEng dict and make it default for new games 2010-10-26 06:54:54 -07:00
Andy2
f9b2eb4a3e attach not-again dialog to turn done menuitem 2010-10-25 21:32:07 -07:00
Andy2
d7b6cb0691 use resetGame() to populate a newly created game. With this change a 
new network game will connect without first having been opened in the
GameConfig dialog.
 2010-10-25 18:56:51 -07:00
Andy2
e1b7a0f44d when resetting game, if it's multi-device but doesn't have a default 
address (as will be the case if it was just created), get and give it
one.
 2010-10-25 18:55:53 -07:00
Andy2
3cbda7471c init public room vars to false 2010-10-25 18:55:15 -07:00
Andy2
54d312e523 saveSummary(0 needs to be passed context in case must init dbhelper. 2010-10-25 18:51:07 -07:00
Andy2
2e122fe9f3 default for new networked game is no robots, second player remote. 2010-10-25 18:08:09 -07:00
Andy2
b237277544 put back enum just removed; it's screwing up existing code having all 
the followers change.
 2010-10-25 18:06:48 -07:00
Andy2
39e502fe71 add not-again hints to all the buttons 2010-10-24 17:47:11 -07:00
Andy2
e909e4b343 remove redundant message; advance state to ALLCONNECTED on receipt of 
RECONN or CONN that lists the game as full.  This means we get the
all-green icon (or the A in the gtk case) when in a consummated game
rather than only when all devices are actually connected.
 2010-10-23 20:29:24 -07:00
eehouse@eehouse.org
24fae0f53b Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy 2010-10-23 19:50:11 -07:00
Eric House
8a038dc748 Merge branch 'relay_proxy' of ssh://xwords.git.sf.net/gitroot/xwords/xwords into relay_proxy 2010-10-23 19:45:03 -07:00
Andy2
2fa76a9e24 add second button to games list to add networked game, and remove 
ability from config dialog to make a game networked or not.  This
should confuse people less.  Better would be if the two buttons had
icons and those icons were associated with games in the list according
to which type of game they represent.
 2010-10-23 18:41:37 -07:00
Andy2
cff95ce3de go back to play being the onclick action (removing preference to make 
it that way); add more newbie hints; fix DIALOG id definitions to not
overlap superclass's.
 2010-10-23 14:08:57 -07:00
Andy2
038f6bd94c rename some private methods; add onPrepareDialog to fix problem where 
msg stuck from previous invocation
 2010-10-23 14:06:03 -07:00
Andy2
dd82fa02ad remove chat menuitem -- it's only a button now. 2010-10-23 14:00:24 -07:00
Andy2
314872d533 shrink needs-sync flag icon 2010-10-23 13:52:56 -07:00
Andy2
9383ef064d use sync icon instead of "M" to mark games with data. 2010-10-23 13:45:31 -07:00
Andy2
43ad43b604 change meetup server back to relay 2010-10-23 11:24:19 -07:00
Andy2
b6dfa0be8b disable background-checking code for now: make default be disabled and 
remove Preference that allows to change it.
 2010-10-23 11:19:55 -07:00
Andy2
5a5c73916e Don't allow copy of relay-connected game. 2010-10-23 11:08:33 -07:00
Andy2
7cf4535b4c new dbmgr API returns number of players in game; use that rather than 
currently connected devices to populate [RE]CONNECT message
 2010-10-22 22:34:43 -07:00
Andy2
593dac9d99 rotate 90 degrees 2010-10-22 22:04:09 -07:00
Eric House
85d29cf560 if can't send allcond to a device because it's not connected queue the 
message to be sent next time it does.  And since the cookieID will
change and should be there already anyway, remove it.  (Should remove
the hostID too for the same reason.)
 2010-10-22 19:02:52 -07:00
Eric House
6e843dec6c make 10997 default relay port 2010-10-22 18:30:19 -07:00
Andy2
7765bd0a1a move decision how to display connection info from CommsTransport to 
BoardActivity (where it'll be easier to include optional not-again dialog)
 2010-10-21 20:13:41 -07:00
Andy2
8fac0945b9 chat not-again message without obscenities 2010-10-21 19:22:17 -07:00
Andy2
99dbbb443c add comms_canChat, which knows better than java code what state a 
connected game is in, and call it to determine whether to show the
chat icon.
 2010-10-21 19:14:10 -07:00
Andy2
198f39b606 don't use yes button for simple ok dialog 2010-10-21 19:12:04 -07:00
Andy2
ae97d7d0f4 shouldn't have commented that out... 2010-10-21 06:51:26 -07:00
Andy2
aa0be5e2f2 remove unused imports 2010-10-21 06:50:29 -07:00