Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-22 07:28:16 +01:00
Code Issues Projects Releases Packages Wiki Activity
5798 commits 21 branches 243 tags 33 MiB
Commit graph

5733 commits

Author SHA1 Message Date
Eric House
a03dc80205 tweak method for clarity -- no behavior change 2012-05-30 06:52:08 -07:00
Eric House
42f2612e67 turn on HASH_STREAM to match Android 2012-05-30 06:51:26 -07:00
Eric House
a0336ebb01 turn on new HASH_STREAM feature 2012-05-29 07:26:51 -07:00
Eric House
65f90b2d86 up version number and add changes 2012-05-29 07:26:24 -07:00
Eric House
821add6df5 fix to compile when HASH_STREAM not defined 2012-05-29 07:19:19 -07:00
Eric House
ac23e7e950 define HASH_STREAM to enable new algorithm 2012-05-28 15:58:00 -07:00
Eric House
240d308d07 move nperdevice and ntotal side-by-side 2012-05-28 11:08:43 -07:00
Eric House
adadc9c90c use new hash algorithm for new stream version, old for previous 
versions.  Tested upgrade scenario from b44: works.
 2012-05-28 11:07:59 -07:00
Eric House
b343034cc2 add ability to pass params only to new version of app so that test of 
upgrade from old to new needn't skip test of new features.
 2012-05-28 11:04:39 -07:00
Eric House
e36635944e fix to make two-device games much more common than four-device ones 2012-05-27 19:05:27 -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
0cb217496e cleanup 2012-05-24 22:22:00 -07:00
Eric House
5309da9845 add --undo-pct option that passes through to curses client 2012-05-24 22:17:10 -07:00
Eric House
9354e0e0cd fix off-by-one error in stream_copyBits that seems to have been 
responsible for HASH_STREAM not working.
 2012-05-24 22:16:22 -07:00
Eric House
fd7a25ba3c makefile for just-released DISC2 wordlist for Catalan 2012-05-23 20:04:11 -07:00
Eric House
cd89885cd2 add new periodic (one-second) timer, and commandline option that sets 
what percent of the times that timer fires will result in a move being
undone.  Will be used to interject random out-of-order undos into
games played for testing.  (Currently the tests fail when this is
enabled; I need to fix that.)
 2012-05-23 19:58:03 -07:00
Eric House
2db02f9aa5 fix delegated dialogs to clear state before issuing dismiss callback 
so that callback can set up another dialog without tripping an assert,
then move SMS invite dialog chaining from on-click callback to
on-dismiss.
 2012-05-23 07:16:27 -07:00
Eric House
60e1d50f43 add stream_copyBits, and use it to hash the move stack -- commented 
out via conditional compile as it still doesn't work in all cases.
 2012-05-22 19:24:54 -07:00
Eric House
d1869a233c fix so non-debug build builds 2012-05-22 19:18:04 -07:00
Eric House
60aa0cb614 revert unintended commit 2012-05-21 21:49:02 -07:00
Eric House
622afa4d98 track what games we've sent died notices for and don't repeat. Fixes 
infinite message flood occurring when a packet was received after
games had been deleted on both devices.
 2012-05-21 21:47:09 -07:00
Eric House
5efaced84b Revert "Revert "track what games we've sent died notices for and don't repeat. Fixes"" 
This reverts commit 8fd1388b5f.
 2012-05-21 21:45:30 -07:00
Eric House
8fd1388b5f Revert "track what games we've sent died notices for and don't repeat. Fixes" 
This reverts commit 67715b653a.
 2012-05-21 21:44:51 -07:00
Eric House
67715b653a track what games we've sent died notices for and don't repeat. Fixes 
infinite message flood occurring when a packet was received after
games had been deleted on both devices.
 2012-05-21 21:27:22 -07:00
Eric House
e80417e806 don't draw separate icon in games list elements for needs-sync relay 
game -- since that state no longer really exists.
 2012-05-21 21:23:13 -07:00
Eric House
adac3abcc6 fix bug where all notifications wound up launching the same game 
because all their PendingIntents were the same by passing a unique
resultCode on creation.
 2012-05-21 06:46:37 -07:00
Eric House
f56b09980c include game name in notification text 2012-05-21 06:40:52 -07:00
Eric House
469f63f96f log when more than one game found with a given ID. 2012-05-20 10:33:26 -07:00
Eric House
1ca36044a0 allow for possibility that there's more than one game on device with 
one gameID.  Currently this should only happen when a device is
playing via SMS against itself -- i.e. when I'm debugging or a user is
playing around.  It hasn't been tested and may not work to the extent
that a game like that can actually work and so may want to be backed
out later.
 2012-05-20 10:24:37 -07:00
