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

342 commits

Author SHA1 Message Date
Eric House
b0e6f24bda fix comment syntax 2011-09-12 22:14:35 -07:00
Andy2
4c2d21f6bc Merge branch 'android_branch' into french_xlation 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-09-12 20:09:56 -07:00
Andy2
c9c498786e add to game state whether any tiles selected. Use that to disable 
'commit exchange' button when there's nothing to commit, and get rid
of error message used when committing nothing since it's now
impossible (on Android).
 2011-09-09 19:04:25 -07:00
Andy2
66fb5f87fb don't exit trade mode if no tiles selected; fix warning string to match. 2011-09-09 18:40:19 -07:00
Andy2
06571d0478 up constants and update changes list for new release 2011-09-09 18:17:28 -07:00
Andy2
1d612288d4 add optional param to confirmation dialogs to allow positive button 
other than Ok; add "Delete" and "Reset" for game and dict actions.
 2011-09-09 06:50:00 -07:00
Andy2
fda3207b78 fix inability to tell whether a dict being deleted is in use: add to 
summaries DB list of dicts in the game and a method that queries that.
Pick delete-confirmation message based on the language of dict,
whether there are others in the same language, and whether games are
using that language or that dict.
 2011-09-08 21:36:15 -07:00
Andy2
528db479b5 bunch of changes whose original purpose was to allow me to deal 
correctly with having the same dict stored in more than one place.
Added DictAndLoc with members name and loc to support this, and used
in a bunch of places in place of mere strings, including
DictsActivity.  Also removed code warning when you're deleting a dict
that's not the last in its lang, which incorrectly warned that the
dict was in use when in fact I can't tell that.  The warning "might be
in use" sounds dumb so it's gone for now.
 2011-09-08 19:10:06 -07:00
Eric House
8a856721cd Merge branch 'android_branch' into french_xlation 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-09-07 22:02:04 -07:00
Andy2
1af358b269 move code to unpack players list into same file as the code packing 
it; add boolean, now always passed as false, to code printing names
for game config list of players to include the dictionary.  It's
useful for debugging, and I think it'd make a good optional setting,
but nobody else thinks so.  Once it's checked in the change can go if
I'm not using it.
 2011-09-03 21:05:08 -07:00
Andy2
3fd0bb056a when there's no move made yet to display after score entry held say 
so.
 2011-09-02 19:24:42 -07:00
Andy2
2f91b8ed3d remove unused strings 2011-09-02 18:37:58 -07:00
Andy2
5ca9042b7e Merge branch 'android_branch' into french_xlation 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-09-01 20:01:47 -07:00
Andy2
437e4e21ac There are buttons not menu items for exiting exchange mode so 
reference them in newbie text.  And get rid of string for toast
exiting the mode since we don't show it.
 2011-09-01 18:54:27 -07:00
Eric House
3de65206e8 Merge branch 'french_xlation' of ssh://xwords.git.sf.net/gitroot/xwords/xwords into french_xlation 2011-08-31 19:16:02 -07:00
Eric House
de6d4897a7 more progress, but still not done 2011-08-31 19:15:12 -07:00
Andy2
cdf526c95d Merge branch 'android_branch' into french_xlation 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-08-31 06:46:02 -07:00
Andy2
671877cbca implement new util_ methods in jni and java; remove old miniwindow 
stuff.  In java, respond to util_playerScoreHeld() and
util_bonusSquareHeld() by putting up toasts with existing strings.
For util_setInTrade(), fix exchange mode. Add two buttons at bottom
that replace toolbar (and corresponding buttons on menu). Redraw
scoreboard and board with high transparency to make it clear they're
disabled.  Still to do: deal with case where ability to switch which
player's tray is visible is enabled.
 2011-08-31 06:37:33 -07:00
Andy2
03e4a41870 snapshot of continuing addition of contextual comments 2011-08-29 20:45:25 -07:00
Eric House
36305eed0e add more comments 2011-08-29 05:52:09 -07:00
Andy2
7f2becfe50 Merge branch 'android_branch' into french_xlation 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-08-28 17:31:46 -07:00
Andy2
5acc2205be add pref to edit color used to draw bonus hints on cells 2011-08-25 18:13:42 -07:00
Andy2
d7a515ca97 display three states of relay connectedness in games list items: 
configured, connected but waiting for players, and game-in-play.
 2011-08-22 07:03:46 -07:00
