Commit graph

8877 commits

Author SHA1 Message Date
Eric House
97ebdd0d63 copy changes over from android_translate branch 2015-08-04 20:15:38 -07:00
Eric House
adceab1ed1 name change 2015-08-04 20:15:00 -07:00
Eric House
debe424c8a copy over from android_translate branch 2015-08-04 20:13:19 -07:00
Eric House
a45b698ea9 don't crash when first run without network connection 2015-08-03 05:25:35 -07:00
Eric House
bcd620a4f9 clean up to make cherry-picked changes work 2015-08-03 05:07:49 -07:00
Eric House
cfa101350a add logdf, logging for DEBUG builds only 2015-08-03 05:06:38 -07:00
Eric House
a612a89ac6 fix variant crashes: had forgotten PKG_PATH on new method 2015-08-03 04:59:15 -07:00
Eric House
97bf616db1 Problem: NBS port is being ignored by dispatcher to broadcast
receivers on receiving device, so variants are getting their own and
all other NBS messages. Solution: change protocol to include port
message is meant for so mis-delivered ones can be dropped.
2015-08-03 04:58:46 -07:00
Eric House
c83d3368ad allow using script for any project with an AndroidManifest.xml 2015-08-03 04:58:34 -07:00
Eric House
1e7f51a88d move last-pressed button to bottom of screen where it's natural to look for it 2015-08-03 04:58:18 -07:00
Eric House
a5f332dd1d different logging TAG for different variants 2015-08-03 04:57:35 -07:00
Eric House
6871ef24a6 move several strings, including app name, NBS port, and url prefix, into generated
.xml file so Dbg and regular variants can co-exist better

Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-08-03 04:55:59 -07:00
Eric House
1959ff3b2d fix NPE reported by crittercism 2015-08-03 04:54:42 -07:00
Eric House
b500a4646d use different uuid for dbg variant so it's not cross-sending BT
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
2015-08-03 04:50:56 -07:00
Eric House
b56924b030 fix off-by-one error that probably had me slowly leaking local obj
references for the last few years.
2015-08-02 16:43:52 -07:00
Eric House
81834bcbfa provide app name in variant too to fix empty substitution errors
(e.g. About menutem)
2015-07-31 07:14:11 -07:00
Eric House
36adf7f86c get rid of About menuitem in board -- in main view is enough 2015-07-31 07:14:04 -07:00
Eric House
4a580eabda handle maintenance messages from relay 2015-07-31 06:36:35 -07:00
Eric House
8acba7e092 add only phones and computers to list of possible BT opponent devices 2015-07-29 06:39:03 -07:00
Eric House
cb7b8660dc bring in Catalan changes from android_translate branch, and fix a
couple of typos
2015-07-29 05:47:08 -07:00
Eric House
a2705ca821 uninstall dbg variant too 2015-07-28 21:01:46 -07:00
Eric House
2ec2972b9b invalidate menubar when minimizing group. (Thanks Aidan.) 2015-07-28 06:26:25 -07:00
Eric House
aa78ec2701 echo name of new .apk for easier scping 2015-07-27 07:29:09 -07:00
Eric House
82f1406df7 incorporate git rev number in name of debug .apk 2015-07-27 07:28:58 -07:00
Eric House
7cc58de6e5 Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch
Conflicts:
	xwords4/android/scripts/info.py
2015-07-27 07:14:54 -07:00
Eric House
e31c7ae4f5 update to not notify of debug build updates when version matches what's installed 2015-07-27 07:12:44 -07:00
Eric House
75cd6c6693 fix logic behind "unable to find move" alert 2015-07-26 13:17:59 -07:00
Eric House
3c58267d4e goes with cherrypick 2015-07-26 12:09:51 -07:00
Eric House
0bb51e8b93 show a toast when hint can't find anything, on the principle that user
should see some response to every action.

Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-07-26 12:09:15 -07:00
Eric House
2e6154e920 Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch
Conflicts:
	xwords4/android/scripts/info.py
2015-07-25 22:03:05 -07:00
Eric House
fe91c9e04e update to serve newest debug as well as release builds, and to know about variants 2015-07-25 21:56:48 -07:00
Eric House
fa00eef151 convert string to plurals and add some "one" items to others to allow
removing [s]. There's more to do still.
2015-07-23 06:57:37 -07:00
Eric House
f626d6ca4c remove redundant constant 2015-07-21 06:55:15 -07:00
Eric House
c796e7d4cc clear the net status rect for standalone games' boards to avoid ghost
button effect when they're opened after a networked game.
2015-07-17 06:10:08 -07:00
Eric House
b87d258729 Merge remote branch 'origin/android_branch' into android_branch 2015-07-11 08:42:19 -07:00
Eric House
6851fd9746 include teaser from server, and launch an alert in-game instead of
having the notification display everything. I've committed this
before; not sure where it went.
2015-07-11 08:25:10 -07:00
Eric House
5e63d03e76 apparently I forgot to check this in 2015-07-11 08:23:22 -07:00
Eric House
384721d68d Merge branch 'android_branch' of ssh://maidu2/home/eehouse/src/git/repos/xwords into android_branch
# 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-07-11 08:09:47 -07:00
Eric House
67f4e4475c manual bring-over of relay changes for invite support 2015-07-11 08:08:22 -07:00
Eric House
ec393bc0c8 don't crash if intent is null 2015-07-11 07:53:22 -07:00
Relay User
9c7213e42b Make it possible to launch relay early in machine boot cycle before
postgres is running (e.g. from a @reboot shortcut in a crontab) by
having it wait, sleeping periodically, until a connection is
available. Requires new flag be passed into main.
2015-07-11 07:04:24 -07:00
Relay User
8f863f0369 Make it possible to launch relay early in machine boot cycle before
postgres is running (e.g. from a @reboot shortcut in a crontab) by
having it wait, sleeping periodically, until a connection is
available. Requires new flag be passed into main.
2015-07-11 07:04:24 -07:00
Relay User
d605686fd6 add teaser to gcm message (matches android client change) 2015-07-11 07:04:24 -07:00
Eric House
8efde54ebc Merge branch 'android_branch', remote branch 'origin/android_branch' into android_branch 2015-07-10 23:31:47 -07:00
Eric House
dba86a657f add and handle new INVITE message types. (This can safely be added to shipping relay.) 2015-07-10 23:25:06 -07:00
Eric House
29d8a67c36 Makefile for new wordlist 2015-07-08 20:41:13 -07:00
Eric House
fe25060255 fix assertion failure, probably due to some freak accident of missaved
timestamp. Whatever.
2015-07-01 05:52:02 -07:00
Eric House
d479486521 change defaults so a with-games-ui/udp game interface comes up by
default.
2015-06-26 07:35:24 -07:00
Eric House
d426db7a49 move httppost stuff into NetUtils 2015-06-26 06:37:34 -07:00
Eric House
8a575bc789 fill in help text for communication means 2015-06-26 06:18:42 -07:00