Commit graph

303 commits

Author SHA1 Message Date
Eric House
9b0436d1ee Make rem string measure function return boolean to indicate rect will
be invisible rather than setting width and height to 0.  No real
change beyond simplifying/speeding platform code.
2012-07-15 09:30:27 -07:00
Eric House
bd70a1dd7d improve text in remaining tiles dialog, and always show the tiles for
all trays rather than excluding those in current player's tray.
2012-07-09 21:44:29 -07:00
Eric House
318cc52f5a we need the base64 stuff even when don't have SMS -- for serialization. 2012-07-07 11:05:45 -07:00
Eric House
2e6b64a4e4 complete implementation of java part of one-pass scoreboard draw. Now
looks pretty much identical to what the old code draws except that
rather than having width allocated in proportion to requested size all
get the same width except the one whose score it is which gets 2x.
2012-07-01 17:24:50 -07:00
Eric House
2434d85684 don't pass the same player-1 data for every player 2012-07-01 16:01:01 -07:00
Eric House
89ffd972bf more work on single-pass scoreboard drawing. Now the jni stuff is
finished, but disabled via compile-time flag, and there's a
commented-out rudimentary implementation on the java side.
2012-07-01 10:04:10 -07:00
Eric House
b9b58bd0a5 enable tray tap undo 2012-06-29 06:52:49 -07:00
Eric House
c8e2dff962 start process of compiling with XWFEATURE_SCOREONEPASS enabled by
adding stubbed-out methods and making old methods conditionally
compiled.  No change in code.
2012-06-27 07:08:09 -07:00
Eric House
405cb23023 fix bug where current player's scoreboard would disappear if other
players' names were too long by giving all a the same proportion of
what they request and passing in the percent given in case draw
implementation wants to use it as a cue to truncate.
2012-06-15 06:26:40 -07:00
Eric House
6257c14436 include trayVisState in GameStateInfo on the java side 2012-06-05 22:13:58 -07:00
Eric House
a0336ebb01 turn on new HASH_STREAM feature 2012-05-29 07:26:51 -07:00
Eric House
0b1a9a67fe add param to server_handleUndo to prevent it from undoing all moves in
robot-vs-robot game, which is the wrong thing to do during a test
simulating play.
2012-05-24 22:25:30 -07:00
Eric House
9ba663ab98 implement util_phoneNumbersSame in java and call telephony's number
compare method.  Skip the java call when the numbers are
strcmp-identical.
2012-05-18 07:41:46 -07:00
Eric House
867e9ffc2f implement stubbed-out util_phoneNumbersSame so that three-device SMS
games work in emulator.  May need to call into java to use Android's
more sophisticated phone number comparison to work on devices.
2012-05-18 07:17:21 -07:00
Eric House
3a54aa0ebc add util_informUndo() that gets called, and puts up a dialog, after
remote device has performed an undo on a committed turn.
2012-05-14 07:01:02 -07:00
Eric House
013d9c689b fix bug introduced with dictionary lookup of words played that meant
trades didn't get reported as remote moves -- it just became your turn
without notice.
2012-05-09 18:22:05 -07:00
Eric House
d846f96ec5 post-code-review cleanup: no significant change 2012-05-09 06:51:06 -07:00
Eric House
fd4ad0ae31 turn on board hashing and bigboard options (in protocol, not UI) 2012-05-04 06:16:02 -07:00
Eric House
fd18d8c95a add boolean param to jni version of comms_resendAll() to ack
afterwards.  Saves some extra jni calls.  Then make comms_ackAny()
separately-useable, and use from BoardActivity after receiving
SMS messages.
2012-04-19 00:03:22 -07:00
Eric House
033a69be8d to make it easier to tell games apart, print the number[s] of the
remote device[s] as part of summary view and in game config screen
(read-only).  Use same field in summaries table for remote phone
numbers and bt addresses.
2012-04-18 23:23:36 -07:00
Eric House
1134f71b7b use new comms_ackAny() call to send ACKs at points where currently
resendAll is being called.  Dramatically reduces SMS message count
when app is being relaunched and backgrounded between turns.
2012-04-14 18:00:43 -07:00
Eric House
1e22a33d55 go back to android-7 SDK version to support 2.1, and to make that work
remove use of java base64 encoding in favor of the C version I'd
already written (and that was probably compiled into the library
anyway unless the strip step catched unused code.)
2012-03-26 20:03:29 -07:00
Eric House
235807df4f remove logging 2012-03-19 07:37:16 -07:00
Eric House
fe614e9efc delegate phone number comparison to platform code which in Android
case has a method for it.  strcmp is not enough.
2012-03-19 07:36:18 -07:00
Eric House
631666cede don't call DeleteLocalRef on an object to be returned from the JNI.
Crashes ICS bigtime.  This needs to be ported back to android_branch.
2012-03-14 20:26:23 -07:00
Eric House
cd8889f90e Merge branch 'android_branch' into android_bt
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
	xwords4/linux/Makefile
2012-03-12 07:04:06 -07:00
Eric House
a8cf03f68e optimization: allocate tmp buffer on stack rather than with malloc. 2012-03-11 14:51:51 -07:00
Eric House
739b0b6125 fix off-by-one assertion 2012-03-09 23:51:39 -08:00
Eric House
fdfbd792f7 Merge branch 'android_branch' into android_bt 2012-03-05 20:08:43 -08:00
Eric House
edf13be4c8 I'm getting a crash on 2.1 in the simulator when calling
DeleteGlobalRef then NewGlobalRef on the same ref.  So use a temp to
reverse the order.  May fix reported crash as well.
2012-03-05 20:04:32 -08:00
Eric House
cb1e1692b2 turn off BT in main part of tree and fix a couple of places not
dealing with that correctly.
2012-02-29 06:47:19 -08:00
Eric House
b7f82475b8 fix to compile when XWFEATURE_BLUETOOTH not set 2012-02-27 20:31:01 -08:00
Eric House
2282a976f3 add missing PKG_PATH invocation 2012-02-27 20:01:12 -08:00
Eric House
642ba9bc61 fix off-by-one assertion 2012-02-22 12:58:33 -08:00
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