Eric House
3c4e01ef52 improve text clarity 2012-05-18 21:23:38 -07:00
Eric House
2564a660ad remove logging 2012-05-18 21:23:12 -07:00
Eric House
211318f2ef remove logging 2012-05-18 21:23:09 -07:00
Eric House
df0c5e4abf move plus button to middle, and fix so both text buttons wrap when 
required on narrow screen.
 2012-05-18 21:14:50 -07:00
Eric House
47a5ab65df use broadcast receiver for status PendingIntents from SendTextMessage, 
and pass up new MultiService messages on success or failure.  In
response to these, post SMS status icons on board.  Still need to come
up with an initial status, notice radio ups/downs, etc.  And design icons!
 2012-05-18 07:55:10 -07:00
Eric House
523d49ef04 stubs for sms status icons 2012-05-18 07:52:32 -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
60c3a5bf64 use green_border to frame remote players whose turn it is. 2012-05-18 06:54:05 -07:00
Eric House
091f927c8b add new file 2012-05-18 06:53:28 -07:00
Eric House
40843db7df rename 9-patch 2012-05-18 06:52:25 -07:00
Eric House
599d0630d3 built main app for same version as sms version 2012-05-18 06:22:23 -07:00
Eric House
81f830c0d4 drawable that creates a green frame around view -- to show it's remote 
player's turn.
 2012-05-18 06:22:06 -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
61453b8720 center gtk_ask window on parent window rather than on screen so can 
tell which instance it belongs to
 2012-05-14 06:58:54 -07:00
Eric House
edd02c24ea derive variant if called from a directory with AndroidManifest in it 2012-05-11 07:32:02 -07:00
Eric House
10ad59247a don't remove undo menuitem for networked games -- should be safe to 
use now.
 2012-05-11 07:26:49 -07:00
Eric House
a311e487a9 add another change 2012-05-09 18:22:30 -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
2996af17ce fix crash when trade happens while --show-other is on 2012-05-09 18:20:51 -07:00
Eric House
261908a09f use non-strippable spaces when ': ' is meant to terminate string. 2012-05-09 18:19:53 -07:00
Eric House
f6ba94735d move BT and SMS listener installation behind if_supported tests 2012-05-09 07:09:15 -07:00
Eric House
1c08190941 list the other change 2012-05-09 06:51:48 -07:00
Eric House
d846f96ec5 post-code-review cleanup: no significant change 2012-05-09 06:51:06 -07:00
Eric House
d23f50a801 Merge remote branch 'origin/android_branch' into android_branch 2012-05-08 06:16:40 -07:00
Eric House
f7c49a6620 remove shift: --one-per doesn't take a param 2012-05-08 06:15:06 -07:00
Eric House
e797b342fe check in sms version of prefs xml file so that it can have its 
checkbox for turning off warnings about SMS costs.  I've already
wasted too much time without figuring out how to add or remove the
pref programatically....
 2012-05-07 21:09:01 -07:00
Eric House
155df55b5c break hash finishing stuff out to be called only once 2012-05-07 20:48:00 -07:00
Eric House
e82faedc63 up version number here too. 2012-05-07 07:13:48 -07:00
Eric House
08f03af2cc don't write gameID as 32 bits when it's bound for old-version client, 
and assert based only on the lower 16 bits in case came from
old-version client.  Fixes crashes testing mid-game upgrade from beta
43.
 2012-05-07 07:02:43 -07:00
Eric House
c17826ffbf up beta version 2012-05-05 17:39:30 -07:00
Eric House
3b3439371f Merge branch 'android_branch' into android_bt 2012-05-05 17:33:21 -07:00
Eric House
5104ca6bc5 always sort tiles prior to including in hash -- as a fix for the case 
where a game is opened that was created by an earlier version that
didn't save assigned tiles in sorted order.
 2012-05-05 17:33:07 -07:00
Eric House
64199c4e64 Merge branch 'android_branch' into android_bt 2012-05-05 11:08:03 -07:00
Eric House
adf43bb1e8 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2012-05-05 11:07:20 -07:00
Eric House
c2d8b17747 add --sort-tiles and fix confict between param name in code and in usage() 2012-05-05 10:55:35 -07:00
Eric House
058cbc4e1b first attempt, commented out, to hash the stream directly rather than 
its exploded contents.  Does't work once there's been some undo
activity as I don't have a way to get the length of the stack below
the undo/redo line.  Looks promising though.
 2012-05-05 10:47:28 -07:00
