Commit graph

8508 commits

Author SHA1 Message Date
Eric House
93f0b626af snapshot: invite sent by NFC connects two devices using relay with BT
ability passed too (though not yet used.)
2014-10-27 07:51:25 -07:00
Eric House
7a1cd06486 fix crash in dict iteration: add to thread map the env that creates globals 2014-10-23 07:44:41 -07:00
Eric House
c3e7b12103 merge android_branch 2014-10-23 06:33:28 -07:00
Eric House
51a1ddfe39 include robot name in report of his score 2014-10-23 06:32:24 -07:00
Eric House
8486bad44b add default robot name to prefs 2014-10-23 06:21:16 -07:00
Eric House
9886d5a6e6 merge over changes to run with new bash 2014-10-22 18:57:33 -07:00
Eric House
3fe3b1724a replace stacked tracking of env with explicit mapping from pthread to
env for that thread to fix occasional assertion failure that indicated
I was using the wrong env occasionally.  I'm not super confident in
this because I've seen the env for a thread change, but that could be
due to reuse of the thread id.
2014-10-22 06:58:42 -07:00
Eric House
d1b05749eb ignore core files 2014-10-20 20:23:05 -07:00
Eric House
046710dd54 hide core files 2014-10-17 18:37:08 -07:00
Eric House
452729fb9d merge android_branch 2014-10-17 18:36:08 -07:00
Eric House
53d2c2f0f2 rename method 2014-10-17 18:35:14 -07:00
Eric House
f1e6e2f8f5 can't assert yet -- breaks upgrade 2014-10-17 07:58:26 -07:00
Eric House
df093e1c10 preexisting db field now a set, so treat it that way in the other place it's read 2014-10-17 07:55:04 -07:00
Eric House
4e37947d94 assert, for now at least, no unexpected types being added from jni world 2014-10-17 07:54:34 -07:00
Eric House
7cef0c8c06 un-stub-out summary info 2014-10-17 07:47:48 -07:00
Eric House
2e74b97b4a oops: set typeset field in java struct 2014-10-17 07:46:32 -07:00
Eric House
3dfb4ae6f8 Merge remote branch 'origin/android_branch' into android_branch 2014-10-16 20:48:39 -07:00
Eric House
39f8ec4734 expand pattern to match newer .apks 2014-10-16 20:47:43 -07:00
Eric House
ed1b6af246 turn on -std=c99 2014-10-16 20:21:32 -07:00
Eric House
ebfe8ceb28 use Collections.toArray() rather than roll my own 2014-10-16 20:16:50 -07:00
Eric House
dd00ba477b fix mistaken commit: uncomment 2014-10-16 20:16:35 -07:00
Eric House
878a16b3bc snapshot: android compiles, and works well enough to exchange moves
via relay!  Lots of changes, mostly around treating connTypes as a Set
inside the java world.  Jni to translate to that is a pain.
2014-10-16 06:45:24 -07:00
Eric House
215cbe94ba turn on -std=c99 2014-10-15 21:43:34 -07:00
Eric House
14a0ca95fe don't crash with, and correctly save, multiple addresses 2014-10-15 07:52:35 -07:00
Eric House
fe4c7b52f2 snapshot: relay test script works with a second address type set
(though with its actual transport stubbed out).  Android doesn't even
compile.
2014-10-15 07:26:18 -07:00
Eric House
737af802b0 don't abort if core file count goes down -- I probably removed some
old thing
2014-10-15 06:38:43 -07:00
Eric House
52465b3e1e merge android_branch 2014-10-14 06:57:52 -07:00
Eric House
76db94effc move git rev pref to bottom 2014-10-14 06:35:12 -07:00
Eric House
5c4242ac62 Fix (by inspection) NPE reported to google: test for null lock before
trying to save its game. Also remove empty overridden method.
2014-10-14 06:31:57 -07:00
Eric House
c73eec567b fix some const confusion the stricter android gcc found 2014-10-14 06:24:41 -07:00
Eric House
f14c3216a5 commit changes that have been running for a while 2014-10-13 19:10:56 -07:00
Eric House
bf1f0485df include git hash in name of .apk file 2014-10-13 19:06:40 -07:00
Eric House
2643c655f8 Merge branch 'android_branch' into android_multi2 2014-10-13 07:25:28 -07:00
Eric House
858187b9d7 include git rev hash in update info -- for later use detecting when a
tagged build has changed
2014-10-13 07:20:17 -07:00
Eric House
0362bf5cc9 Merge branch 'android_branch' into android_multi2
Conflicts:
	xwords4/common/board.c
	xwords4/common/comtypes.h
	xwords4/common/model.c
	xwords4/common/strutils.c
2014-10-13 07:03:20 -07:00
Eric House
518a6a903d list one more change 2014-10-13 06:48:00 -07:00
Eric House
fd7a03dfc4 remove logging 2014-10-13 06:47:49 -07:00
Eric House
4914e5b564 up strings and change log for new release 2014-10-12 21:12:25 -07:00
Eric House
501f9ad3d9 don't assume group will be found among visible views 2014-10-12 20:51:54 -07:00
Eric House
509df4cad5 add comment 2014-10-12 08:55:07 -07:00
Eric House
0770062559 when it becomes the turn of a game in a non-expanded group, update
that group to show it now contains an in-turn game.
2014-10-12 08:13:02 -07:00
Eric House
e87457cfbe cleanup: a view can always call getContext() 2014-10-10 08:01:08 -07:00
Eric House
823fce2b6f add projectile file now that I have some confidence it what it's doing 2014-10-10 07:38:27 -07:00
Eric House
9d038d13e4 add "new group" button to move game alert, and logic to relaunch the
move game alert after new group alert exits.
2014-10-10 07:29:36 -07:00
Eric House
b12d12590a don't memcpy 0 bytes 2014-10-09 21:21:41 -07:00
Eric House
4eb836ab2b fix to compile -- graft missed a constant defined earlier 2014-10-09 21:21:27 -07:00
Eric House
badc40f90b move dividerLoc into model and use to limit sorting to tiles to its
right
2014-10-09 20:09:24 -07:00
Eric House
195371ea2e as proof of concept, skip the first 3 tiles when sorting newly
assigned.  Later '3' will be replaced by the location of the tray
divider, but that has to be moved from board to model first.
2014-10-09 20:08:41 -07:00
Eric House
019daa6b84 Fix robot and human default dicts being able to be of different
languages: add new languages pref above the two, filter their choices
to be limited to that language, and change them to the first dict of
the new language when it's changed.
2014-10-09 08:03:25 -07:00
Eric House
4f22caafe9 don't assume there was only one missing after downloading first
missing dict
2014-10-09 06:31:43 -07:00