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

269 commits

Author SHA1 Message Date
Eric House
1f4f6a06a8 Merge branch 'android_branch' into android_bt 
Conflicts:
	xwords4/android/XWords4/jni/xwjni.c
 2012-02-15 18:18:26 -08:00
Eric House
8590aae9b2 fix emacs compile-commands 2012-02-15 18:07:19 -08:00
Eric House
88ad6d81ef Merge branch 'android_branch' into android_bt 
Conflicts:
	xwords4/android/XWords4/jni/xportwrapper.c
	xwords4/android/XWords4/jni/xwjni.c
 2012-02-13 22:38:17 -08:00
Eric House
82b232cf74 use a macro instead of lots of repetitions of the package path to make 
it easier to modify.
 2012-02-13 22:13:23 -08:00
Eric House
74aeeca8e0 move BT device listing into its own Activity. Call it from 
NewGameActivity and from BoardActivity when the new notifyMissing
method gets called.  Works as before called from NewGameActivity but
BoardActivity crashes on iterating over list of devices returned.
 2012-02-09 05:21:23 -08:00
Eric House
3bda56420c turn on XWFEATURE_BLUETOOTH 2012-02-07 17:38:50 -08:00
Eric House
47c3bd3090 track a BT game's set (singleton for two-device game) of remote 
devices in summary DB so, e.g., we can quickly determine what games
care when a devices becomes available via BT.  First use of this is
notifying when a remote game's deleted -- least that's the plan.  This
commit just adds to the DB and scans the DB to build a map of
device->gameIDs array.
 2012-02-06 19:02:19 -08:00
Eric House
796baffa6d Merge branch 'android_branch' into android_bt 2012-02-06 18:13:57 -08:00
Eric House
bfe04a08b5 removed unneeded null-byte addition 2012-02-06 18:11:30 -08:00
Eric House
a2b5274b6c on ICS CreateGlobalRef doesn't return the same value as is passed in. 
So stop assuming it does!  Fixes multiple crashes on ICS and need to
be ported to android_branch.
 2012-02-05 19:12:09 -08:00
Eric House
8947ddca0b on ICS CreateGlobalRef doesn't return the same value as is passed in. 
So stop assuming it does!  Fixes multiple crashes on ICS and need to
be ported to android_branch.
 2012-02-05 19:11:38 -08:00
Eric House
8793d8f4fd include seed and missingPlayers in any non-standalone game summary 2012-02-03 17:03:47 -08:00
Eric House
b4b7609894 include hwAddr as well as device name in bt section of address 2012-01-31 18:48:59 -08:00
Eric House
e91c0daf65 check for null obj before calling through its vtable 2012-01-31 06:44:54 -08:00
Eric House
094d08e903 Get play via BT working!!! Replace BTConnection with BTService to make 
keeping the listener/sender threads going much easier.  Create new
message sink to dispatch incoming messages, and start passing return
addresses into comms (not required before when relay was only
transport as it has no return addresses.)
 2012-01-30 06:39:18 -08:00
Eric House
0934f83106 add gameID to params passed to comms' sendproc, including passing 
through to java layer.
 2012-01-25 18:27:37 -08:00
Eric House
ac6ecfa845 copy bt_hostName as part of address 2012-01-24 06:51:40 -08:00
Eric House
5f77ef6e13 get uuid from C code so can ensure linux version has same. 2012-01-19 18:28:27 -08:00
Eric House
2a51f8d621 cleanup 2012-01-17 06:53:47 -08:00
Eric House
d0999d1944 update build scripts to use newer NDK. 2012-01-02 18:11:36 -08:00
Andy2
2a34cd1e05 remove second param from server_do() -- it doesn't work anyway. 2011-12-21 18:45:05 -08:00
Andy2
17edc79aaf Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2011-12-06 19:56:10 -08:00
Andy2
0474984b82 export new preference from jni and add a checkbox setting for it 2011-12-06 18:18:50 -08:00
eehouse@eehouse.org
e1e8516e1b Merge branch 'android_branch' into send_in_background 2011-12-02 19:04:12 -08:00
Andy2
52d02f04dd pass tile value into drawCell(). Java code doesn't use it yet, but I 
want to play with drawing cells tray-tile-style when they're big
enough.
 2011-12-02 18:58:52 -08:00
