Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-24 07:58:34 +01:00
Code Issues Projects Releases Packages Wiki Activity
xwords/xwords4/android/XWords4/jni
History
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
..
anddict.c remove that bit from flags -- since we already do the right thing for it. 2013-04-20 19:46:35 -07:00
anddict.h fix emacs compile-commands 2012-02-15 18:07:19 -08:00
andglobals.h add copyright notice; turn logging back on for jni code 2010-03-28 23:38:53 +00:00
Android.mk handle GCM messages containing data, changing clientVers so server 2013-05-22 06:44:01 -07:00
andutils.c call back into java for util_getCurSeconds implementation so java and 2012-09-29 19:27:02 -07:00
andutils.h call back into java for util_getCurSeconds implementation so java and 2012-09-29 19:27:02 -07:00
drawwrapper.c pass new param into java, and when it's not the player's turn draw 2013-05-31 07:40:42 -07:00
drawwrapper.h Work when initialized with a null instance of DrawCtxt. (All calls 2010-02-09 14:21:58 +00:00
jniutlswrapper.c handle synonyms in non-special tiles for Android: wordlists load and 2013-04-14 11:58:11 -07:00
jniutlswrapper.h combine two jniutils methods into one 2012-09-15 15:21:31 -07:00
LocalizedStrIncludes.h implement resign on top of existing endGame logic, adding "quitter" as 2012-10-07 12:47:06 -07:00
paths.h fix emacs compile-commands 2012-02-15 18:07:19 -08:00
utils.c add copyright notice; turn logging back on for jni code 2010-03-28 23:38:53 +00:00
utilwrapper.c fix to compile with API change; to drop relayid when it's rejected and 2012-11-12 08:03:25 -08:00
utilwrapper.h set gameID when saving CurGameInfo from java IFF it isn't already set. 2010-02-14 22:01:06 +00:00
xportwrapper.c Revert "pass additional param into java world so don't show toast every time connect to relay" 2013-07-08 06:30:26 -07:00
xportwrapper.h Work (but don't call into java world) when initialized with a null 2010-02-09 14:20:16 +00:00
xptypes.h fix so count comes from dict; combine two jni methods into one; fix 2011-10-25 18:36:12 -07:00
xwjni.c add comms_stop() to jni and use it 2013-01-20 21:33:35 -08:00