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

6120 commits

Author SHA1 Message Date
Eric House
6cf5d7e04e Android.mk needs to be checked in 2012-10-30 07:48:16 -07:00
Eric House
c93dfd6605 Merge branch 'android_branch' into android_gcm 
Conflicts:
	xwords4/android/XWords4/res/values/common_rsrc.xml
 2012-10-30 07:10:42 -07:00
Eric House
3469975d2a add, still disabled by compile-time flags, code to transmit device ID 
(e.g. ID Android devices get via GCM) to relay and to associate it
there with messages that need to be delivered.
 2012-10-30 07:01:47 -07:00
Eric House
80a79b6991 Make it less likely that a message received while I'm not intercepting 
them will be opened more than once: track whether I've searched the
SMS db, and only clear that setting when SMS play is *disabled*.
 2012-10-29 21:20:32 -07:00
Eric House
ba0f91c438 cleanup: use constant 2012-10-29 20:43:02 -07:00
Eric House
e90621ec1d use existing string rather than invent a new one 2012-10-29 07:30:09 -07:00
Eric House
e39b776d80 Add button to alert warning that SMS isn't on that takes you to 
Preferences.
 2012-10-29 07:20:11 -07:00
Eric House
2375a6730a tweak text 2012-10-27 15:31:49 -07:00
Eric House
b83e587d91 changelog and version strings for beta 53 2012-10-27 15:21:33 -07:00
Eric House
5aef1afec3 point URL at android part of sf.net site, not home. 2012-10-27 13:18:08 -07:00
Eric House
f0a46eacfa script reached by URL in SMS messages sent to devices without 
Crosswords installed.
 2012-10-27 13:15:34 -07:00
Eric House
86378e4f0b Merge remote branch 'origin/android_branch' into android_branch 2012-10-27 08:55:19 -07:00
Eric House
e7d5be06e9 fix crash when old client connects to new host by making host use the 
right version test in deciding what to send.
 2012-10-27 08:52:54 -07:00
Eric House
4ea8569abc honor --min-devs flag 2012-10-27 08:15:07 -07:00
Eric House
e1fa0f9dd3 Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-10-26 07:06:59 -07:00
Eric House
fb747304eb put sms at bottom of new-game dialog 2012-10-26 07:00:23 -07:00
Eric House
b097e0825e fix linux crash do to casting problem 2012-10-26 06:49:15 -07:00
Eric House
d7d666e4f9 Merge branch 'android_branch' into android_gcm 2012-10-25 08:12:02 -07:00
Eric House
6e39466b09 somehow new dict-download code is storing some in info DB with 
langcode of 0.  Work around that by rebuilding cache entry when that's
seen.
 2012-10-25 08:03:56 -07:00
Eric House
6180834ada log case where game has no dicts 2012-10-25 08:02:30 -07:00
Eric House
4ed1446e06 Fix new bug: don't null out default dict just because we don't have one. 2012-10-25 07:58:39 -07:00
Eric House
b40e9b7928 assert non-0 lang code 2012-10-25 07:10:54 -07:00
Eric House
f2684e5652 log device ID even when it's not newly assigned 2012-10-25 06:24:19 -07:00
Eric House
fcc4a0a5f9 add new file 2012-10-25 06:23:49 -07:00
Eric House
4c1c0ddaaa Merge branch 'android_branch' into android_gcm 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
 2012-10-24 08:05:50 -07:00
Eric House
9bb8c9cddf don't allow change of dict in in-play networked game 2012-10-24 08:01:52 -07:00
Eric House
3d14ed96e7 cleanup and rename method 2012-10-24 07:40:14 -07:00
Eric House
643a301214 cleanup: add additional param to downloadFinished() iface method 2012-10-24 07:22:26 -07:00
Eric House
aec03fc572 When a game's consumated and guest discovers it isn't using the same 
dict, give chance to switch, and to download if required.  Because of
the way the JNI thread works, and JNI's requirement in general that
env instances match up (e.g. dicts must be destroyed in the same
thread that creates them), substituting into a live game is too hard.
So the game's saved with its new dict and then reloaded.
 2012-10-24 07:17:21 -07:00
Eric House
13c74cfbd5 protect changeDict feature with compile-time flags (since it can't be 
used on Android)
 2012-10-24 06:46:54 -07:00
Eric House
c69dbda36f add new game_changeDict() and enough gtk code to test it. 2012-10-23 19:06:00 -07:00
Eric House
521d7042be remove redundant class name (no code change) 2012-10-23 06:50:49 -07:00
Eric House
1ce7b36b59 add pref to replace querying on each download where to store dict. 
And use new background-download for update-triggered downloads.
 2012-10-22 19:35:47 -07:00
