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
9552 commits 21 branches 243 tags 33 MiB
Commit graph

9552 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric House
75939d9203 remove bogus flag (incompatible with my key). And confirm that can be 
installed on top of a build signed with SHA256, the new default.
 2016-02-01 06:27:29 -08:00
Eric House
36551a310a add jarsigner params that are supposed to fix for installing on older devices 2016-02-01 06:17:36 -08:00
Eric House
45224a75fa add (disabled) code for case where game ptr wrapper is passed instead 
of the ptr itself.
 2016-01-31 20:06:45 -08:00
Eric House
9455c0ef26 wrap jni ptr so can detect leaks (failure to call 
game_dispose()). There was one that had been undetected for years. The
int is still passed into the jni, and each call site has to pull it
from the wrapper. Better would be to pass the wrapper, but I'm worried
about the performance hit of making a call back into the java world
from every jni entrypoint. Will test....
 2016-01-31 19:51:51 -08:00
Eric House
8327fa71a1 Merge branch 'android_branch' into android_translate 
# 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.
 2016-01-29 06:03:58 -08:00
Eric House
86068cfdfe oops -- forget to let these get generated 2016-01-29 06:01:53 -08:00
Eric House
7b452e37e4 Merge branch 'android_translate' of git://git.weblate.org/xwords into android_translate 
# Conflicts:
#	xwords4/android/XWords4/res_src/values-fr/strings.xml
 2016-01-29 06:00:56 -08:00
jean-christophe
93e3468501 Translated using Weblate (French) 
Currently translated at 99.1% (704 of 710 strings)
 2016-01-29 00:32:38 +01:00
naofum
20c99c61b6 Translated using Weblate (Japanese) 
Currently translated at 100.0% (710 of 710 strings)
 2016-01-28 12:44:42 +01:00
Eric House
794bce1ceb cleanup from review of diff since last release. All whitespace or 
removing logging except for one check for null.
 2016-01-27 07:31:10 -08:00
Eric House
247f6c2f6e Merge branch 'android_branch' into android_translate 2016-01-25 07:30:07 -08:00
Eric House
813d5c18b3 show explanatory text when there are no invitations 2016-01-25 07:29:26 -08:00
Eric House
3c92b8837a add changelog mention of weblate additions 2016-01-24 10:32:07 -08:00
Eric House
64e33518e0 Merge remote-tracking branch 'github/android_translate' into android_translate 2016-01-23 22:11:32 -08:00
Eric House
f07dd2a344 remove unused string 2016-01-23 22:09:40 -08:00
Eric House
e6fa514982 Merge branch 'android_branch' into android_translate 2016-01-23 22:03:40 -08:00
Eric House
5ef7495d51 The Japanese translation has a number of plurals with "one" quantities 
but no "other", which crashes. "Fix" these by making the copy script
turn one into other, which may well make sense given Japanese
grammer. At any rate it prevents crashes until I can work it out with
the translator and/or weblate.
 2016-01-23 21:59:31 -08:00
Eric House
b9b9038c66 remove empty strings 2016-01-23 21:55:07 -08:00
Eric House
c0e8f9cb65 look for plurals too 2016-01-23 21:06:37 -08:00
Eric House
805f160556 don't break r.{string,plurals}.id across lines: my script's too dumb 
to recognize them then
 2016-01-23 21:04:20 -08:00
Eric House
ca09c48d95 deal with case where target of symlink is gone 2016-01-23 20:55:32 -08:00
Eric House
3500d8c8b9 bring in latest French changes 2016-01-22 07:26:26 -08:00
Eric House
cb09228df7 Merge branch 'android_branch' into android_translate 2016-01-22 07:22:41 -08:00
Eric House
ff931571a8 remove empty string 2016-01-22 07:21:15 -08:00
Eric House
24549664ff Merge remote-tracking branch 'weblate/android_translate' into android_translate 2016-01-22 06:38:34 -08:00
Eric House
b289154e19 up app version strings, changes list for new release 2016-01-21 20:56:45 -08:00
Eric House
dcedbefd63 fix rematch info getting overwritten the first time a game is 
opened. Some GameSummary fields are unknown to jni code and so
shouldn't be saved if they happen to be empty (as they will be when
the GameSummary is created by jni and never merged with what was read
from the DB when the game was loaded.
 2016-01-21 07:14:57 -08:00
