Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3339 commits 21 branches 243 tags 33 MiB
Commit graph

3316 commits

Author SHA1 Message Date
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
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
Eric House
d98b2ad5d6 make git version available as a read-only advanced preference. I sure 
hope I never need to ask a user to transcribe this!
 2010-06-05 07:55:40 -07:00
Eric House
cbbaeb57a0 gitignore additions 2010-06-05 07:50:09 -07:00
Eric House
6456165a92 replace svnversion with gitversion.sh 2010-06-05 07:27:14 -07:00
Eric House
8aaaa06bcb identify rev number as from git 2010-06-05 07:25:24 -07:00
Eric House
21fef0ded8 script to replace, eventually if I'm lucky, svnversion as a way to 
mark a build's source.
 2010-06-05 07:20:49 -07:00
Eric House
d91f3de9a9 again: replace use of dead constant with numerals. git is a pain... 2010-06-04 23:37:16 -07:00
eehouse
ca968d8294 pass only -1 or 1 into board_zoom 2010-06-05 03:40:43 +00:00
eehouse
f514717428 Change board_zoom to indicate direction only of zoom, not number of 
cols.  When figuring internal dimensions zoom out as needed to meet
maxSize value.  This fixes problem where rotating a zoomed portrait
board to landscape leaves cells bigger than they can be made by
zooming, but then the desired zoom has been changed and stored and so
on return to portrait cells are smaller/less zoomed.  Need to see if I
can live with that.
 2010-06-05 03:40:23 +00:00
eehouse
d0b9f0f7aa add Retry button to dialog announcing client failure to find expected 
room on relay.  From handler call new comms_resetSame and existing
code to init client game connecion.
 2010-06-05 03:40:09 +00:00
eehouse
9f797afe73 export comms_resetSame through jni 2010-06-05 03:39:38 +00:00
eehouse
ea6166f8c7 add comms_resetSame that resets relay with existing params. 2010-06-05 03:39:16 +00:00
eehouse
a80d874e9d change api for board_zoom and change callers. No effect on java and 
no behavior change.
 2010-06-05 03:39:06 +00:00
eehouse
9af9df884b use same logic to decide to zoom and to report whether can zoom next 
time.  Fixes bug preventing + button from greying out when fully
zoomed in.
 2010-06-05 03:38:49 +00:00
eehouse
a2d2b0adbd quick hack to enable/disable zoom buttons so can debug board.c w/out 
android.
 2010-06-05 03:38:40 +00:00
eehouse
1f246d20a3 oops. Fix assertion by not stopping dragging unless it's been 
started.
 2010-06-04 03:47:56 +00:00
eehouse
57013a9267 stop dragging before putting up miniwindow. This allows to drag 
finger off of bonus hint just displayed without scrolling the screen.
 2010-06-04 03:47:46 +00:00
eehouse
9b81a668ad move System.loadLibrary("xwjni"); to XwJNI.java which is certain to 
always be loaded before any jni call is made.  Fixes -- I hope --
occasional UnsatisfiedLinkError happening on-device.
 2010-06-04 03:47:37 +00:00
eehouse
33a1efd725 save after every network event when running in background 2010-06-04 03:47:22 +00:00
eehouse
e1d956ac09 catch up with board_setPos API change. 2010-06-03 04:58:02 +00:00
eehouse
a3926f42ff move game save into jnithread so it can be synchronized with other 
activities accessing the jni, then do it once in onPause and again in
onDestroy before closing the game.  Network activities are probably
the only things that can change the game state after onPause is
called, so they'll probably want to be followed by SAVE commands.
 2010-06-03 04:57:46 +00:00
eehouse
7b33455799 move game-close logic from onPause to onDestroy. Makes for much 
faster resume and seems ok.  But need to do some saving in onPause so
no data's lost if we're killed without onDestroy getting called.
 2010-06-03 04:57:27 +00:00
eehouse
628f8d9cf3 don't zoom in if doing so will make cells larger than the limit passed 
in.
 2010-06-03 04:57:11 +00:00
ehouse
43181f5cd2 accept multiple cref ids and names on console 2010-06-03 03:00:35 +00:00
eehouse
0920eeb6b3 set default font height based on scale rather than assuming Paint's 
defaults make sense.
 2010-06-02 12:46:08 +00:00
eehouse
bcac60b2d4 don't display zoom control at all if both buttons disabled. 2010-06-02 04:59:51 +00:00
eehouse
68bf571f26 figure maxCellSize and pass to jni; call after doing layout to 
correctly get whether zooming is possible.
 2010-06-02 04:59:34 +00:00
eehouse
048e854d4e no point in triggering a zoom call meant to get state before layout's 
been done.
 2010-06-02 04:59:14 +00:00