Eric House
609f4be8a6 Merge branch 'android_branch' into french_xlation 2011-08-21 21:56:52 -07:00
Eric House
cf6d868bd3 use separate strings for window title and spinner prompt 2011-08-21 18:17:21 -07:00
eehouse@eehouse.org
abe270d45c Merge branch 'android_branch' into french_xlation 2011-08-21 15:03:57 -07:00
Andy2
aeafb9cefa Tweak language for moving wordlists to more clearly refer to storage 
locations.
 2011-08-21 15:03:41 -07:00
Andy2
6b8fd222ef Merge branch 'android_branch' into french_xlation 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-08-21 14:35:53 -07:00
Andy2
04834c910b more dictionary->wordlist terminology change: debug-only preference 
and download URL.
 2011-08-21 14:27:50 -07:00
Andy2
a17ff20db7 clean up background check pref wording to Chris's suggestions 2011-08-21 13:52:51 -07:00
Andy2
a72883ae9a Merge branch 'android_branch' into french_xlation 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-08-21 12:29:32 -07:00
Andy2
5c8afa06ce version string and changelog for beta 33 2011-08-21 12:07:45 -07:00
Andy2
c38e3593fb replace hard-coded placeholder names for optional top-line of games 
list item display with real "aa vs. bb vs..." consed up in
GameSummary, and set field to singleline so doesn't wrap when names
get too long.
 2011-08-21 11:39:38 -07:00
Andy2
28c78a0a6a dictionary->wordlist 2011-08-20 14:16:38 -07:00
Andy2
fd4e627628 when sd card is umounted, android sends a message to apps. I can't 
figure out how to get that so I ignore it and am killed then
relaunched if I have a dict file open on the SD.  On relauch, don't
crash.  Instead, check if any dicts used by the game is unreachable
and put up an alert with only one choice: Close game.  Thought about
using the missing-dicts stuff from GamesList, but this is a special
case that should be seen only when user umounts while a BoardActivity
instance is frontmost.
 2011-08-18 07:54:00 -07:00
Andy2
455cb9a4c4 Include possibility of umounted sd card in missing dict 
explanation. Name of game too.  Use single-selectable list and
Substitute button instead of expecting user to tap once to select
(which confused me.)
 2011-08-18 06:26:43 -07:00
Eric House
5c68f375fd reorder more strings and add a bunch more context comments. 2011-08-16 19:42:54 -07:00
Eric House
9f84468297 beginning process of adding contextual comments to all translatable strings. 2011-08-15 21:49:30 -07:00
Andy2
e2ef25ae90 add pref for choosing what goes in parens along with the game name 
(where <language> was before.)  opponent name still needs to not be
hard-coded; the rest works.
 2011-08-09 19:26:59 -07:00
Andy2
f8715feea6 update version and changelog for b32 2011-08-06 23:08:42 -07:00
Andy2
011b283566 tweak copy dialog to suggest using new-from. 2011-08-06 16:18:32 -07:00
Andy2
6cde6be6a5 up version and changelog for beta 31 2011-08-06 14:29:58 -07:00
Andy2
d7dfb89f65 query user before sending invite whether to use html or text and 
format differently depending on the answer.  With html only I couldn't
invite using SMS, which bites.
 2011-08-06 13:01:40 -07:00
Andy2
9c298a16e7 The email apps won't display non-http schemes as clickable links, so 
go with html and encode both the invite and install links as php refs
that get redirected.  Works, but eliminates SMS as sending mechanism.
 2011-08-06 02:57:14 -07:00
Andy2
e8b66e230c add title to context menu that includes game name 2011-08-04 18:16:32 -07:00
Andy2
9aeb8858fe add menuitem and dialog it triggers to rename games. Add new DB field 
to hold game name, and getter and setter.  Replace existing gameName()
method with call to new getter.
 2011-08-03 18:59:32 -07:00
Eric House
febb640049 add name of remote player to notification that remote player moved. 
And remove a few dead strings.
 2011-07-15 18:13:55 -07:00
Andy2
9bed15179d version update -- getting ready for next beta! 2011-07-14 18:53:45 -07:00
Andy2
8c36727578 tweak new-game dialog strings. 2011-07-08 18:45:41 -07:00
Andy2
0c4191805f Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/res/values/common_rsrc.xml
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java
	xwords4/linux/scripts/discon_ok2.sh
 2011-07-07 18:50:22 -07:00