Eric House
dfdbd9a8a2
pass scoreWidth separately into formatting code so space can be left
...
for network status icon.
2013-11-09 05:34:23 -08:00
Eric House
71d83e188e
null param ok for board_getActiveRect in jni
2013-11-07 19:54:13 -08:00
Eric House
a26dced506
drawing tray tiles can fail, e.g. when font info not yet available, so
...
only clear bits when successful. Fixes problem where tray didn't get
drawn until tiles were somehow invalidated.
2013-11-07 07:29:54 -08:00
Eric House
baba78535f
fixes to the merge
2013-11-07 05:30:02 -08:00
Eric House
bb80cdfb08
Merge branch 'android_branch' into android_thumbnail
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
2013-11-07 05:25:51 -08:00
Eric House
929399793b
Merge branch 'android_x86_release' into android_branch
2013-11-06 22:28:36 -08:00
Eric House
272fc6e812
Move board_layout call onto jni thread, and change order in which it's
...
done to make that work. This is a snapshot: not all boards draw completely,
and there's other debugging to be done.
2013-11-06 06:49:27 -08:00
Eric House
7c47c27cee
dispose any existing draw ctxt before setting another.
2013-11-05 07:36:56 -08:00
Eric House
499e07d84b
follow convention: width usually comes before height
2013-11-05 06:38:48 -08:00
Eric House
f1f02df355
remove file to be generated by build system
2013-11-04 19:19:09 -08:00
Eric House
633d41a6ef
Revert "x86-only for this one release"
...
This reverts commit 67c6c635e4
2013-11-04 07:35:12 -08:00
Eric House
03b023d506
dispose any existing draw ctxt before setting another.
2013-11-04 07:33:12 -08:00
Eric House
d4cf98553c
Merge branch 'android_branch' into android_thumbnail
2013-11-04 06:37:13 -08:00
Eric House
2d7392a16d
pass new score- and tray-size params through
2013-11-04 06:36:52 -08:00
Eric House
9c9a04025a
Merge branch 'android_branch' into android_thumbnail
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
2013-11-04 06:20:53 -08:00
Eric House
9f1b0c5121
Specify relative height of scoreboard and tray in board_figureLayout,
...
and allow those to be 0.
2013-11-04 06:19:33 -08:00
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
e01af60dab
build with COMMON_LAYOUT defined, and when off-by-default debug pref
...
is on use it instead of java-side layout.
2013-11-03 12:17:20 -08:00
Eric House
b151cb977e
apply patches from Brendan Le Foll <brendan.le.foll@intel.com> to
...
enable x86 ndk support
2013-11-03 05:22:20 -08:00
Eric House
cc994368aa
move ints and booleans between java and c structs using arrays of data
...
rather than a ton of nearly identical function calls.
2013-11-01 19:10:08 -07:00
Eric House
d7a1f53157
Merge branch 'android_branch' into android_thumbnail
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
2013-10-31 08:13:39 -07:00
Eric House
bfa6132ade
add board_setDraw() to jni
2013-10-31 08:07:07 -07:00
Eric House
3858893ab2
don't crash on null dctxt
2013-10-31 06:35:23 -07:00
Eric House
0960e5510c
add board_getActiveRect to jni, and use it to capture a thumbnail
...
that's smaller. Scaling is still a problem, though: some but not all
grid lines show up.
2013-10-29 07:51:35 -07:00
Eric House
d72526ff84
enable turning thumbnail featuren on/off via a line in build.xml
2013-10-29 06:49:06 -07: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
