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

228 commits

Author SHA1 Message Date
Andy2
0df651027f Merge branch 'android_branch' into relay_proxy 
Conflicts:
	xwords4/relay/crefmgr.cpp
 2010-09-20 19:55:53 -07:00
Andy2
bca8300495 changes for b16: version strings and changes summary text. 2010-09-20 19:48:52 -07:00
Andy2
4e9d6e712e escape apostrophe -- new SDK requires it. 2010-09-20 06:18:53 -07:00
Andy2
e6545d8d57 set and save new booleans, etc. Relay params UI seems to work now 
except for listing public rooms (still hard-coded)
 2010-09-03 06:39:46 -07:00
Andy2
e20c63f38c move toward the UI I want: show public room browser or edittext for 
new room name depending on checkbox, etc.  Still not fully wired.
 2010-09-02 05:46:35 -07:00
Andy2
73746e3664 first cut at relay config section, inline this time, with refresh 
button and make-public checkbox.  Neither wired up nor hidden in
non-networked case.
 2010-09-01 06:49:01 -07:00
Andy2
784b5c8cdf tweak strings 2010-08-31 06:20:48 -07:00
Andy2
9367251b33 lots of changes, still needing cleanup and a bit of debugging, to 
simplify game settings dialog and remove role: a game is now
standalone or not.  Games will be matched on the relay (or over BT, I
assume) based on how many players they provide vs. need -- and other
settings like dictionary
 2010-08-31 05:43:41 -07:00
Andy2
adf9c28e0d make games list item as tall without delete button as is with. 2010-08-30 20:44:01 -07:00
eehouse@eehouse.org
ecd0280353 Merge branch 'android_branch' into relay_proxy 2010-08-26 18:36:55 -07:00
Andy2
5ddbef7829 update for b15 2010-08-26 18:33:22 -07:00
Andy2
51e2c61962 add array mapping lang code (the proprietary code stored in dicts) to 
language name.  (Names should be translated.)
 2010-08-25 06:34:29 -07:00
Andy2
b586fa1a34 add preference controlling how often proxy connects to relay. Still 
need to add way to change timer when interval pref is changed and
other cleanup.
 2010-08-23 18:39:47 -07:00
Andy2
38ed6e4054 add missing close tag 2010-08-11 21:10:10 -07:00
Andy2
81ad7719b1 list changes since b13 2010-08-10 21:34:44 -07:00
Andy2
fc603645d1 make changes dialog launchable from About dialog (so reachable other 
than immediately after upgrade)
 2010-08-10 20:33:33 -07:00
Andy2
e720fe79ab wrap in ScrollView so can scroll 2010-08-10 20:32:04 -07:00
Andy2
287ab2485f add changes summary dialog shown on first launch after an upgrade. 2010-08-10 18:48:19 -07:00
Andy2
9eb424201d Add credits to About; use style to remove duplicates; credit Sarah. 2010-07-18 19:16:46 -07:00
Andy2
ad1eb053ca a few final tweaks from Sarah 2010-07-18 14:39:46 -07:00
Andy2
b1f027ce00 latest from Sarah 2010-07-17 21:50:44 -07:00
Andy2
fb8692fb9f add preference for allowPeek 2010-07-17 07:06:33 -07:00
Andy2
6ffed8750a Make delete button smaller and at other end of screen from text. 2010-07-17 05:58:29 -07:00
eehouse@eehouse.org
f93f6222b2 Merge branch 'android_branch' into toolbar 2010-07-16 21:19:44 -07:00
Andy2
a91c665c45 latest from translator 2010-07-16 21:18:39 -07:00
Andy2
81694f8392 Sarah's latest icons, converted from .psd using imagemagick 2010-07-16 18:18:37 -07:00
Andy2
a99e8142b0 Merge branch 'android_branch' into toolbar 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/jni/xwjni.c
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
 2010-07-16 06:32:32 -07:00
Andy2
73980a3c50 use delete button in XWListItem instead of context menu item for DictsActivity too. 2010-07-16 06:19:19 -07:00
Andy2
f9a561bd2a first cut at putting a delete button next to players in config list 2010-07-16 05:50:20 -07:00
Andy2
f3ffbd94af remove focus-color pref; add crosshairs-color pref in same place 2010-07-14 06:21:55 -07:00
Andy2
55be90dd12 add preference controlling whether bonus "summaries" are shown on top 
of bonus squares.
 2010-07-13 22:39:45 -07:00
Andy2
7176c7036e add localizable "pts" to the in-tray pending score display 2010-07-13 18:57:48 -07:00
Eric House
7352cd5449 fix so bonus strings are in right order 2010-07-12 21:40:40 -07:00
Andy2
e55bb462d9 include bonus square summaries in grey 
Conflicts:

	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
 2010-07-12 21:40:23 -07:00
Eric House
177af25617 fix so bonus strings are in right order 2010-07-10 16:54:41 -07:00
Eric House
cedc00c9a6 include bonus square summaries in grey 2010-07-10 16:17:13 -07:00
Andy2
d3548aafb2 Make backgrounds transparent. By me: the artist is not to blame. :-) 2010-07-09 23:02:19 -07:00
Andy2
d7110824df make undo button the last; make vertical and horizontal toolbar 
orderings the same.  (Really should have just one toolbar and set it's
orientation on the fly.)
 2010-07-08 18:42:22 -07:00
Andy2
d68d597c49 Sarah Chu's first cut at icons. 2010-07-08 18:41:03 -07:00
Andy2
3976738990 put up indeterminate progress dialog when engine starts and at least 
one blank's involved.  Still needs to be made cancellable.
 2010-07-08 18:26:17 -07:00
Andy2
567d5f4d70 add and connect values button. It's visible when there are any tiles 
at all on the board.
 2010-07-08 06:39:48 -07:00
Andy2
a2e4fd09c4 add missing apostrophe 2010-07-07 18:27:29 -07:00
Andy2
93eca7b936 add layout_weight so buttons expand to fill toolbar. I really want 
available space distributed as space between rather than as wider
buttons but this is an improvement.
 2010-07-05 09:47:26 -07:00
Andy2
b163b45abe Merge branch 'android_branch' into toolbar 
Conflicts:
	xwords4/android/XWords4/AndroidManifest.xml
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res/xml/xwprefs.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConstants.java
 2010-07-04 13:28:47 -07:00
Andy2
c2aaa04517 move colors editing prefs screen into appearance prefs screen 2010-07-04 12:53:45 -07:00
Andy2
6264327d63 formatting change; whitespace only 2010-07-04 12:30:09 -07:00
Andy2
5b336146c8 add preference, as yet unused, to control whether tap drops context 
menu or opens game (as it used to do).
 2010-07-02 18:08:22 -07:00
Andy2
4b14e4aeb9 break most top-level prefs into behavior or appearance 2010-07-02 07:14:48 -07:00
Andy2
e22479ba03 add "play game" item to context menu, and invoke that menu on item 
click.  This fixes problem with users apparently not knowing about
long-tap and context menu and so not knowing they can configure a
game.  Unfortunately I can't figure out how to disable long-tap
also bringing up the context menu.  Yet another preference might be the fix.
 2010-07-02 07:04:37 -07:00
Andy2
650d9f5b45 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into toolbar 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
 2010-07-01 05:54:43 -07:00