Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
6737 commits 21 branches 243 tags 33 MiB
Commit graph

134 commits

Author SHA1 Message Date
Eric House
f5696334a9 changes to get the merged code to compile but not included by git in the commit 2013-07-09 07:25:23 -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
9ceb1615b3 replace tabs with spaces 2013-06-30 17:24:33 -07:00
Eric House
b506a91068 add commandline params 2013-06-30 08:33:58 -07:00
Eric House
5c284fe6b0 test PID is live before killing it 2013-06-28 18:55:19 -07:00
Eric House
5842654418 fix pattern 2013-06-24 07:30:38 -07:00
Eric House
aca3a96b54 fix pattern so ended games are detected 2013-06-24 07:18:53 -07:00
Eric House
5e22508ff7 kill existing xwords instances as part of --clean-start 2013-06-21 06:58:20 -07:00
Eric House
6446819466 use nice to give the relay a fighting chance 2013-06-21 05:41:23 -07:00
Eric House
5bec10048b add --clean-start option to speed testing 2013-06-20 06:45:51 -07:00
Eric House
0fad19e38a make it possible to mix udp and non-udp games (which currently crashes the relay very rarely) 2013-01-24 18:56:10 -08:00
Eric House
cbb82eb5e8 add --via-udp option -- which causes app to crash because the memory 
leak detector is working
 2013-01-24 08:00:53 -08:00
Eric House
6ca966f22a make test script and linux client mimic case where relay regid is 
rejected by relay.  Client re-registers and a new relay regid is
issued.
 2012-11-12 07:27:20 -08:00
Eric House
b53412d98d Fix to actually work. Grrr. 2012-11-10 14:52:10 -08:00
Eric House
b0f85e02df use grep of app's help message to determine whether a param is 
supported so can test with older clients and not crash.
 2012-11-09 06:55:38 -08:00
Eric House
59937b8514 modify how devids are handled on the relay and the protocol through 
which they're communicated to the device.  Device is expected to have
a platform-specific notion of ID which the relay stores in a new
devices table and indexes with a 32-bit number which is returned to
the device -- which is encouraged but not required to use it in lieu
of the longer ID in future communications.  Modify linux client and
test script to use the relay-supplied id.  Some of this is commented
out for now.
 2012-11-03 10:58:01 -07:00
Eric House
4ea8569abc honor --min-devs flag 2012-10-27 08:15:07 -07:00
Eric House
a6bed2706d include, commented out, the parameter that makes things fall apart. I 
think the protocol needs work to survive devices failing to save
state.  Better to work on making sure they always save.
 2012-09-11 20:45:03 -07:00
Eric House
ad4231289f fix --max-devs and resigns begin allowed when only one game 2012-09-11 07:24:51 -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
5309da9845 add --undo-pct option that passes through to curses client 2012-05-24 22:17:10 -07:00
Eric House
f7c49a6620 remove shift: --one-per doesn't take a param 2012-05-08 06:15:06 -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
7afa4f26db use the new --trade-pct flag 2012-05-03 19:00:56 -07:00
Eric House
af26ebfff9 fix usage hint 2012-01-26 05:40:22 -08:00
Eric House
af7398ce20 fix undeclared variable. 2011-12-15 18:36:47 -08:00
Eric House
964d2dfb0b allow, by default, more than one-player-per-device, but require that 
roomnames be unique to eliminate risk of devices not matching up
correctly.
 2011-12-02 18:55:20 -08:00
Andy2
08063d9444 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2011-12-01 21:18:37 -08:00
Eric House
6691c0713c Merge remote branch 'origin/android_branch' into android_branch 2011-12-01 20:16:15 -08:00
Eric House
0065f5078e add variable controlling odds of "upgrading" -- which still needs tweaking. 2011-12-01 20:16:09 -08:00
Eric House
1e48a8d615 Merge remote branch 'origin/android_branch' into android_branch 
Conflicts:
	xwords4/common/model.c
 2011-12-01 20:12:27 -08:00
Eric House
32f1dfa5da configure by passing params rather than setting ENV variables 2011-11-30 21:01:11 -08:00
Eric House
c39487e0cc add ability to start out with mix of old and new versions and have old 
upgrade to new at random times.
 2011-11-29 20:51:19 -08:00
Eric House
c1e420f726 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/relay/rq.c
 2011-11-29 06:45:32 -08:00
Eric House
c8b868c243 Separate app from params. No change in behavior (though restart of 
existing games is now broken), but this sets up testing mid-game
upgrade.
 2011-11-29 06:43:16 -08:00
Eric House
c6e994abef use $RANDOM rather than $SEED -- still repeatable, but avoids relay 
problems when devices have same game seed.
 2011-11-28 18:53:40 -08:00
Eric House
384a41ed5b add ability to specify seed and vary board-size 2011-11-25 18:03:51 -08:00
Eric House
b00327aa8b fix to work for NDEVS > 2. 2011-11-21 17:35:08 -08:00
Eric House
a0a8a816a4 make number of devices configurable 2011-11-21 10:09:29 -08:00
Eric House
55d23c9502 various improvements, including allowing to specify seed to enhance 
reproducibility, copying xwrelay.log into directory with game logs
when they don't finish for easier analysis.
 2011-11-17 19:58:08 -08:00
Andy2
2492e7cfc5 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/linux/cursesmain.c
 2011-11-13 17:10:46 -08:00
Eric House
5be5e9fdeb cleanup script output 2011-11-10 18:39:35 -08:00
Andy2
00f743409a script for reproducing problem with relay games that show up randomly. 2011-11-10 06:51:30 -08:00
Andy2
956fe350ba remove changed param -- mmap's the default now. 2011-11-07 18:19:12 -08:00
Andy2
febf32040e don't kill xwords; it'll exit when it's done 2011-10-07 18:51:27 -07:00
Andy2
38adeb9160 improve script to be more patient but exit after there stop being 
messages -- which usually means the games finished.  With this and
previous changes the background stuff works most of the time.  Now to
debug why it's not all of the time.
 2011-09-30 18:22:25 -07:00
Andy2
9bc36cd431 not an error when wait fails 2011-09-30 06:51:48 -07:00
Andy2
9c586efb02 new script for testing this branch's changes: replying to 
messages delivered in the background.
 2011-09-30 05:43:24 -07:00
Andy2
4a49db5c2a initialize variable 2011-09-30 05:42:44 -07:00