Eric House
7325377bcb remove comment 2016-01-21 07:13:46 -08:00
Eric House
16b558a566 fix BT and SMS game creation in response to invitations by passing a 
UtilCtxt they can use to get the devices ID, allowing relay messages
to reach the games when they're not open. Move into superclass while
at it.
 2016-01-21 06:27:51 -08:00
Eric House
3bff4c070a fix compiler warning 2016-01-21 06:25:19 -08:00
Eric House
7d62614ced Recent AS metadata changes. I'm waiting for the changes to stop.... 2016-01-20 07:58:41 -08:00
Eric House
eb08e8e78d give user a chance to turn on play-via-SMS when sending an SMS 
invitation (which will otherwise fail silently). Required a hack
passing params from one dialog to another, but I like that better
(today) than creating new single-purpose iVars in BoardDelegate.
 2016-01-20 07:58:01 -08:00
Eric House
f65d42732b offer invites-info menu on release builds too if debug features 
enabled.
 2016-01-19 07:17:29 -08:00
Eric House
7ba7879a55 cleanup: track only checked items, not all items. 2016-01-19 06:53:43 -08:00
Eric House
eee13bcdd6 fix assertion failure by dropping packet for which I can't get an 
address. It was in a three-player game with two on the server device.
 2016-01-19 06:41:44 -08:00
Bernard Massot
fe235b2348 Translated using Weblate (French) 
Currently translated at 98.8% (702 of 710 strings)
 2016-01-18 21:44:26 +01:00
Eric House
177a591a23 During SMS and BT invitation, when a single target is sought uncheck 
the old selection when a new one is made.
 2016-01-18 08:36:25 -08:00
Eric House
38898776bd when re-inviting, pre-populate BT and SMS invite dialogs from the most 
recent invitation of that "means" recorded for that game
 2016-01-18 07:41:47 -08:00
Eric House
6c1394a3a5 separate explanatory dialogs for games sending invites based on 
whether they were created for a rematch. If for a rematch, don't give
user ability to change invite target; just resend (if asked) and show
a toast. Also, send rematch invites only when there aren't already
some, i.e. the first time the game's opened.
 2016-01-16 13:52:30 -08:00
Eric House
3ca47cdd82 add debug-only context menu giving conn-via config and invites for GamesList games. 2016-01-16 12:08:36 -08:00
Eric House
84fe06e029 in invite, record bt device name rather than (unreadable) addr 2016-01-15 20:52:39 -08:00
Eric House
e8ceb82d8d add debug-only menu to show game's sent invitations 2016-01-15 20:48:53 -08:00
Eric House
9d20aea6be record NFC invites 2016-01-15 06:01:35 -08:00
Eric House
fe0504a308 put a different title on notifications when it's now a player's 
turn. Probably only matters in three-device games, but I like it.
 2016-01-14 20:45:58 -08:00
Eric House
1e50181b12 fix handling of SMS invitations specifying a dictionary that's missing 2016-01-14 07:55:49 -08:00
Eric House
90f7438290 allow deleting dict that doesn't exist (don't assert) 2016-01-14 07:37:47 -08:00
Eric House
bdafcfa916 improve text around invitations 2016-01-13 19:51:24 -08:00
Eric House
e98ba8d84a make explicitly public 2016-01-13 08:00:28 -08:00
Eric House
42574550d0 move method next to others with same name 2016-01-13 07:59:46 -08:00
Eric House
26d0aedb8f Comment out apk-renaming stuff. It's confusing AS. 2016-01-13 07:58:59 -08:00