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

371 commits

Author SHA1 Message Date
Eric House
67c6c635e4 x86-only for this one release 2013-11-03 12:52:53 -08:00
Eric House
d11375b5f5 apply contributed patch adding x86 version of libxwjni.so 2013-11-03 12:21:52 -08:00
Eric House
59dc69c0d9 apply contributed patch making Makefile variable naming match required 
conventions for CLEAR_VARS.
 2013-11-03 12:21:28 -08:00
Eric House
552fa28b39 export model_getNumTilesInTray() via jni 2013-09-30 21:59:12 -07:00
Eric House
107ba4c940 new gcc setting required, I assume, by new ndk version 2013-09-22 21:35:22 -07:00
Eric House
91a0dc5ecd turn chat back on -- and make it configurable via a single property in 
build.xml that's turned into both a -D option to the jni compiler and
a constant in the java world.
 2013-09-11 22:18:00 -07:00
Eric House
a25d664eb5 Merge branch 'from_android_beta_65' into android_branch 
Conflicts:
	xwords4/android/XWords4/res/raw/changes
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
 2013-09-09 08:01:28 -07:00
Eric House
5d7cc9e9e8 disable chat, and include reason in change log 2013-09-08 19:09:49 -07:00
Eric House
04eeebc3a4 fix so still compiles when chat feature is disabled 2013-09-08 19:08:58 -07:00
Eric House
49ab62d521 set DEBUG when building ndk based on target in build.xml 2013-08-29 07:28:08 -07:00
Eric House
57ea3cd77e wasn't supposed to check this in with debugging on 2013-08-26 07:22:07 -07:00
Eric House
235346b7a4 fix signature string (and log when there's a mismatch) 2013-08-23 07:41:10 -07:00
Eric House
5197033de3 In the spirit of setting constants in only one place, pass 
INITIAL_CLIENT_VERS in from build.xml rather than the jni makefile,
and make it available in java world as well.
 2013-08-20 08:42:12 -07:00
Eric House
27d9f3de45 Don't enable chat when more than 128 messages are in queue to prevent 
an extremely unlikely cause of stalls -- and make tests trip over full
queues less often.
 2013-07-18 07:37:45 -07:00
Eric House
a522266ce4 add message checksumming for android too by making it part of util 
(compiled out by default)
 2013-07-10 08:05:47 -07:00
Eric House
d50c808f96 Merge branch 'android_branch' into gtk_multigame 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
	xwords4/common/comms.c
	xwords4/linux/cursesmain.c
	xwords4/linux/cursesmain.h
	xwords4/linux/gtkmain.c
	xwords4/linux/gtkmain.h
	xwords4/linux/linuxmain.c
	xwords4/linux/main.h
	xwords4/linux/scripts/discon_ok2.sh
	xwords4/relay/xwrelay.cpp

(Note: The curses app crashes on exit with mempool assertions, but that's a problem before the merge.)
 2013-07-09 07:18:00 -07:00
Eric House
008cce8f37 Revert "pass additional param into java world so don't show toast every time connect to relay" 
This reverts commit e9615cb154.
 2013-07-08 06:30:26 -07:00
Eric House
e9615cb154 pass additional param into java world so don't show toast every time connect to relay 2013-07-07 13:31:49 -07:00
Eric House
9d40930fff pass new param into java, and when it's not the player's turn draw 
pending points with his color at half-intensity.
 2013-05-31 07:40:42 -07:00
Eric House
d41c1a4ca8 add new param so pending text can be drawn differently when it's not 
the player's turn.
 2013-05-30 07:17:13 -07:00
Eric House
31c443e4b1 Merge branch 'android_branch' into gtk_multigame 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GCMIntentService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
 2013-05-22 07:01:08 -07:00
Eric House
120748416b handle GCM messages containing data, changing clientVers so server 
knows we can.  And send to relay in AsyncTask rather than UI thread.
 2013-05-22 06:44:01 -07:00
Eric House
7d8cddb31f Merge branch 'android_branch' into gtk_multigame 
Conflicts:
	xwords4/linux/gtkmain.c
	xwords4/linux/linuxmain.c
	xwords4/relay/xwrelay.cpp
 2013-05-08 07:37:55 -07:00
Eric House
541fc546ab remove that bit from flags -- since we already do the right thing for it. 2013-04-20 19:46:35 -07:00
Eric House
e4f52c5678 add assert and comment explaining why non-utf-8-aware hack is safe. 2013-04-18 07:15:14 -07:00
Eric House
c8332a9665 load synonyms for specials correctly. So now Catalan works: wordlists 
load, and search for "l-l" will find "L·L".
 2013-04-14 15:45:23 -07:00
Eric House
cae631eeb0 handle synonyms in non-special tiles for Android: wordlists load and 
display, and searching using lower case works.  Specials (e.g. Catalan
changes) not yet supported.
 2013-04-14 11:58:11 -07:00
Eric House
de7c29dcc7 add comms_stop() to jni and use it 2013-01-20 21:33:35 -08:00
Eric House
c4df31892e Fix occasional infinite loop of devices sending and receiving the same 
message over and over when getting updated by GCM.  The problem
occurred when one device had an un-ACKable initial message still in
its queue.  I call resendAll a lot, which caused that message to get
resent to the other game which then replied without being able to ACK
it so it remained to be sent again.  This would continue until users
moved forward in the game.  The fix is to add a backoff timer to
resendAll() so that it can't loop.  The timer is reset when an ackable
and new message is received, meaning there's been a change in what's
available to resend.  And since users calling resendAll manually
expect it to do something, add a force param that ignores the backoff.
seems to fix the problem (but needs a lot of testing.)
 2012-11-13 21:25:03 -08:00
Eric House
ba11fcf8df don't bother checking for stream size of 0 in jni since comms does 
that now.
 2012-11-13 21:01:25 -08:00
Eric House
60814264e7 compile with XWFEATURE_COMMSACK turned off 2012-11-12 20:56:50 -08:00
Eric House
76c938cc67 fix to compile with API change; to drop relayid when it's rejected and 
to use register with the GCM id on next [re]connect; and to not leave
variable unintialized when unable to call into java world due to being
called without context.
 2012-11-12 08:03:25 -08:00
Eric House
39dbed2004 add missing util method (fixing crash) and with it wire up new devID 
scheme: now relay-assigned shorter id will be saved and used for
future games.
 2012-11-06 07:08:06 -08:00
Eric House
47f9eb03b9 merge in changes from the -gcm directory: GCM will be a feature of the 
non-variant build now.
 2012-11-02 05:35:31 -07:00
Eric House
6014e3d76f turn on devid code and implement support in java. Untested, but should work. 2012-10-30 07:57:17 -07:00
Eric House
b40e9b7928 assert non-0 lang code 2012-10-25 07:10:54 -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
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
e90c5ee94f pass index of resigning player into util_notifyGameOver. Not yet 
passed into java.
 2012-10-09 05:31:12 -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
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
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
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
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
598a154693 factor common code into function 2012-09-19 08:09:27 -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
937bde6378 combine two jniutils methods into one 2012-09-15 15:21:31 -07:00