Commit graph

4144 commits

Author SHA1 Message Date
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
Andy2
13ef8dd098 add hints-allowed to set of defaults for new games 2011-01-13 18:45:38 -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
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