Eric House
80e2b8955e comments to remind not to remove code not called from java; no code change 2012-10-22 19:29:05 -07:00
Eric House
8f4c0169b4 fix to print contents again 2012-10-22 19:19:38 -07:00
Eric House
8e911fef05 use import to shorten type -- no code change 2012-10-22 07:30:44 -07:00
Eric House
ca561f225c make dict storage location a default set in preference rather than 
something queried each time.
 2012-10-22 07:06:12 -07:00
Eric House
6ba5d4f7c8 use new internal download code for download to get dict required for 
SMS invite as well.  Still to do: put back the query for where the
thing should be stored.  Hard-coded to go in INTERNAL for now.
 2012-10-20 18:28:14 -07:00
Eric House
13557b6e25 use Utils.showToast() everywhere 2012-10-19 18:03:00 -07:00
Eric House
04f56ccf74 download dicts without the browser. This is a partial implementation 
that will need to be generalized and used in other places, basically
whenever the full URL can be known.
 2012-10-19 17:57:17 -07:00
Eric House
37c698f41b fix link problem with upgrade from natty to oneiric (Ubuntu): -lpq 
param must follow object file list.
 2012-10-19 17:54:18 -07:00
Eric House
0f9500cea3 comment out unused param/variable 2012-10-19 17:53:15 -07:00
Eric House
6c34f43df7 show toast when update requested manually and nothing found 2012-10-18 19:51:40 -07:00
Eric House
cb1a0093c3 Merge branch 'android_branch' into android_gcm 2012-10-17 21:23:09 -07:00
Eric House
e5feded0b1 When receiving an invite for a dict we don't have, post a notification 
to DictsActivity that offers to download, and on download completion
arranges for notification of SMSService so the game can be created.
 2012-10-17 21:20:08 -07:00
Eric House
3e83af3b97 pass dict name (in addition to language) with SMS invite, and 
currently on recipient device refuse to create a game if dict not
installed.  Next step is to give a choice to download the thing or
decline.
 2012-10-17 07:11:39 -07:00
Eric House
04f51bd392 add haveDict() 2012-10-17 07:10:08 -07:00
Eric House
a8c77bca88 fix NPE 2012-10-17 07:01:01 -07:00
Eric House
6d7d8d5c64 ignore dir not on this branch 2012-10-16 08:20:53 -07:00
Eric House
50238bea3e generate sender_id const from ENV so doesn't need to be checked in. 
Now works to register as I'm using the right id.
 2012-10-16 08:16:43 -07:00
Eric House
be79ce77ee fix name of service so reply received from GCM 2012-10-16 07:56:10 -07:00
Eric House
85f81a700c missing gitignores 2012-10-16 07:42:35 -07:00
Eric House
de5dcdc5f9 starting new variant for GCM 2012-10-16 07:41:04 -07:00
Eric House
077270f1cd merge in SMS-version UI -- there will not be a separate version for 
SMS any more.
 2012-10-15 08:29:46 -07:00
Eric House
eb47e75c50 put up more user-friendly message when dicts don't match. 2012-10-15 08:07:17 -07:00
Eric House
5f247db29c use the same missing-players message for all three connection types 
(even though the way they're reported is, though shouldn't be,
different.)
 2012-10-15 07:31:02 -07:00
Eric House
96ea4f3963 ignore new files 2012-10-15 06:21:50 -07:00
Eric House
528c061156 report host-chosen dict name a bit later 2012-10-15 06:21:08 -07:00
Eric House
c811282591 UI change: networked games are no longer allowed to have per-player 
dicts.  Now you select a single dict for such games in a new spinner
just below the lang spinner, and player's dicts are no longer
displayed.  For standalone games, the single dict choice isn't there,
the individual dicts are displayed, and you must open a player config
to change the dict as before.  The idea is that this will be less
confusing, particularly when I need to tell the guest that the host is
using a different dict.
 2012-10-14 19:21:27 -07:00
Eric House
4cf595e939 on commandline, only allow assignment of per-player dicts to local 
players.  I don't know what happens when a player's position is
changed when its game is a guest and the hosts rearranges players.
Which is why on Android I'm moving to allowing per-player dicts only
on local-only games.
 2012-10-14 19:10:42 -07:00
Eric House
25a1ee451b resolve links if required to get the actual name of the dict 2012-10-12 20:50:34 -07:00
Eric House
e90c5ee94f pass index of resigning player into util_notifyGameOver. Not yet 
passed into java.
 2012-10-09 05:31:12 -07:00
Eric House
3221fb237a Make state disallow hints when game over 2012-10-08 07:21:36 -07:00
Eric House
ce58750b92 change "resign" menu text once game is over 2012-10-08 07:09:44 -07:00
Eric House
e64ecfb78d implement resign on top of existing endGame logic, adding "quitter" as 
new param passed to remote and changing final score formatting and
menu items to match.  Still need to show old menu on android in case
where game has already ended.
 2012-10-07 12:47:06 -07:00
