Eric House
7783021fd7
give player a chance to name rematch game, and provide default that
...
includes opponent's name
2015-09-23 07:53:49 -07:00
Eric House
b73b29fcca
log what's sent too -- for debugging update process
2015-09-22 20:39:37 -07:00
Eric House
8a2ca8195e
log bad json data
2015-09-22 20:23:08 -07:00
Eric House
a2fb6045a8
tweak move reminder strings
2015-09-22 20:21:58 -07:00
Eric House
bfce38c088
use a hash map instead of a bunch of str-compares.
2015-09-22 20:18:27 -07:00
Eric House
b3a93cc474
Make separate turn reminder disable prefs for solo and networked
...
games, as some folks playing against the robot don't need to be
reminded. From a feature request submitted via sourceforge.
2015-09-22 07:35:02 -07:00
Eric House
cb1d7dff71
Merge branch 'android_branch' into relay_noconn
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-09-21 07:14:01 -07:00
Eric House
b3a2e28647
copy over from android_translate branch
2015-09-17 19:38:00 -07:00
Eric House
6f3b80cc68
catch up with recent changes
2015-09-17 07:11:39 -07:00
Eric House
3040d7f487
use new protocol for next release
2015-09-17 07:06:59 -07:00
Eric House
122335c53c
Merge branch 'android_branch' into relay_noconn
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-09-17 07:00:04 -07:00
Eric House
db1f569430
in chat window, don't show send menu item unless text is non-empty
2015-09-17 06:59:02 -07:00
Eric House
6eb2e8e174
pull in latest French translation
2015-09-16 06:49:52 -07:00
Eric House
5d59bcd011
Revert to old proto since the version that's out there now won't work
...
with the new. Can switch once this version's distributed.
2015-09-16 06:42:01 -07:00
Eric House
1a258be2f4
merge in latest from android_translate branch
2015-08-27 21:57:19 -07:00
Eric House
be44613773
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-08-27 07:53:14 -07:00
Eric House
53025f8a99
clean up plurals, adding quantity="one" elements in a few places where
...
they make sense, collapsing a plurals to a string where that made
sense (there will probably never be a one-word wordlist), and removing
an unused plurals.
2015-08-27 07:42:16 -07:00
Eric House
db7aa3923b
Merge branch 'android_branch' into relay_noconn
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-08-26 07:09:56 -07:00
Eric House
a4e25576ad
bring over changes from android_translate branch (via brute-force copy)
2015-08-26 07:00:54 -07:00
Eric House
83d3163f0e
rename variable
2015-08-25 22:19:00 -07:00
Eric House
c3b2ecdb1d
Merge branch 'android_branch' into relay_noconn
2015-08-25 06:46:35 -07:00
Eric House
9a75ef29f2
fix misspelling
2015-08-25 06:46:03 -07:00
Eric House
c81f035133
Merge branch 'android_branch' into relay_noconn
2015-08-25 06:40:42 -07:00
Eric House
26114f83a6
fix chat view not being opened if move had arrived after chat by
...
removing unneeded variable whose presence was clearing flags.
2015-08-25 06:38:14 -07:00
Eric House
2aa9740814
up strings and changelog for new release
2015-08-25 05:24:58 -07:00
Eric House
b79836c61b
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-08-24 07:52:46 -07:00
Eric House
a073ad68ae
add missing image
2015-08-24 07:42:36 -07:00
Eric House
5fd477be75
use existing string -- Copy to clipboard
2015-08-23 21:52:07 -07:00
Eric House
98bd41bc14
experimental option that puts invite url text into clipboard so user
...
can invite using app of her choice.
Conflicts:
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-08-23 21:44:45 -07:00
Eric House
6d6c345f94
Merge branch 'android_branch' into relay_noconn
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-08-23 21:18:05 -07:00
Sylvie
ec3af948e3
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (691 of 691 strings)
2015-08-23 21:17:16 -07:00
Joan Montané
ab791fb430
Translated using Weblate (Catalan)
...
Currently translated at 100.0% (691 of 691 strings)
2015-08-23 21:14:34 -07:00
Bernard Massot
8da25dcdd4
Translated using Weblate (French)
...
Currently translated at 100.0% (691 of 691 strings)
2015-08-23 21:14:20 -07:00
Eric House
1df48d2792
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
2015-08-21 07:17:31 -07:00
Eric House
8f93630350
shorten string to make action bar more obvious (and catch up with
...
generated string file changes)
2015-08-21 06:56:47 -07:00
Eric House
e0327b0f62
ignore files
2015-08-20 07:41:48 -07:00
Eric House
79ab1214e7
replace send button with menuitem, and add icons for it and clear
2015-08-20 07:38:09 -07:00
Eric House
6b455bf743
make chat compose space multi-line; scroll chat history to bottom on
...
open
2015-08-20 07:37:51 -07:00
Eric House
07e97107ce
confirm before deleting chat history
...
Conflicts:
xwords4/android/XWords4/res/values/strings.xml
2015-08-20 07:37:30 -07:00
Eric House
d08e82220d
replace send button with menuitem, and add icons for it and clear
2015-08-20 07:35:01 -07:00
Eric House
ec6b7207b4
make chat compose space multi-line; scroll chat history to bottom on
...
open
2015-08-20 07:15:20 -07:00
Eric House
f4b39287a5
confirm before deleting chat history
2015-08-20 07:03:21 -07:00
Eric House
e5cf0ee4fb
Merge branch 'android_branch' into relay_noconn
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-08-19 07:44:17 -07:00
Eric House
a11e5beded
goes with prev commit
2015-08-18 06:41:57 -07:00
Eric House
ff3d587179
really only post messages sent toast when user chose the menuitem
2015-08-18 06:41:34 -07:00
Eric House
aee4d9d6a4
goes with prev commit
2015-08-18 06:40:50 -07:00
Eric House
1703a15aca
really only post messages sent toast when user chose the menuitem
2015-08-18 06:40:31 -07:00
Eric House
0d8fef5c56
cleanup
2015-08-17 08:01:36 -07:00
Eric House
0d04b176d2
catch up generated strings
2015-08-17 07:13:02 -07:00
Eric House
592f01a767
Merge branch 'android_branch' into relay_noconn
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-08-17 07:07:59 -07:00
