Commit graph

3372 commits

Author SHA1 Message Date
Eric House
3d22d9e1b0 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-06-20 09:29:45 -07:00
Eric House
d5eca2027a remove local.properties, and add a script, run from build.xml before
local.properties is loaded, to generate it with a path to sdk
appropriate to the installation.
2010-06-20 09:29:13 -07:00
andy
ddc1d419b2 nuke CVSROOT 2010-06-20 09:23:33 -07:00
Andy2
388b6ec989 get rid of archaic cvsroot 2010-06-18 15:10:16 -07:00
eehouse@eehouse.org
1fdf1e1a41 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-06-17 20:40:13 -07:00
Eric House
a6b4e424ba Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2010-06-17 20:36:25 -07:00
Eric House
afb3f4040a fix to compile in non-debug mode 2010-06-17 20:35:54 -07:00
Andy2
12cc45617e don't use query title for informative dialogs reporting robot actions. 2010-06-17 18:56:51 -07:00
Andy2
38ef891268 new preference, on by default, controlling sorting of new tray tiles. 2010-06-17 18:51:46 -07:00
Andy2
adfb4d7a6a bug: wasn't passing changed prefs to server, only to board. So rather
than export server_prefsChanged via jni replace board_prefsChanged
with a new method that calls both.
2010-06-17 18:51:10 -07:00
Andy2
80aa22b2d1 add common prefs field sortNewTiles and way to set on linux cmdline 2010-06-17 18:10:32 -07:00
Andy2
e0dd3701a0 Add model_sortTiles(); use it; fix some comments and const decls.
Sorting always happens now when tiles added; needs to be based on a
preference.
2010-06-17 06:43:16 -07:00
Andy2
529f3df726 fix seekbar style so thumb's fully visible on 2.1 (was ok on 1.6); and
rename style for clarity.
2010-06-16 18:44:19 -07:00
Andy2
660d86c121 menuitem text change 2010-06-16 18:33:08 -07:00
Andy2
df3ab84b80 shrink rem and timer text to a size between cur player and remaining
players.  Looks better not so huge.
2010-06-16 18:30:27 -07:00
Andy2
448cb63891 remove TODO 2010-06-16 18:26:37 -07:00
Andy2
66f4b0d2f6 forgot to add this earlier and git didn't complain... 2010-06-16 18:07:01 -07:00
Andy2
95056db997 change meaning of timer setting to be per-player rather than per-game
based on information that that's how it's customarily done.  Will need
to communicate change with translators.
2010-06-16 06:39:27 -07:00
Andy2
78ad2feed9 rename static variable appropriately 2010-06-14 18:23:18 -07:00
Andy2
391982f16f synchronize saveSummary and getSummary. They can be called from
different threads and that may be the cause of a few crashes I've seen
and had reported.
2010-06-14 18:21:12 -07:00
Andy2
ca2aa982a7 update from translator 2010-06-14 18:18:17 -07:00
Andy2
375789cd02 juggle->shuffle; trade->exchange. Strings only; no code change. 2010-06-13 20:40:12 -07:00
Andy2
ccce9ca85d incorporate output of 'git describe' in name of .apk file produced 2010-06-10 22:43:11 -07:00
Andy2
74c9e9db92 add second prefs menu to restore all prefs 2010-06-10 21:28:38 -07:00
Andy2
57b74391bc remove duplicates that the compiler missed at first 2010-06-10 21:27:17 -07:00
Andy2
f9fbe386f5 add menu and menuitem to prefs dialog (shows up for main screen only)
to reset colors to defaults
2010-06-10 21:10:06 -07:00
Andy2
f7c737bcde latest from translator 2010-06-10 19:27:14 -07:00
Andy2
222f30b5ac hide zoom buttons when laying out board in case they're visible and
we're switching to landscape.
2010-06-08 22:55:40 -07:00
Andy2
7b897acfc1 don't put up zoom control in landscape mode. There just isn't room
and it in effect disables the tray.  Rather, think of landscape as
zoomed mode: no zooming necessary.  Volume controls still zoom if
enabled.
2010-06-08 22:40:17 -07:00
Andy2
e727fa7a03 first cut at Slovak from translator 2010-06-08 22:06:18 -07:00
Andy2
aa825bf662 fix for new location. Need to get this out of git somehow. 2010-06-07 06:11:11 -07:00
Andy2
cb5763312d can't use svnversion for file name any more 2010-06-07 05:50:01 -07:00
Andy2
ab167f51f4 can't use svnversion for file name any more 2010-06-07 05:48:25 -07:00
Andy2
d99241ccbc accomodate API changes 2010-06-07 05:45:37 -07:00
Eric House
d7d162d474 rearrange menus, promoting undo and hint and demoting flip and turndone 2010-06-06 13:33:19 -07:00
Eric House
34ecac303a make optional and then turn off feature whereby tap in empty part of
tray undoes current move.  It's too easy to hit this on a capacitive
display.
2010-06-06 13:32:12 -07:00
Eric House
94b3e16b7b add versioning codes required by market; up beta so they match. 2010-06-06 09:04:08 -07:00
Eric House
435122a837 hide all apk files 2010-06-06 08:59:15 -07:00
Eric House
ad3c936881 make directory for stuff to be ignored 2010-06-06 07:50:04 -07:00
eehouse@eehouse.org
db2c36eda9 add string 2010-06-06 06:41:45 -07:00
Eric House
e42404a8a6 Allow tray to be shorter when scrolling will be required. 2010-06-05 14:10:29 -07:00
Eric House
c897aefb7e quick uninstall script since I can't remember the syntax 2010-06-05 10:43:03 -07:00
Eric House
f9518d5a87 try pushing and popping any local changes around the build tag checkout 2010-06-05 10:29:22 -07:00
Eric House
e015bf81d1 add --tag option that causes to build from the tagged tree. Will
currently use tagname in about box only if there are no uncommitted
local revisions.  git stash might fix this.  Also need either to use
user-friendly tag names or provide them as alternatives here.
2010-06-05 10:17:53 -07:00
Eric House
d3eb3233a3 up version string to b6 -- to have something different from tag to work with 2010-06-05 09:22:02 -07:00
Eric House
cbdf32724a move .gitignore up to cover the whole tree 2010-06-05 09:08:36 -07:00
Eric House
564dfff2c0 rename generated class SvnVersion->GitVersion 2010-06-05 08:30:55 -07:00
Eric House
e10778b2f3 put result of 'git describe --always' into the about box for now.
Later will be using tagname if present.
2010-06-05 08:24:43 -07:00
Eric House
f5e8283869 ignore core files 2010-06-05 08:23:52 -07:00
Eric House
08ad0bdfa5 fix assertion failure by passing max size not < actual size 2010-06-05 08:10:02 -07:00