Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4733 commits 20 branches 240 tags 30 MiB
Commit graph

4733 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy2
6b773460ec call server_do before passing message to server to give it a chance to 
get any pending work done.
 2011-07-06 18:14:31 -07:00
Andy2
52510b0b10 force XW_STATE to be 1 byte. 2011-07-06 18:13:59 -07:00
Andy2
859283a8d0 save stateAfterShow as part of serialized game state. Fixes problem 
where games with more than two devices would hang because server.c
code was dropping messages that comms.c code thought were good and so
ACK'd preventing them from being sent again.  They were being dropped
because the game was in the wrong state after displaying a move-made
dialog because the state it was to move to after doing that display
had not been saved.
 2011-07-06 18:11:56 -07:00
Andy2
63799a5f4a add new error message to DEBUG-only printing code. 
Conflicts:

	xwords4/common/comms.c
 2011-07-06 18:10:42 -07:00
Andy2
a975a405aa handle new "no-connect-dead-game" error code the same as an in-play 
"deleted" message: put up existing dialog offering to delete the game.
 2011-07-06 06:50:56 -07:00
Andy2
9ec72d6015 handle new "no-connect-dead-game" error code the same as an in-play 
"deleted" message: put up existing dialog offering to delete the game.
 2011-07-06 06:49:19 -07:00
Andy2
f3ab40519d add new error message to DEBUG-only printing code. 2011-07-06 06:47:56 -07:00
Andy2
86e3cc7286 When device reconnects to a dead game, just deny the connection with a 
new error message rather than allow it as if it were a normal game
only to send a game-dead message after.  This solves the problem of
how device knows not to put up welcoming message or suggestion to
invite to a game that's suddenly missing players.  BUT: this change is
incompatible with existing versions and so needs to get pushed out
before the in-use relay can be upgraded to include this code.
 2011-07-06 06:47:25 -07:00
