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

6079 commits

Author SHA1 Message Date
Eric House
210913d4d4 track dictbrowse info for multiple copies of same dict if that's 
what's installed.
 2012-09-18 07:36:54 -07:00
Eric House
fcecd1db3c don't ask for column no longer there 2012-09-18 06:38:22 -07:00
Eric House
4fa5c61e14 add option to build in a separate directory, for e.g. case where source files 
are on ro filesystem.
 2012-09-17 06:48:53 -07:00
Eric House
168b69112e up version strings for pending new release 2012-09-17 06:36:58 -07:00
Eric House
33772ff0b9 remove redundant DB field and variable 2012-09-15 17:11:59 -07:00
Eric House
a939c9ec4b cleanup 2012-09-15 17:11:45 -07:00
Eric House
75398389b3 Merge branch 'android_branch' into android_dictdb 
Conflicts:
	xwords4/android/XWords4/jni/jniutlswrapper.c
 2012-09-15 16:36:15 -07:00
Eric House
ee1df7eeb7 replace DeleteLocalRef calls with version that checks for NULL 2012-09-15 15:57:38 -07:00
Eric House
b2d47d70be saveToken can be 0 when only gi is being saved 2012-09-15 15:49:26 -07:00
Eric House
937bde6378 combine two jniutils methods into one 2012-09-15 15:21:31 -07:00
Eric House
ad67f31573 saveToken can be 0 when only gi is being saved 2012-09-15 15:19:23 -07:00
Eric House
1e12464934 Merge branch 'android_branch' into android_dictdb 2012-09-15 10:51:58 -07:00
Eric House
571300c0f8 work with two checksums per wordlist, the old that's on the whole 
file, and the new that's on the wordlist data only.
 2012-09-15 09:34:27 -07:00
Eric House
5d45d8d35f remove param that doesn't work when called from mod_python 2012-09-15 09:03:52 -07:00
Eric House
c815d739cd generate md5sum for old .xwd files that don't have it internally. And 
for those that do, verify that stored and generated values match.
 2012-09-13 20:54:35 -07:00
Eric House
bcc8c0c249 remove code figuring md5sum on full dict file; the sum on data is all 
we're using now.
 2012-09-13 19:33:17 -07:00
Eric House
a5bd932e0a Merge branch 'android_branch' into android_dictdb 2012-09-13 19:20:24 -07:00
Eric House
aaa12a291e use unpack to correctly pull wordcount, note and checksum 2012-09-13 19:07:37 -07:00
Eric House
20afa9fd56 rename: file's obsolete now 2012-09-13 19:06:46 -07:00
Eric House
a85ab865cb up note for new version of DISC 2012-09-13 19:05:09 -07:00
Eric House
9ea1311aa0 Merge branch 'android_branch' into android_dictdb 2012-09-13 08:00:54 -07:00
Eric House
50e90405a7 add new Catalan word lookup URL 2012-09-13 08:00:37 -07:00
Eric House
aa974be567 Before figuring md5sum (via java callback added recently), use new 
callback to see if there's already one in the DB.  Required passing
context into jniutils getter, and passing name into jni dict
constructors that previously didn't need it.
 2012-09-13 07:38:08 -07:00
Eric House
edc6b9c270 Merge branch 'android_branch' into android_dictdb 2012-09-13 05:40:08 -07:00
Eric House
3e4384c2a8 when dict doesn't have built-in md5sum, or when in DEBUG code, call 
back into java to get a sum.  It's very slow for large dicts, but will
eventually be in a DB so only done once per dict that doesn't have it.
 2012-09-13 05:39:44 -07:00
Eric House
13507e6fc2 break dict info table in two, one browse state and one for what's been 
stored in static data in DictLangCache up to now -- and remove that
static data in favor of the new table.
 2012-09-12 19:50:03 -07:00
Eric House
67b0d44f26 save search prefix too 2012-09-12 07:55:41 -07:00
Eric House
ce6356fb92 add new db table for tracking dict-releated stuff. Use it to save 
state in wordlist browser so can return to same place as left for each
dict.  Eventually the new table should replace DictLangCache.
 2012-09-12 07:44:58 -07:00
Eric House
a6bed2706d include, commented out, the parameter that makes things fall apart. I 
think the protocol needs work to survive devices failing to save
state.  Better to work on making sure they always save.
 2012-09-11 20:45:03 -07:00
