Commit graph

8300 commits

Author SHA1 Message Date
Eric House
9b0eba8be6 up copyright for the new year 2015-01-24 08:54:06 -08:00
Eric House
f48d79d4c8 provide default default language name (and rename string constant
being used that way now too)

Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-01-23 08:35:04 -08:00
Eric House
e0c9d626ae rename script 2015-01-23 08:30:19 -08:00
Eric House
4123de3560 merge android branch heads 2014-12-15 16:44:32 -08:00
Eric House
30d2c84dcc so tests can continue, comment out an assertion that indicates a relay
bug that neverless doesn't prevent games from running to completion.
2014-12-15 16:43:24 -08:00
Eric House
26b01acf23 fix crash on duplicate connect packet: drop it, but keep the
connection alive if the duplicated packet set up addressing correctly.
2014-12-15 16:42:34 -08:00
Eric House
eb5ae9edd3 declare as little-a array so key will be listed in numeric order 2014-12-15 16:41:15 -08:00
Eric House
45ef4fcb65 add --dup-packets calling through to linux client 2014-12-15 16:14:59 -08:00
Eric House
92fd048eef signature change: return void instead of always returning true 2014-12-15 15:33:12 -08:00
Eric House
4835afbe4a simplify and print in order 2014-12-15 15:29:37 -08:00
Eric House
7560156351 summarize the number of tiles left every 20 passes to give better view
into games' progress
2014-12-15 15:11:29 -08:00
Eric House
bf53481aad log unexpected condition rather than asserting 2014-12-11 06:18:30 -08:00
Eric House
16c4e74e04 ignore client index of 0, since it means the device needs a slot
assigned.
2014-12-10 08:04:56 -08:00
Eric House
2e9c033a29 If client provides its index, honor that when placing it in game. This
allows a game where indices have already been established over some
transport other than relay to start using the relay mid-game.
2014-12-10 08:03:39 -08:00
Eric House
39b0d40e41 add local variable to prevent some dereferencing 2014-12-10 08:02:20 -08:00
Eric House
a80293ba82 include timestamp in "new day" post-crash line 2014-12-05 06:39:10 -08:00
Eric House
83a79963d4 Merge remote branch 'origin/android_branch' into android_branch 2014-11-22 17:11:40 -08:00
Eric House
4b635791d7 crash fix: provide missing param to format string 2014-11-22 17:08:17 -08:00
Eric House
e82589a526 replace overloaded method with diff-named one, avoiding call to wrong
one when compiled on old 32-bit Atom. 32-bit issue, or what?  This is
quick and sure to fix it. Should be grafted back to main branch.
2014-11-10 06:43:42 -08:00
Eric House
a34a859d18 log channelNo more consistently 2014-11-06 18:44:19 -08:00
Eric House
1789d442ba let me look at another player's tiles, regardless of pref setting,
when game is over
2014-10-27 19:24:22 -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
d1b05749eb ignore core files 2014-10-20 20:23:05 -07:00
Eric House
53d2c2f0f2 rename method 2014-10-17 18:35:14 -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
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
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
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