Andy2
92940e6638
add model_getNPlayers()
2010-11-19 18:22:39 -08:00
eehouse@eehouse.org
d261aa8184
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-11-18 22:42:43 -08:00
Eric House
a1caaeb183
simulate games being deleted before they're finished
2010-11-18 22:27:46 -08:00
Eric House
7a2d279308
add logging so script can better track what state relay game is in
2010-11-18 22:27:06 -08:00
Andy2
43be0183a5
just assert that dict can be opened as part of opening game. GamesList
...
is now responsible for not launching a game if its dict is gone.
2010-11-18 19:05:22 -08:00
Andy2
3eb8b723de
don't assume no-dict dialog should call finish on its calling
...
Activity() on exit -- we're not letting the Activity launch any more.
2010-11-18 19:04:43 -08:00
Andy2
198534dce3
check if dict missing and warn rather than do anything that will crash
...
if it's not there. Ideally I could open the config dialog so user
could change the dict but that isn't working. Maybe just offer to
open it after swapping in the default dict?
2010-11-18 19:00:49 -08:00
Andy2
7921ddca10
don't crash when asked to reset a game whose dict has been deleted.
2010-11-18 18:52:04 -08:00
Andy2
163c124072
update for b19
2010-11-17 06:13:31 -08:00
Andy2
fc88742978
up constants for b19
2010-11-16 21:06:43 -08:00
Eric House
b91187d6a5
test result when parsing; drop if didn't parse
2010-11-16 20:30:43 -08:00
Eric House
f33466b6db
exit with non-0 on failure so calling script/loop can exit too
2010-11-16 20:29:55 -08:00
Eric House
4c6c3c1ded
when marking a device in a dead game, negate its nperdevice entry rather than always using -1.
2010-11-16 20:28:53 -08:00
Andy2
635ae053b6
cut down on printing; don't assert-fail when relay's crashed.
2010-11-15 20:40:59 -08:00
Andy2
2c5c7a0dd1
init m_nRoomsFilled -- not sure when this http view feature broke
2010-11-15 20:08:59 -08:00
Andy2
a1be555910
improve string for deleted remote game -- but really needs a "delete
...
now" button.
2010-11-15 19:02:12 -08:00
Andy2
3b30aff613
use external relayID.sh script
2010-11-15 19:01:38 -08:00
Andy2
ea292c7e2f
exclude dead games when looking for open public rooms
2010-11-15 19:01:11 -08:00
Andy2
58cd93ef6f
given a log file, generates an ID that can be passed with the -d
...
option to relay/rq.
2010-11-15 18:34:56 -08:00
Andy2
c6bd2125a4
java uses '/' to delimit device id, so we'll make that standard.
2010-11-15 18:27:36 -08:00
Andy2
c36679fe13
init isDead to false. Fixes prolem where if DB entry's missing the
...
value is uninitialized and so device gets warned that other device
resigned even if none did.
2010-11-15 18:21:40 -08:00
Andy2
a69e2ad8be
add test for device-gone notification by calling rq after gleaning
...
required params from logs. So far testing only after game is over;
need to test mid-game deletion too.
2010-11-15 06:52:35 -08:00
Andy2
d4e810c9cb
delimiter changed
2010-11-15 06:51:05 -08:00
Andy2
ce5738a4e1
write the count
2010-11-15 06:50:09 -08:00
Andy2
edf0c40904
track isDead when creating SafeCref for devgone
2010-11-15 06:49:41 -08:00
Andy2
2c9f2572a8
use GameFull()
2010-11-15 06:48:57 -08:00
Andy2
feca7345dc
add GameFull -- database, not in-memory state, knows if game is full.
2010-11-15 06:48:36 -08:00
eehouse@eehouse.org
14579c6e30
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
2010-11-14 19:40:35 -08:00
eehouse@eehouse.org
6ae288d800
Merge branch 'relay_proxy' of /home/andy2/dev/git/LOCAL_ORIGIN into relay_proxy
2010-11-14 19:35:31 -08:00
Eric House
528ae0c986
allow more than one device death per message
2010-11-14 15:19:38 -08:00
Eric House
a8ac30b180
add -d option to test dev-gone on relay
2010-11-14 15:18:49 -08:00
Andy2
9026d5c149
remove obsolete script I keep accidentally invoking
2010-11-12 18:26:01 -08:00
Andy2
43896ff187
remove unused method and variable
2010-11-12 18:25:15 -08:00
eehouse@eehouse.org
6663ce5655
Merge branch 'android_branch' into relay_proxy
2010-11-11 06:51:15 -08:00
Andy2
fc8cac3b6a
handle new device-gone message by posting timed-out dialog.
2010-11-11 06:43:36 -08:00
Andy2
b0a4790ce0
respond to new game-gone message by passing to utils.
2010-11-11 06:41:24 -08:00
Andy2
0787a06eb5
accept new message from device announcing the death of a game
...
(including seed so it's harder to spoof); respond to that by setting a
DEAD column in the db and flagging the device as gone. Notify any
connected device of the fact. Refuse to accept new connections to
that game. As already-connected devices reconnect, allow them to do
so but send a new status message that their game is dead. Not heavily
tested yet.
2010-11-11 06:40:50 -08:00
Andy2
3d59bc7e39
add new DEAD column to track when a game's been deleted
2010-11-11 06:29:21 -08:00
Andy2
04e1b0c22b
new constants, include new status event type, for relay to accept
...
notification of deleted game and communicate that to others in the
game as they connect.
2010-11-11 06:26:59 -08:00
Andy2
d809db7b21
plug into delete and reset code to notify relay that game's forever gone.
2010-11-11 06:25:08 -08:00
Andy2
cf84cce41a
define and handle new other-was-deleted error relay is about to start
...
returning.
2010-11-11 06:23:48 -08:00
Andy2
e3f373039a
add informOfDeath to communicate to relay when game is deleted
2010-11-11 06:22:38 -08:00
Andy2
4761169c2b
switch to RelativeLayout, putting lock checkbox at top and play game
...
button in the middle with everything else scrolling in between. This
particular application of RelativeLayout works on 1.5 (in emulator).
2010-11-11 05:46:23 -08:00
eehouse@eehouse.org
048eff92b8
Merge branch 'relay_proxy' of /home/andy2/dev/git/LOCAL_ORIGIN into relay_proxy
2010-11-10 07:17:39 -08:00
eehouse@eehouse.org
7929167129
Merge branch 'android_branch' into relay_proxy
2010-11-10 07:06:10 -08:00
Andy2
f373b52d45
fix bug drawing tile letters when drawScaled() got triggered (e.g. for
...
W on non-std-sized screen): pass null as scr rect to drawBitmap so the
whole bitmap gets used.
2010-11-10 07:05:40 -08:00
Andy2
d3e644db83
stop requiring 1.6 sdk when runs fine on 1.5
2010-11-10 06:57:45 -08:00
Andy2
c8d7ca40a5
use \1 instead of \n as delimiter -- in case somebody passes as string
...
containing a \n.
2010-11-09 18:02:22 -08:00
Andy2
0f111ab363
use PQexecParams instead of PQexec for queries involving strings from
...
users (i.e. room names) to avoid crashes when the contain apostrophes
-- and in general to be safer.
2010-11-09 17:27:33 -08:00
Eric House
966616cbc4
throw in the public flags; disallow unset variables
2010-11-09 05:54:23 -08:00
