Eric House
6691c0713c
Merge remote branch 'origin/android_branch' into android_branch
2011-12-01 20:16:15 -08:00
Eric House
0065f5078e
add variable controlling odds of "upgrading" -- which still needs tweaking.
2011-12-01 20:16:09 -08:00
Eric House
1e48a8d615
Merge remote branch 'origin/android_branch' into android_branch
...
Conflicts:
xwords4/common/model.c
2011-12-01 20:12:27 -08:00
Eric House
32f1dfa5da
configure by passing params rather than setting ENV variables
2011-11-30 21:01:11 -08:00
Eric House
c39487e0cc
add ability to start out with mix of old and new versions and have old
...
upgrade to new at random times.
2011-11-29 20:51:19 -08:00
Eric House
c8b868c243
Separate app from params. No change in behavior (though restart of
...
existing games is now broken), but this sets up testing mid-game
upgrade.
2011-11-29 06:43:16 -08:00
Eric House
c6e994abef
use $RANDOM rather than $SEED -- still repeatable, but avoids relay
...
problems when devices have same game seed.
2011-11-28 18:53:40 -08:00
Eric House
1b864b5527
Add backtrace function. May only work on Linux but still very useful.
2011-11-28 18:12:56 -08:00
Eric House
384a41ed5b
add ability to specify seed and vary board-size
2011-11-25 18:03:51 -08:00
Andy2
f32f7a8b19
Don't behave badly in presence of empty dict: word count should be 0
...
and sanity test should pass.
2011-11-21 18:07:08 -08:00
Andy2
cc0105e14c
add param to dict_countWords in which it accumulates counts per word
...
length. Shouldn't hurt speed too much if null passed.
2011-11-18 08:15:21 -08:00
Andy2
598be8b404
MAX_COLS -> MAX_COLS_DICT for dict-related stuff (since dicts are
...
staying with fewer words for now.)
2011-11-18 07:56:02 -08:00
Andy2
4760ceda5a
Merge branch 'android_branch' into android_browsedict
...
Conflicts:
xwords4/android/XWords4/jni/anddict.c
2011-11-17 20:55:02 -08:00
Andy2
210c59ef9b
move bonus square values into model: add API to set an array, and API
...
to query model for values. Now everybody else queries new model API
rather than client via util_getSquareBonus(), model uses its internal
values if present otherwise falls back to util_getSquareBonus(), and
internalizes the array as part of the game. Now it should be easier
to have different bonus patterns and to have them exchanged as part of
network game init.
2011-11-16 19:01:11 -08:00
Andy2
bdb8e6f03c
fix several crashers that prevented network games from working when
...
MAX_COLS was larger than 16. In order that old-style messages on
relay be readable by new-style code on device, modified server.c's
protocol to include stream version. But: unless I come up with a
better way of doing this all devices will have to be upgraded at the
same time: old won't be able to read the new format as it's done here.
2011-11-15 06:13:25 -08:00
Andy2
379e5f1d96
use actual rather than max possible board dimensions to apportion
...
space, fixing crashes when max upped to 32. Will still fail as actual
size approaches that number.
2011-11-14 20:18:09 -08:00
Andy2
86d5778ec3
remove 16x16 limitation on board size, replacing with 32x32. Change
...
is enabled by a compile-time flag so Android needn't follow yet.
2011-11-14 18:21:41 -08:00
Eric House
d6fecaa3d3
don't crash when dict is empty file
2011-11-13 17:06:57 -08:00
Andy2
dddec50f1d
Merge branch 'android_branch' into android_browsedict
...
Conflicts:
xwords4/android/XWords4/jni/Android.mk
xwords4/linux/Makefile
xwords4/linux/linuxmain.c
2011-11-10 19:22:57 -08:00
Eric House
5be5e9fdeb
cleanup script output
2011-11-10 18:39:35 -08:00
eehouse@eehouse.org
9f22b11f81
Merge remote branch 'origin/android_branch' into android_branch
2011-11-10 06:54:42 -08:00
Andy2
00f743409a
script for reproducing problem with relay games that show up randomly.
2011-11-10 06:51:30 -08:00
Andy2
d479b2b979
use timeout rather than idle. Sometimes (due to bug?) curses app is
...
too busy ever to fire idle proc.
2011-11-10 06:51:05 -08:00
Eric House
36c267ad88
Merge remote branch 'origin/android_branch' into android_branch
2011-11-09 06:52:32 -08:00
Eric House
268f018140
add dict sanity check that will, I hope, catch corrupt dicts.
2011-11-09 06:51:12 -08:00
eehouse@eehouse.org
ffd6a42c1e
Merge remote branch 'origin/android_branch' into android_branch
2011-11-08 21:12:47 -08:00
Eric House
c591182d6c
Modify linux bonus square code to work with board data that's half the
...
size. Toward a board small enough to be transmitted as part of
network game initialization.
2011-11-08 21:11:06 -08:00
Andy2
956fe350ba
remove changed param -- mmap's the default now.
2011-11-07 18:19:12 -08:00
Andy2
4b5a06fe20
test code tweaks
2011-11-05 06:14:46 -07:00
Eric House
adb9473a87
Merge branch 'android_branch' into android_browsedict
...
Conflicts:
xwords4/common/dictiter.c
xwords4/linux/linuxmain.c
2011-11-03 21:32:04 -07:00
Eric House
a2319a8073
experimental additions, mostly compile-time disable-able, so prune
...
dict by wordlen.
2011-11-03 21:25:51 -07:00
Andy2
1de9f806e9
test dict_countWords()
2011-11-03 06:19:07 -07:00
Andy2
4f29f51253
turn dict iter feature on for linux for good
2011-11-03 06:18:15 -07:00
Andy2
5c995af38c
stop changing formats between internal and external structs
...
(iterators); use internal format all the time for speed. Update linux
test code for new API.
2011-11-02 18:32:00 -07:00
Andy2
ab4ccb1a22
use realloc for testing
2011-11-02 04:39:12 -07:00
Andy2
0d4404d43b
add dict_getStartsWith(), and code to test it. Lots of cleanup and
...
bugfixing of dictiter code as well.
2011-10-31 21:05:34 -07:00
Andy2
69b1b4da27
break dict iteration stuff out into new files. No code change
...
otherwise.
2011-10-31 18:30:55 -07:00
eehouse@eehouse.org
916d817ef2
Merge remote branch 'origin/android_branch' into android_branch
2011-10-31 07:02:30 -07:00
Andy2
dc58d123d5
combine params into single struct
2011-10-31 06:34:21 -07:00
Eric House
491c9d06d6
reverse sense of option to mmap dicts by default
2011-10-29 20:31:47 -07:00
Andy2
8d228ae190
turn on face-up tile picking for Android (though there's no prefs UI
...
to enable it for a game yet). In common code, break pick tile utils
method in two, one for blank and the other for tray tiles. In java,
implement dialog for picking the tiles. Works, though is a bit clumsy
to have the dialog come and go after every pick. Better would be a
dialog that stays up and accumulates picks -- but it'd have to know to
reduce the set of tile choices as letters are chosen. This'll do for
now.
2011-10-28 22:15:56 -07:00
Eric House
71450b02b3
use indexing (and add binary search) to double speed of getNthWord
2011-10-28 20:27:16 -07:00
Eric House
ff89ffb168
add missing backup button to fully test tile picking
2011-10-28 20:23:59 -07:00
Andy2
b62fe13c97
move dict iterator test into separate function and add test for
...
dict_getNthWord(). Still ifdef'd out.
2011-10-25 06:48:59 -07:00
Andy2
ac214236c4
add code to walk dict backwards as well, and test code that
...
succesfully walks huge dicts in both directions turning out the same
list of words either way. Still compile-time disabled.
2011-10-24 18:27:16 -07:00
Andy2
7c7cd82e0a
add code to iterate over words in a dict. Works on Linux (iterating
...
forward only) but disabled at compile time. Idea's to have a dict
browser. There was some simple refactoring in common code Android
uses, and that tests fine.
2011-10-21 18:51:33 -07:00
Andy2
4eee7f8aa7
Pass selected tiles into new util function, and from there into java
...
world, so confirming query can include them.
2011-10-19 18:34:26 -07:00
Andy2
b31e829414
Remove file-format differences between debug and non-debug versions.
...
Fix curses to compile non-debug.
2011-10-18 18:52:37 -07:00
Andy2
b02e0eb9cf
actually list words: makes a better test.
2011-10-17 06:47:49 -07:00
Andy2
6793742f0f
remove option to list all words played in a single lookup dialog, and
...
supporting code in the jni/common C.
2011-10-14 22:32:30 -07:00