Eric House
72b4b02c20 improve messages display 2012-09-11 20:44:07 -07:00
Eric House
ae2b6205bd use mem_stream_make_sized 2012-09-11 19:17:27 -07:00
Eric House
4f18f01cb8 don't malloc(0) 2012-09-11 19:17:10 -07:00
Eric House
a0b564c7e8 show related messages as well 2012-09-11 19:07:16 -07:00
Eric House
761f93dd7e use new mem_stream_make_sized 2012-09-11 19:07:00 -07:00
Eric House
5c683f173a add mem_stream_make_sized, meant to make saving games more efficient 2012-09-11 19:06:27 -07:00
Eric House
75474e1891 Add option to pretend save failed a random pct of time. Point it to 
test fix for problem on Android, but right now turning this on breaks
networking.
 2012-09-11 07:26:17 -07:00
Eric House
ad4231289f fix --max-devs and resigns begin allowed when only one game 2012-09-11 07:24:51 -07:00
Eric House
0ccc2331b5 address bug where message was getting ACK'd by a device that failed to 
save what it had ACK'd leaving the game permanently broken.  Do that
by adding a new method game_saveSucceeded() called after the client
claims to have committed bytes returned by game_writeToStream() to
disk.  In that method comms updates the value it'll use in subseqent
ACKs.
 2012-09-10 07:31:45 -07:00
Eric House
45de62818b format to 80 columns -- no code change. 2012-09-09 15:49:55 -07:00
Eric House
1608f0a8f9 handle missing error messages 2012-09-09 15:49:17 -07:00
Eric House
9340db36c1 disallow opening android DBs when not configured correctly. 2012-09-09 15:48:57 -07:00
Eric House
8fbc9ca343 fix to compile in release mode 2012-09-09 09:22:00 -07:00
Eric House
95a7b14a3a transmit dict's md5sum along with name in initial message from host to 
guest.  On guest, pass that sum into client code along with names so
the appropriate tests can be done and corrections taken.
 2012-09-08 20:23:48 -07:00
Eric House
f90e6343c7 don't crash if no dict info 2012-09-08 20:22:22 -07:00
Eric House
9a72f252ed Merge branch 'android_branch' into android_dictname 2012-09-08 13:20:59 -07:00
Eric House
1957ad3dbe add options, that sometimes work, to print desc and md5sum from .xwd 
files.  Still need to figure out how to parse binary into UTF-8.
 2012-09-08 13:20:12 -07:00
Eric House
047f68aafd version with checksum and note 2012-09-08 13:18:58 -07:00
Eric House
ca88c9850e add DICTNOTE 2012-09-08 13:17:49 -07:00
Eric House
5a81484cf1 add md5Sum to DictInfo and add a getter 2012-09-08 10:11:18 -07:00
Eric House
977bee15d9 add DICTNOTEs 2012-09-08 10:10:17 -07:00
Eric House
7d51ee99d9 add dict_getMd5Sum 2012-09-08 10:09:31 -07:00
Eric House
50a4f32bfa new versions of dicts with checksums and descriptions 2012-09-08 10:08:39 -07:00
Eric House
077560bcd3 load md5sum if present 2012-09-08 09:42:23 -07:00
Eric House
14a77ff7f1 factor out common code 2012-09-08 07:45:18 -07:00
Eric House
8e58d8c1c0 print header elems, including md5sum, if present rather than just 
skipping.
 2012-09-07 20:34:55 -07:00
Eric House
5fa9b60846 add md5Sum field to dict struct, and on linux load it if present, 
otherwise calculate it.  In DEBUG builds always calculate and assert
they match.
 2012-09-07 20:34:06 -07:00
Eric House
0b81516682 add md5sum to dict header, summing not the whole file but the parts 
that make the wordlist unique: tile counts and values, and bitmaps,
and the data.  This happens to be contiguous data on non-palm .xwd
files so it's easy to duplicate if the sum isn't there.
 2012-09-07 20:32:10 -07:00
Eric House
4f180e9e14 pass rejecting dict name into java layer and display as part of turn 
lost message.
 2012-09-06 19:04:40 -07:00