eehouse
c7bedc297c include new param to board_zoom 2010-06-02 04:58:53 +00:00
eehouse
4f16eee1b6 pass maxCellSize into board_setPos, and use it as limit in calculating 
whether any further zooming is possible.
 2010-06-02 04:58:32 +00:00
eehouse
4fe36455c6 Add upper bound on cell size yielding left and right margins for 
super-wide screens.
 2010-06-02 04:58:20 +00:00
ehouse
69cb7bce15 up release to b5 2010-06-01 02:50:11 +00:00
eehouse
a8e705dcc8 mark blanks with a circle around it rather than rects in the corners 2010-05-28 02:31:46 +00:00
eehouse
8bb2fb9b09 track and display in web view the number of games actually joined 
rather than the number attempted.
 2010-05-28 02:31:27 +00:00
eehouse
f5ac51ae73 fix crash using older dict by using current stream version rather than 
one from before gameSeconds was being preserved in the stream by
write_gi code.  I fixed this on a branch a week ago as well, so look
for a merge glitch.  Need now to confirm that I'm sending char lists
in initial connect message in the right (null-separated utf8) format.
 2010-05-28 02:31:13 +00:00
eehouse
92e02c9c2e catch up with API changes 2010-05-28 02:31:04 +00:00
eehouse
0d7b09cb01 revert 3407; deleted a string I needed 2010-05-27 12:52:48 +00:00
eehouse
4b7dad5f5c fix jni reentrancy problem when onPause called while a blocking dialog 
is up.  The fix is to track if there's a thread blocked and to
interrupt it so it can return through the jni as if the dialog were
cancelled.  More explanation in comments part of this checkin.
 2010-05-27 02:58:56 +00:00
eehouse
b54ffe2b7d robot move/trade report dialogs need to block in case the next player 
is also a robot
 2010-05-27 02:58:42 +00:00
eehouse
c5a0384d79 include name of game in title of game-configure screen 2010-05-27 02:58:27 +00:00
eehouse
6b9c4a4e0f shorten pattern to include multi-line elements (I should use 
xmlstarlet here but need to grok xslt); don't report as missing
strings in the common file
 2010-05-27 02:58:08 +00:00
eehouse
cc984f02ab remove unused string 2010-05-27 02:57:57 +00:00
eehouse
282f9ce237 wrap in scrollview so still usable in landscape orientation 2010-05-27 02:57:46 +00:00
eehouse
4be4a8156a wire new edittext to seekbar and vice-versa, including hack boolean to 
prevent loop that resets the cursor to the 0 position on every
keystroke.
 2010-05-27 02:57:35 +00:00
eehouse
8c790edd04 add numerical edittexts to left of seekers in color edit view. Not 
yet wired up but layout's ok
 2010-05-27 02:57:21 +00:00
eehouse
8e06ff446a Preferences->Settings; remove duplicated strings. 2010-05-27 02:56:54 +00:00
eehouse
2449962185 add icons to the games list activity menu, three built-in and one with 
a CC license.
 2010-05-27 02:56:36 +00:00
eehouse
b345938e03 dictionary icon adapted from http://icons2.iconarchive.com/icons/mattahan/buuf/48/Dictionary-icon.png using gimp. Original by Mattahan (Paul Davey) license: CC Attribution-Noncommercial-Share Alike 3.0 2010-05-27 02:56:24 +00:00
eehouse
695c5736e5 fix default phonies value; improve some strings related to default timer 2010-05-26 02:51:15 +00:00
eehouse
dd2693bab0 factor out common code 2010-05-26 02:27:34 +00:00
eehouse
28d9d4559d add new-game/default prefs for phonies and timer_enabled 2010-05-26 02:27:16 +00:00
eehouse
ec57cbcf1b actually hide the delete menuitem for builtin dicts; greyed out is too 
subtle.
 2010-05-26 02:26:44 +00:00
eehouse
da7c59a869 subclass ListPreference in order to provide a list of dicts at runtime 
for setting the default.  Remove the hint that says "do it on dicts
screen."
 2010-05-26 02:26:24 +00:00