Andy2
928404be50 remove unused enum 2011-07-06 06:15:25 -07:00
Eric House
a3dbde9b88 more dealing with edge cases. 2011-07-05 21:42:03 -07:00
Eric House
98a65d82ed fix crash in rare edge case 2011-07-05 21:40:13 -07:00
Eric House
d3108aac79 split method in two to provide new API (I'm not using yet) 2011-07-05 21:39:38 -07:00
Andy2
4789bac85e add new mode that only launches games after the relay says there's a 
message for them.  This is to mimic a common way games are played on
Android and to ensure that there are no points where that style of
play hangs because no device in the game will be "up".
 2011-07-04 19:46:12 -07:00
Andy2
999d4c11e7 simple script for watching what messages the relay has pending for a 
game.
 2011-07-04 12:51:27 -07:00
Andy2
4b75174170 save stateAfterShow as part of serialized game state. Fixes problem 
where games with more than two devices would hang because server.c
code was dropping messages that comms.c code thought were good and so
ACK'd preventing them from being sent again.  They were being dropped
because the game was in the wrong state after displaying a move-made
dialog because the state it was to move to after doing that display
had not been saved.
 2011-07-04 12:51:00 -07:00
Andy2
0eec455119 change one return type; improve logging 2011-07-04 12:46:48 -07:00
Andy2
8904f37e1a force XW_STATE to be 1 byte. 2011-07-04 12:45:51 -07:00
Andy2
ab8e4e437b call server_do before passing message to server to give it a chance to 
get any pending work done.
 2011-07-04 12:37:23 -07:00
Andy2
66d42faead fix sync-with-relay menu items to work even if timed syncing is 
disabled.
 2011-07-04 12:28:17 -07:00
Andy2
7024718c87 add timestamps to jni logs 2011-07-04 09:38:22 -07:00
eehouse@eehouse.org
8f782070ac Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-07-03 09:28:36 -07:00
Eric House
e207e0e142 add option to run only one game at a time in a given room. The idea 
was to mimic conditions that are creating a bug on-device but it
didn't work.  Still, a useful test case....
 2011-07-02 23:12:16 -07:00
Andy2
175aace629 fix a couple of rare failures due to race conditions testing or 
valgrind flushed out.
 2011-07-02 13:28:24 -07:00
Eric House
35bfdb1dd6 Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-06-30 19:44:46 -07:00
Eric House
09b81c6ad7 fix rare crash: don't call PQgetvalue when there are no results. 2011-06-30 19:39:00 -07:00
Eric House
5c5708fa66 try to fix race condition that sometimes means script detects game is 
over but doesn't communicate to relay: don't consider file done until
have info to sent to relay.
 2011-06-30 19:37:37 -07:00
eehouse@eehouse.org
3db7fccb53 Merge branch 'android_invite' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_invite 2011-06-30 18:57:53 -07:00
Andy2
ada84cccb3 make invites work with games having more than two players. But: the 
games themselves don't work!  Fix this or disable 3- and 4-device
networked games.
 2011-06-30 18:56:51 -07:00
Andy2
36287870d4 add np (num players) param 2011-06-30 18:22:42 -07:00
Andy2
546791d215 custom message when more than one player missing reminding to invite 
more than one person.
 2011-06-30 06:30:05 -07:00
Andy2
0c42da905a plug memory leak flushed out by auto-juggle code: null dict doesn't 
mean the end of the list.
 2011-06-29 21:43:50 -07:00
Eric House
48ea9e2b28 add preference to juggle players when creating a new game 
Conflicts:

	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java
 2011-06-29 21:43:44 -07:00
Eric House
ef9d359ab9 tweak default param values 2011-06-29 21:38:54 -07:00
Eric House
b4a513ce87 reduce logging; log errno on syscall failure 2011-06-29 21:38:31 -07:00
Eric House
8e31fd88c3 reduce logging; and fix valgrind-found problem using wrong 
synchronization primative.
 2011-06-29 21:37:33 -07:00
Eric House
04740486fb wrap more logging in ifdefs 2011-06-29 21:35:21 -07:00
Eric House
2b4f439a2f rough script to parse logs looking for threads that have hung (stopped logging) 2011-06-29 21:32:18 -07:00
Andy2
57cfefb6a9 fix leaks -- that don't really matter as process is exiting, but 
quiets valgrind.
 2011-06-29 18:45:02 -07:00
Andy2
f3a4ff9dfc use cid for variables of type CookieID everywhere instead of almost 
everywhere
 2011-06-29 18:42:41 -07:00
Andy2
4cb45d3b82 juggle before setting language (makes sense though not demonstrable 
difference)
 2011-06-29 18:30:08 -07:00
Andy2
cd844a5bad plug memory leak flushed out by auto-juggle code: null dict doesn't 
mean the end of the list.
 2011-06-29 18:28:55 -07:00
Andy2
632980dc98 add preference to juggle players when creating a new game 2011-06-29 06:16:58 -07:00
Andy2
413b2f5b2e include default language in text in new game dialog. 2011-06-28 19:01:03 -07:00
Andy2
5dd524ef2f param name for clarity 2011-06-28 19:00:21 -07:00
Andy2
a9d1dc7bdc add default room name in configure-first case too. 2011-06-28 18:32:32 -07:00
Andy2
363acc228a use printf so rooms sort numerically 2011-06-28 17:38:59 -07:00
Andy2
b2a7acbdf1 remove echo 2011-06-27 18:59:36 -07:00
Andy2
3db0543994 work in absence of drop-nth-packet param 2011-06-27 18:57:27 -07:00
Andy2
ceeee39c2d fold it what can from android_invite branch to make relay upgrade test 
easier
 2011-06-27 18:43:42 -07:00
Andy2
8673c6a001 toward being able to verify that upgrading the relay won't hurt 
in-play games: add ability to pick up games mid-play; don't sleep
before killing a device unless it's only been running less that the
minimum.
 2011-06-27 18:32:30 -07:00