Eric House
07e6239699 transmit name of failing dict 2012-09-06 08:01:11 -07:00
Eric House
509c832f2f more progress: copy dict name into badwordinfo and free it successfully 2012-09-06 07:49:05 -07:00
Eric House
2f8b6cceb5 pass additional param into callback -- unused so far. 2012-09-06 07:19:12 -07:00
Eric House
4325d4e709 Merge branch 'android_branch' into android_dictname 2012-09-05 19:30:50 -07:00
Eric House
fa90150055 Revert "As an experiment, lower case words being looked up. Apparently one of" 
This reverts commit 5bdebd445f.
 2012-09-05 19:20:05 -07:00
Eric House
4d57fb889b new and improved URL for Catalan lookup 2012-09-05 19:19:05 -07:00
Eric House
1ec03e48bb plug leak: don't alloc stream when it won't be used 2012-09-05 19:09:01 -07:00
Eric House
71c1fc527a add counter to mpool tracking so easier to find source of leaks 2012-09-05 19:08:22 -07:00
Eric House
5bdebd445f As an experiment, lower case words being looked up. Apparently one of 
the Catalan sites doesn't like upper case.  At least in theory no site
should care so the rest of the world should be ok with lower case too.
 2012-09-04 19:03:53 -07:00
Eric House
270a19f3aa Revert "first of a set of changes to communicate to clients dictionary being" 
This reverts commit b7a0f1489b, which I didn't mean to check in on this branch.
 2012-09-03 21:34:51 -07:00
Eric House
ea4d805d5f first of a set of changes to communicate to clients dictionary being 
used by server.  Clients need to care if e.g. the server's disallowing
phonies based on its dict.  Can only be sent if client is of latest
version.  In that case, common code calls into new util function.  In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it.  Once it's available, will want to install it.
 2012-09-03 21:33:46 -07:00
Eric House
b7a0f1489b first of a set of changes to communicate to clients dictionary being 
used by server.  Clients need to care if e.g. the server's disallowing
phonies based on its dict.  Can only be sent if client is of latest
version.  In that case, common code calls into new util function.  In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it.  Once it's available, will want to install it.
 2012-09-03 21:29:21 -07:00
Eric House
d12ed144ea normalize file: add comments where don't proceed a string, and replace 
tabs with spaces.
 2012-08-31 21:36:49 -07:00
Eric House
73e29211b0 remove strings no longer used 2012-08-31 21:34:25 -07:00
Eric House
a3b1fc8379 beginnings of script to annotate localized .xml files with what's missing 2012-08-31 21:33:44 -07:00
Eric House
1f330e0c49 tweak name and reflect new name on website 2012-08-30 19:21:05 -07:00
Eric House
adab1b5cea replace getString() calls that fetch format strings then apply them 
with calls to the formatting (varargs) version of getString().  Should
be no behavior change.
 2012-08-30 19:18:08 -07:00
Eric House
2eb8904a0a rename to cWords-SMS, and move name <string/> into strings.xml so it 
can be substituted too.
 2012-08-30 19:11:46 -07:00
Eric House
4ffb4efb0c silence compiler warning 2012-08-30 19:10:52 -07:00
Eric House
568bef7ac3 add DICTNOTE 2012-08-30 07:08:55 -07:00
Eric House
3b8c9bfada add two Catalan word lookup URLs 2012-08-30 07:07:42 -07:00
Eric House
73c26d8643 replace Crosswords in variants' xml files. Required passing in app 
name from build.xml and a new clean-target script that removes the
generated variant files.
 2012-08-30 07:00:26 -07:00
Eric House
4cb848582e fix edge cases in prefix matching 2012-08-28 07:35:11 -07:00
Eric House
145317426d Fix prefix matching to accept letters constituting the first part of a 
digraph tile when at the end of a prefix so that e.g. GORIL in Catalan
will list GORIL·LA (rather than nothing since GORIL, ending with the L
tile, is not a prefix.)
 2012-08-27 21:50:09 -07:00
Eric House
fddd2c4ed5 fix bug in dict_tilesToString that occurred only when a language had 
two tiles starting with the same letter: use recursive search to try
both paths in such cases.
 2012-08-27 07:10:40 -07:00