eehouse
c92d919934 log error from read 2010-05-26 02:25:58 +00:00
eehouse
42a4a19911 disable delete menuitem when dicts are builtin (since can't be deleted) 2010-05-20 04:29:29 +00:00
eehouse
70f0a5fe90 fix dict deletion (which broke when extension removed from 
user-visible name)
 2010-05-20 04:29:10 +00:00
eehouse
84f76a8c9a Add a summary visible before default dict has been set directing user 
on how to change it.  Goes away when it becomes possible to set
directly in prefs activity.
 2010-05-20 04:28:53 +00:00
eehouse
1054ba5341 don't replace summary with empty value 2010-05-20 04:28:38 +00:00
eehouse
1ea06352dc latest from translator 2010-05-20 04:28:20 +00:00
eehouse
7a279702c0 add sterrror to what's logged when pthread_create fails -- as is 
happening often.
 2010-05-20 04:28:07 +00:00
eehouse
3863279013 divider follows last item too on real lists; add spacing above and below it. 2010-05-20 04:27:56 +00:00
eehouse
a76fd7b87a contributed icon 2010-05-18 02:33:16 +00:00
ehouse
b38fa6c62e latest from translator (plus my shot at playerf) 2010-05-18 02:31:09 +00:00
eehouse
7913292942 get "Player 1" etc from a resource; don't hard-code! 2010-05-18 02:27:34 +00:00
eehouse
f3f350a12d Create new prefs screen with per-game defaults, adding existing and 
new for dicts; use dict pref when creating new game; add menuitem to
dicts view to set that pref.  I want to launch the dicts activity from
the preference instead (which is information-only right now) but can't
figure out how to do startActivityForResult from a Preference....
 2010-05-18 02:27:14 +00:00
eehouse
4f8c7b3cb8 trying again with the right params to iconv 2010-05-15 03:07:51 +00:00
eehouse
40c25d6137 add initial/default value of gameSeconds as a preference and honor it 
when creating and copying CurGameInfo instances.
 2010-05-14 12:43:17 +00:00
eehouse
4ce0a30b2d save gameSeconds even if timer not enabled. Means stream version change. 2010-05-14 12:42:53 +00:00
eehouse
bbfa375dfe erase cached tile rects when doing layout to fix bug where tile 
letters are partially offtile when a game first opened game in
landscape changes to portrait mode.
 2010-05-14 12:42:44 +00:00
eehouse
95460e1685 Draw score entries for players whose turn it isn't in two lines so you 
can still see the name.
 2010-05-14 12:42:28 +00:00
eehouse
c9ca99d3f0 convert (with iconv) to utf8 2010-05-13 04:20:20 +00:00
eehouse
8f0cae4bf2 czech strings as received from translator 2010-05-13 04:16:30 +00:00
eehouse
71e65433d3 figure board dimensions in one place rather than two, then share. 2010-05-12 11:59:40 +00:00
eehouse
51f3412567 Break game- and dict-related static methods from Utils into new GameUtils 2010-05-12 11:58:37 +00:00
eehouse
c85b033ced Break db-related static methods from Utils into new DBUtils 2010-05-12 11:57:07 +00:00
eehouse
24c1527232 fix yOffsetChanged to follow new API, but still leave commented out; 
set game file name from resource, and make visible in board title and
as part of games list entries.
 2010-05-12 11:56:01 +00:00
eehouse
6bbf7f32dd don't store Context as a class variable in CommonPrefs. Instead, pass 
it into every method where it's needed.  This should fix occasional
crash where the OS relaunches me into an activity that uses prefs
without passing through the GamesListActivity where that static was
getting set.
 2010-05-12 11:54:36 +00:00
eehouse
f154e83a21 draw_scoreBegin now returns a boolean 2010-05-12 11:53:06 +00:00
eehouse
4da3edabbb draw_scoreBegin now returns a boolean 2010-05-12 11:51:55 +00:00
eehouse
c79b3e2395 make draw_scoreBegin return a boolean like the other two draw_*Begin 
methods
 2010-05-12 11:51:14 +00:00
eehouse
7faaed04f5 remove .xwd from dict names displayed to users. 2010-05-12 11:50:25 +00:00
eehouse
7daa6e33f7 Make first player a robot rather than second. This might make a 
better first impression on new users.
 2010-05-12 11:49:38 +00:00
eehouse
1e560bfd42 move the download-url string into non-localizable strings 2010-05-12 11:48:33 +00:00
eehouse
5617533403 up beta version 2010-05-12 11:47:49 +00:00
eehouse
bfee36bf56 add minSdkVersion and targetSdkVersion 2010-05-12 11:47:22 +00:00
eehouse
772291ea73 add hour to timestamp 2010-05-09 20:40:55 +00:00
eehouse
3159e864b5 add onResume to undo effects of onPause. I'm pretty sure this fixes 
the white screen on device bug.
 2010-05-09 20:40:39 +00:00
eehouse
77f21c6f2e try passing application context to CommonPrefs. I'm getting a crash 
on device when app's been running for a while and, perhaps, the
original GamesList activity has been recycled but CommonPrefs instance
with its static has not.  The BoardView is being recreated and
CommonPrefs asserts that m_context is null.  That shouldn't be
possible, but we'll try this.
 2010-05-09 14:42:19 +00:00