Eric House
4e0c7923d9 fix bug with clean target introduced when BUILD_DIR was introduced 2012-10-07 12:14:47 -07:00
Eric House
968340f665 Fix release-build warnings that new compiler flags. 2012-10-07 11:43:50 -07:00
Eric House
fd9b9f85e2 make util_hiliteCell conditional, and remove from android where it 
wasn't used anyway.
 2012-10-05 18:51:32 -07:00
Eric House
b11da9d8eb use GamesList's Handler to set timers to redraw turn expiry indicators 
when the percent left changes.  This may be done -- except for
deciding what to do when the time actually runs out.
 2012-10-02 07:30:31 -07:00
Eric House
0a60419802 make ExpiringDelegate responsible for figuring percentage of time left 
given start time and having a constant for how long a turn lasts.  Eventually
the constant will be replaced by a second number passed in.
 2012-10-01 19:07:23 -07:00
Eric House
cd776a34dd Revert "Display turn start time in game summary. This is definitely not its" 
This reverts commit ebaa22594d.
 2012-10-01 17:53:35 -07:00
Eric House
bec596c744 remove no-longer-needed drawable 2012-10-01 17:52:56 -07:00
Eric House
0579253b8d Also override TextView to show turn left there. Works, requiring only 
that actual percentage of turn remainning be calculated.
 2012-10-01 07:24:45 -07:00
Eric House
50b10cd365 new classes overriding LinearLayout to allow framing is-turn rect to 
be drawn in two colors showing how much time left for turn.  Required
because there's no (reasonably-easy) way to create nine-parts
dynamically.
 2012-10-01 06:57:40 -07:00
Eric House
8281bd7f10 call back into java for util_getCurSeconds implementation so java and 
C world are sure to be using the same clock.
 2012-09-29 19:27:02 -07:00
Eric House
ebaa22594d Display turn start time in game summary. This is definitely not its 
final form!
 2012-09-27 07:48:30 -07:00
Eric House
2c89f13383 add turn as param to util_turnChanged, and call from server rather 
than board.
 2012-09-27 07:04:57 -07:00
Eric House
94103a4212 track time of most recent turn start, and include it in summary table. 2012-09-27 06:55:46 -07:00
Eric House
6ddd4a61c1 fix compile errors (mostly unused variables) found by gcc on latest 
Ubuntu (12.04).
 2012-09-25 07:28:02 -07:00
Eric House
53774eb807 Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-09-24 20:08:14 -07:00
Eric House
65598cdb7b replace DeleteLocalRef calls 2012-09-24 07:44:43 -07:00
Eric House
140c982d41 merge from android_branch 2012-09-24 07:39:44 -07:00
Eric House
4909dde622 call a script rather than an html file so file doesn't have to be 
updated with every release.
 2012-09-24 07:35:14 -07:00
Eric House
9a3e43428a Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-09-24 07:26:57 -07:00
Eric House
bdc114dc46 add phony targets to check, on debian-based systems, whether required 
packages are installed and to install them.
 2012-09-24 07:26:37 -07:00
Eric House
d24f9a28f6 up release number 2012-09-24 07:00:18 -07:00
Eric House
c76c5f5868 don't create obits for apps that don't have relayIDs (and presumably 
never connected.)
 2012-09-20 07:45:04 -07:00
Eric House
96e277c7ba don't offer to copy DB from sdcard when there is none. 2012-09-20 07:29:00 -07:00
Eric House
598a154693 factor common code into function 2012-09-19 08:09:27 -07:00
Eric House
81d3f7d15f up version strings for SMS version too 2012-09-19 07:20:43 -07:00
Eric House
a601d0818e save and restore search prefix even when find button not clicked, and 
display last scroll position when different from what prefix finds.
 2012-09-18 07:51:50 -07:00
Eric House
210913d4d4 track dictbrowse info for multiple copies of same dict if that's 
what's installed.
 2012-09-18 07:36:54 -07:00
Eric House
fcecd1db3c don't ask for column no longer there 2012-09-18 06:38:22 -07:00
Eric House
4fa5c61e14 add option to build in a separate directory, for e.g. case where source files 
are on ro filesystem.
 2012-09-17 06:48:53 -07:00
Eric House
168b69112e up version strings for pending new release 2012-09-17 06:36:58 -07:00
Eric House
33772ff0b9 remove redundant DB field and variable 2012-09-15 17:11:59 -07:00
Eric House
a939c9ec4b cleanup 2012-09-15 17:11:45 -07:00
Eric House
75398389b3 Merge branch 'android_branch' into android_dictdb 
Conflicts:
	xwords4/android/XWords4/jni/jniutlswrapper.c
 2012-09-15 16:36:15 -07:00
Eric House
ee1df7eeb7 replace DeleteLocalRef calls with version that checks for NULL 2012-09-15 15:57:38 -07:00
Eric House
b2d47d70be saveToken can be 0 when only gi is being saved 2012-09-15 15:49:26 -07:00