Eric House
eb2f5ff6eb sort assigned tiles before putting them in the move stack. Fixes hash 
comparison failure when devices are using sort-tiles option.
 2012-05-05 09:47:57 -07:00
Eric House
44a6653166 add passthrough of params present in gtk but not curses 2012-05-05 09:24:41 -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
83fec4d5eb turn on board hashing and bigboard options (in protocol, not UI) 2012-05-04 06:00:46 -07:00
Eric House
501210e3a3 turn on hash feature and mark so can see on relay 2012-05-03 21:49:15 -07:00
Eric House
d59b19514b Merge branch 'android_branch' into android_bt 2012-05-03 21:44:35 -07:00
Eric House
de3107271d changes to make hashing work -- make sure unused space in structs is 0 
-- and to detect when an incoming move doesn't make sense.  These
latter changes may not be necessary now that hash code is checked
first thing, but can't hurt, and there will be devices without hash
codes for a while.
 2012-05-03 19:02:42 -07:00
Eric House
7afa4f26db use the new --trade-pct flag 2012-05-03 19:00:56 -07:00
Eric House
47dde6cf3c init bitfield to 0 in case I want to hash stream directly 2012-05-03 19:00:43 -07:00
Eric House
652fe6dd64 fix test: unsigned can't drop below 0 2012-05-02 20:42:45 -07:00
Eric House
26913c5a37 get rid of excessive logging 2012-05-02 20:41:46 -07:00
Eric House
09f9038cff add option to have robot choose to trade tiles a configurable percent 
of the time.  Meant to increase automated test coverage of trades.
 2012-05-02 20:14:42 -07:00
Eric House
de965350c4 turn on feature that allows version of remote device to be deduced and 
included in stream -- so that new move stack hash can be included when
possible.
 2012-05-01 07:59:22 -07:00
Eric House
c52db8a8f0 toward better recovery from out-of-sync move and undo: include a hash 
of the move stack with every turn (version permitting), and drop
incoming moves created against a move stack different from ours.
 2012-05-01 07:58:11 -07:00
Eric House
0e07fab731 add stack_getHash() -- returning hash of current move stack (excluding 
any pending redos)
 2012-05-01 07:56:45 -07:00
Eric House
89ca45357a add pool_containsTiles() 2012-05-01 07:49:41 -07:00
Eric House
75247e59df fix confusing log message 2012-04-26 19:12:13 -07:00
Eric House
49f4700799 change sms-game-name dialog title 2012-04-24 19:01:21 -07:00
Eric House
b68b8aa0d0 for extra safety, move message hash into header where it can be part 
of test whether message should be deleteted from sms inbox.
 2012-04-24 07:19:52 -07:00
Eric House
9035f901b1 fix NPE for non-SMS case 2012-04-23 21:46:27 -07:00
Eric House
6930da9686 add warning about unlimited SMS plans that's triggered whenever a new 
number is added to the list of possible invitees.
 2012-04-23 20:07:44 -07:00
Eric House
010fae495b fix compile error 2012-04-23 07:37:02 -07:00
Eric House
2082b40d4a look up names from phones rather than store them separately 2012-04-23 07:32:42 -07:00
Eric House
f7c9e0cc16 use name in summary where available 2012-04-23 07:31:33 -07:00
Eric House
b2a1fefd26 synchronize access to phone-to-name hash 2012-04-23 06:55:00 -07:00
Eric House
07c1d68321 syntax error! 2012-04-23 06:54:23 -07:00
Eric House
97cb3863a6 name constant -- no code change 2012-04-23 06:34:00 -07:00
Eric House
02443d26a9 catch oob exception when older version receives enum not in values() array 2012-04-23 06:30:20 -07:00
Eric House
b34e741e30 add param to phoneToContact controlling whether phone number is 
returned when name can't be found.
 2012-04-23 06:16:06 -07:00
Eric House
d5076e2167 make a couple of methods private 2012-04-23 06:14:02 -07:00
Eric House
a98f9ef12f refactor; don't rely on otherwise unused i-var. 2012-04-23 06:13:05 -07:00
Eric House
c15b56199c use marker enum to test for size. no code change 2012-04-22 17:55:53 -07:00
Eric House
a72dbdd8dd add static to cache phone->name mapping 2012-04-21 22:16:47 -07:00
Eric House
3af20f1d5a look up name for phone number in contacts and use in game config. 
Will want to use elsewhere.  May want to cache depending on speed.
 2012-04-19 00:37:37 -07:00