Andy2
d37424ad7f Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/linux/linuxutl.h
 2011-11-21 22:18:52 -08:00
Andy2
e1e9a68d8f fix ptr out-of-bounds test. Was failing an empty dict. 2011-11-21 18:04:20 -08:00
Andy2
b86330c71f add dict_iter_getCounts() 2011-11-18 21:10:17 -08:00
Andy2
f06eaa573b fix to compile with API changes 2011-11-18 07:41:13 -08:00
Andy2
4760ceda5a Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/anddict.c
 2011-11-17 20:55:02 -08:00
Andy2
aab9fd9df2 test the variable that may have been changed, not the one that holds 
the pre-change value.
 2011-11-17 06:54:26 -08:00
Andy2
63c0c5cf09 fix compile warning by passing ptr to embedded super 2011-11-17 06:11:42 -08:00
Andy2
2492e7cfc5 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/linux/cursesmain.c
 2011-11-13 17:10:46 -08:00
Andy2
44c5500ab0 don't crash when empty or corrupt dict file passed in. 2011-11-11 18:29:26 -08:00
Andy2
9ff4596667 fix compile warning by passing ptr to embedded super 2011-11-11 07:42:00 -08:00
Andy2
92eb6b857d allow null info ptr so getInfo can be used solely to run sanity check 
on dict.
 2011-11-11 07:41:31 -08:00
Andy2
dddec50f1d Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/linux/Makefile
	xwords4/linux/linuxmain.c
 2011-11-10 19:22:57 -08:00
Andy2
284bd2d0c4 turn on sanity checking of dicts in download directory, but from 
DictLangCache rather than when the directory's walked initially.  Need
to test still with bogus dict and make sure it's never shown.
 2011-11-10 19:02:18 -08:00
eehouse@eehouse.org
214f8990bf Merge branch 'android_branch' into android_browsedict 2011-11-04 17:23:27 -07:00
Andy2
ac875894a6 replace assert that occasionally fails with logging. Not sure why it 
fails, but I just drop the (timer) event in the non-debug case so it's
probably harmless.
 2011-11-04 17:19:50 -07:00
Andy2
57a1069efe wire min/max through jni: now selecting numbers changes the number and 
length of words selected.  But it's really slow, and indexing seems
broken in some cases.  Not ready for release yet.
 2011-11-04 06:56:59 -07:00
Andy2
1bba95a985 add minmax compile-time flag, commented-out 2011-11-04 06:17:09 -07:00
Andy2
4e66747bbc fix for changed API 2011-11-03 21:35:17 -07:00
Andy2
a5498ee33a fix find to return position rather than boolean 2011-11-03 05:20:11 -07:00
Andy2
c222f08252 catch up with API changes. 2011-11-02 18:46:06 -07:00
Andy2
050a68ce42 use XP_REALLOC now that it's fixes 2011-11-02 05:04:31 -07:00
Andy2
9f2158f094 add dict_getStartsWith to jni 2011-11-01 18:43:36 -07:00
Andy2
482aca5cfb fix crash due to bad allocation of indexing data space. First cut 
used XP_REALLOC, but that turns out to be broken, at least on android.
Haven't really used it before...
 2011-11-01 18:33:29 -07:00
Andy2
11b7ed1e8e fix to compile with new dictiter files 2011-10-31 21:11:22 -07:00
Andy2
3c53da46ce fix to compile with changed API. Crashes, but want to fix up API in 
other branch before debugging here....
 2011-10-31 18:22:33 -07:00