Eric House
79be03ac66 splite lines to get under 80 columns; no code change 2012-08-27 07:06:40 -07:00
Eric House
da4ec16ba4 remove one-release logging confirming getInstallerPackageName result. 2012-08-27 06:15:11 -07:00
Eric House
a0e8b6c076 add description 2012-08-26 21:36:00 -07:00
Eric House
c5f21a3517 new field to be populated if dict desc header is found. 2012-08-26 21:00:21 -07:00
Eric House
08aa9b66e8 also load new desc field in android client, and add jni call to retrieve it 2012-08-26 20:59:17 -07:00
Eric House
9d174601b9 add field, and getter, for new dict header description string, and 
load it in linux client.
 2012-08-26 20:58:28 -07:00
Eric House
f3b289f4be fix to take defaults from current dir 2012-08-26 20:18:37 -07:00
Eric House
6cf138b962 Merge remote branch 'origin/android_branch' into android_branch 2012-08-25 10:22:12 -07:00
Eric House
b29df8512a add null-terminated note to dawg header and modify linux client to 
accept it if present.  Android client will successfully ignore it and
will need to be modified to capture and display it if present.  Idea's
to display information about copyright, source, etc. of wordlists.
 2012-08-25 10:20:52 -07:00
Eric House
efb7a9b5c5 call loge rather than logf from within catch statements 2012-08-23 07:08:17 -07:00
Eric House
9606c2ec56 Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-08-23 06:53:23 -07:00
Eric House
c6ce5da5a5 Merge remote branch 'origin/android_branch' into android_branch 2012-08-23 06:52:47 -07:00
Eric House
786e05b1f9 update to install beta 51 2012-08-23 06:51:32 -07:00
Eric House
47822e94e3 remove comment 2012-08-23 06:38:57 -07:00
Eric House
67ddbf140b remove comment unintentionally committed 2012-08-23 06:38:45 -07:00
Eric House
c13971e3d8 convert a few more variable names from single- to double-letter 2012-08-23 06:38:29 -07:00
Eric House
8f6486b381 add psuedo-unique device id to update messages; log installer once 
(which will only matter once it's on the market)
 2012-08-22 19:10:38 -07:00
Eric House
32e1530d3f i => ii; no other change 2012-08-22 07:44:21 -07:00
Eric House
a86ab69aec don't store argv element in game data structure where it gets freed. 2012-08-22 07:35:18 -07:00
Eric House
6758ebcdf5 version strings 2012-08-21 18:57:26 -07:00
Eric House
1423968098 check every day, not every seven, for users who've said they want the 
intermediate builds.
 2012-08-21 18:55:44 -07:00
Eric House
02fa53cbc7 bring in recent tweak 2012-08-21 08:02:36 -07:00
Eric House
31ef5026be use constants for json params so easier to paste into python code 2012-08-21 07:43:49 -07:00
Eric House
46a5486071 Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-08-21 07:18:05 -07:00
Eric House
ba43e54d8b make default false 2012-08-21 07:14:58 -07:00
Eric House
6b23bebd0a use constants 2012-08-20 21:36:14 -07:00
Eric House
cc4549e7d3 add debug pref controlling whether non-release updates are installed. 
(passed to info.py, but is ignored there so far)
 2012-08-20 07:23:13 -07:00
Eric House
4d51cc8d3a check for presence of apache mode (which is unavable when running from 
cmdline)
 2012-08-20 07:07:57 -07:00
Eric House
fca1621ad0 use json to do app and all dict queries in one transaction 2012-08-18 07:42:42 -07:00
Eric House
07c6d57233 pass git version and installer name (usually empty) as part of update 
for more granularity
 2012-08-16 21:49:52 -07:00
Eric House
16de50ce3d catch sms version up with beta-50 and auto-update changes 2012-08-16 08:15:52 -07:00
Eric House
fbe842d089 cleanup 2012-08-16 08:14:50 -07:00
Eric House
7b86eb7a59 new file 2012-08-16 08:10:05 -07:00
Eric House
75d8820b98 make check-for-updates a debug-only menuitem 2012-08-16 07:48:34 -07:00
Eric House
5584a66043 run update checks off a timer that adds a random element to its 
interval; move update check URL into a debug pref.
 2012-08-16 07:43:57 -07:00
Eric House
6bdec885b1 add nextRandomInt() to Utils and use it 2012-08-16 07:26:51 -07:00
Eric House
6226efe8d6 move remaining non-jni prefs stuff from CommonPrefs to XWPrefs. No 
other changes.
 2012-08-16 06:31:23 -07:00
Eric House
81d7903aa3 move new version checking stuff into new file 2012-08-15 19:24:57 -07:00
Eric House
e749aedd34 return url inside a json rather than just a url for more flexibility 
and so python's error messages don't trigger Notifications that then
fail.
 2012-08-15 18:55:54 -07:00
Eric House
4b318070ca remove unused imports 2012-08-15 18:52:56 -07:00
Eric House
910bb2a5a0 add new function loge that takes an Exception and logs a stack trace 
for it
 2012-08-15 18:52:31 -07:00
Eric House
3666d5b541 Merge branch 'from_android_beta_49' into android_branch 2012-08-15 18:31:07 -07:00
Eric House
ca4b2e5354 update version code/strings 2012-08-15 18:18:59 -07:00
Eric House
de87b32bb8 fix bug the right way this time: it's ok for a word not to be in the 
current player's wordlist when the most recent move's being reported,
but not to ignore word legality altogether.
 2012-08-15 18:11:16 -07:00
Eric House
de9a408b15 Revert "Fix bug where if word being scored for long-touch-on-scoreboard wasn't" 
This reverts commit 07912bdcdb.
Problem is it breaks WARN-PHONIES
 2012-08-15 18:01:36 -07:00
Eric House
6947c50238 pass lang instead of lang code; include app name in notification text 2012-08-15 07:22:10 -07:00
Eric House
cd340aba0c post notification on receipt of url for new app that'll result it it's 
being downloaded.
 2012-08-15 06:53:13 -07:00
Eric House
dfdaa500a7 return url for app to download when version's old 2012-08-15 06:51:48 -07:00
Eric House
7cb68f1c85 post notification when new dict is available and download it in 
when notification selected.
 2012-08-15 06:10:39 -07:00
Eric House
e0a8af72c9 work on temporary help site 2012-08-15 06:08:53 -07:00
Eric House
2155631021 improve, including commmandline testability and use of shelve to store 
md5sums after they're generated.
 2012-08-14 18:29:48 -07:00
Eric House
8b6af3fdb9 add md5sum calculator for dicts and use to send POST that checks if 
they're current.
 2012-08-14 07:13:03 -07:00
Eric House
3ef81f248b start on checking for updates/latest version: a menu item that 
triggers new code that sends an HTTP POST to a python script on the
server that returns whether the current version is correct.
 2012-08-13 21:10:22 -07:00
Eric House
9128c2d60c factor code into new method copyFileStream 2012-08-13 07:45:14 -07:00
Eric House
829fd01685 remove change note about SMS version release 2012-08-13 07:09:59 -07:00
Eric House
13d359cb39 turn on endgame BONUSALL feature for linux client too 2012-08-13 06:44:46 -07:00
Eric House
c98bbe2b9a use setsockopt to limit read() block time and so to prevent linux 
version from being unkillable when relay crashes at the wrong time.
 2012-08-13 06:44:16 -07:00
Eric House
25e65d3e6f cleanup: don't return from middle of function 2012-08-12 19:45:54 -07:00
Eric House
c49408d7e9 fix warnings compiling in release mode 2012-08-12 19:37:47 -07:00
Eric House
07912bdcdb Fix bug where if word being scored for long-touch-on-scoreboard wasn't 
in current player's dictionary it'd show up empty: word, once played,
needn't be legal to be displayed.
 2012-08-12 19:25:16 -07:00
Eric House
eb8401bb7a fix bug when turn lost for phonies in networked game: what's sent must 
match what's expected.
 2012-08-12 11:52:20 -07:00
Eric House
ec0702d584 initialize buffer that common code will pass to strcat. 2012-08-10 21:31:01 -07:00
Eric House
d66208a1f2 add script to sync; rename to put all in directory 2012-08-10 08:05:12 -07:00
Eric House
1e5757dc45 to start work on website... 2012-08-02 22:26:48 -07:00
Eric House
c046606e53 string changes a new changes file toward new release and initial 
release of SMS version
 2012-08-02 07:18:58 -07:00
Eric House
27cbd0e0c9 go with end-game change that takes remaining tiles into account for 
robots but not for hints.
 2012-08-01 20:31:21 -07:00
Eric House
464696566d get rid of NODE_CAN_4. Not change to post-compiled code 2012-08-01 20:29:15 -07:00