Commit Graph

537 Commits

Author SHA1 Message Date
Michael Bayne 33fbff4aba getPresentPlayer() fails after the game is ended because _playerOids is cleared
out. Use the caller's name instead.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@337 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-28 06:37:17 +00:00
Dave Hoover b7f32ddd96 computeEnteringLocation's signature changed back in r322. Fixed this up to
match, and threw in a bunch of @Overrides so that we won't get bitten by
that again in this particular file.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@336 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-27 22:26:06 +00:00
Michael Bayne 43d53e73a8 Fix booches.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@335 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-27 22:06:23 +00:00
Michael Bayne ebdf4f8fe2 Allow the border to be turned off entirely.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@334 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-27 22:05:44 +00:00
Dave Hoover ae4596def5 Bag out if we get a progress event from a non-player as we'll just blow
up on an ArrayIndexOutOfBoundsException a second later anyways.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@333 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-27 21:18:19 +00:00
Dave Hoover f85958032f Move the check for events for a non-puzzler after the checks
for invalid rounds and straggling events; if we've ended the
game and are getting straggling events, _playerOids has already
been cleared out, so it'll always look like a non-player.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@332 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-27 00:27:00 +00:00
Dave Hoover 6b1066169f Tabs -> spaces
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@331 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-26 00:07:57 +00:00
Michael Bayne 1c92282772 Freak not out if someone adds a click handler to something and removes said
thing from the stage in their click handler.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@330 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-25 23:57:19 +00:00
Michael Bayne 338e9e789b gameDidEnd():
Clear out _playerOids when a game ends so that all players must re-call
playerReady() to restart the game.

playersAllhere();
Start the game if all players call playerReady() when the game is not in play
(previously this only happened if the game was in the pre-game state).

I know of one place this will affect Yohoho which I will fix, but if there's
anywhere else where we are restarting an ended game, fixes will be needed.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@329 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-25 20:38:45 +00:00
Michael Bayne b87eacd9d6 Allow a game to delay its start until all of its players are actually ready
rather than assuming that as soon as they construct the EZGameControl, they're
ready to play. That's not totally unreasonable, but with this new explicit
mechanism, games can also "rematch" (or just replay if it's single player) by
having all clients call playerReady() again after the game has ended.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@328 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-25 20:36:16 +00:00
Michael Bayne 15bbb435c7 Grab our starting location from the scene when we switch scenes so that
getIntendedLocation() will return a valid value even before we've moved
somewhere in our new scene.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@327 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-23 02:08:03 +00:00
Michael Bayne d895c99484 Widening.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@326 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-23 02:00:20 +00:00
Michael Bayne b452746dc2 Must've been my cracksmoking. (int)-1 == (short)-1.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@325 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-22 23:48:18 +00:00
Michael Bayne e1ca37cb16 (int)-1 != (short)-1. Yay for automatic integer type widening.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@324 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-22 23:03:13 +00:00
Michael Bayne af9a9b4895 Use the right portal id.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@323 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-22 22:08:41 +00:00
Michael Bayne fbfed05247 One more bit.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@322 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-22 22:01:50 +00:00
Michael Bayne fe2fc21830 Widened, modified traversePortal() so that the entire portal being traversed is
kept around and passed to mapEnteringBody() so that in Whirled instead of
having a portal map to a destination portal we can simply have the source
portal contain the location in the destination scene at which the arriver is to
be mapped.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@321 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-22 21:59:04 +00:00
Michael Bayne 114fc2f0e7 Widening.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@320 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-22 01:00:23 +00:00
Mike Thomas a22a6e5551 Ensure we've registered our receiver before we call our superclass's function, since this queues up a playerReady and it's important that our addToReceivers event is queued up before that so the game doesn't start before we're ready to go.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@319 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-21 00:10:25 +00:00
Michael Bayne 3e56079a1a Use GameDefinition.controller if it is configured.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@318 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-18 19:59:57 +00:00
Ray Greenwell bdef34eb69 Exposed a method to allow users to batch property set requests into a
dobj transaction. Thanks to mdb for the idea of accepting a function to run
for the batch, rather than exposing startTransaction() and commitTransaction()
directly.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@317 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-18 19:33:02 +00:00
Michael Bayne 5116ab7089 Widened, nixed unneeded "throws SQLException".
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@316 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-15 02:01:08 +00:00
Dave Hoover 4af30e853e Actually do keyword substitution on those freshly headered files.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@315 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-14 18:20:31 +00:00
Nathan Curtis e4240b1b08 Let the method fetching the container set its style and width.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@314 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-14 18:02:33 +00:00
Michael Bayne c47d1a7c5a Header fixy.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@313 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-14 17:41:07 +00:00
Ray Greenwell e7c10e2a98 It sucks that we have so many old things that use -1 to mean "no value".
I'm going to assume that this one is ok to change to 0, because that's
what a body's sceneId is going to be before they're ever placed in a scene.
(Which is why 0 is a much better default value.)


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@312 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-12 23:42:47 +00:00
Nathan Curtis 5f04c759c7 private -> watchable. Defaults to watchable. The table config itself is left alone, and retains
the concept of private, rather than watchable.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@311 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-06 18:25:37 +00:00
Ray Greenwell fb24ff77cc T time!
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@310 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-05 04:00:12 +00:00
Ray Greenwell e066a12dee Actually, let's make that take a prefix argument, and only return properties
that begin with that prefix.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@309 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-05 03:48:15 +00:00
Ray Greenwell 13fdafe0e5 Unneeded import.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@308 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-05 03:45:48 +00:00
Ray Greenwell f85af6ffab Added getPropertyNames(), which used to be unnecessary because you could get
the data Object (actually a proxy to it) and do a for or for-each on that,
but we removed that when we made 3 different kinds of sets.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@307 c613c5cb-e716-0410-b11b-feb51c14d237
2007-06-05 03:44:47 +00:00
Jonathan Le Plastrier c491a2db1d Fix the docs links.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@306 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-30 22:27:31 +00:00
Michael Bayne 8c9a558932 Have GameDefinition include all the classes it will naturally require.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@305 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-28 17:13:20 +00:00
Michael Bayne 93a049a986 Let's have our dictionaries gzipped.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@304 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-28 01:53:55 +00:00
Michael Bayne 211e161604 Load our word lists from the classpath.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@303 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-24 00:26:29 +00:00
Michael Bayne bf47702336 Some DictionaryManager cleanups. It was doing everything on the invoker thread
when it should have been communicating results back on the dobj thread. I don't
particularly like the singleton usage here as one has to just "know" that a
server that uses EZGame services must call DictionaryManager.init() whereas all
of our other server services are initialized in a FooServer class that
corresponds with the group of services in question. Really we should use the
same FooContext system that we use on the client to allow services to be
properly mixed and matched.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@302 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-24 00:13:51 +00:00
Michael Bayne c4fbf34f44 We need to sort card sprites using a comparator if we want to sort them not
based on render order as we use render order. Also some widening.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@301 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-15 18:03:54 +00:00
Michael Bayne 84080ecb61 Naturally order card sprites by their card values.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@300 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-15 17:55:33 +00:00
Michael Bayne 8bcc05be89 EZGameConfig can create its controller from the classname provided in the game
definition as a sensible default behavior.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@299 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-14 23:36:26 +00:00
Ray Greenwell 2aa46a1572 Omit this class from 'genascript' generation, as the actionscript side does a special thing or two.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@298 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-08 20:18:44 +00:00
Ray Greenwell cb24d4adfb Bugfix: Return to decoding the data when we read it in, so that it's decoded for applyToObject().
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@297 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-08 17:41:22 +00:00
Michael Bayne cc94dacfce Vilya has a straggler as well.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@296 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-07 19:58:14 +00:00
Michael Bayne 69dd4a27d1 Instrument!
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@295 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-07 19:50:29 +00:00
Michael Bayne 87fe737eef Need to wrap this feller too.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@294 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-03 22:57:10 +00:00
Nathan Curtis a9aab4b39a added helpful comment so I don't make the same mistake again in the future
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@293 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-03 20:42:35 +00:00
Mike Thomas dd5993402a Don't fringe test tiles in the editor.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@292 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-03 18:22:03 +00:00
Nathan Curtis eac0b2a791 there is also no need to leave commented code in place
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@291 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-03 18:21:54 +00:00
Nathan Curtis 3a1f70e5cc there is no need to wrap this in an Integer... and apparently when pulling it out of the hashmap
and casting it to a string we get [object Object] instead of what you would expect


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@290 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-03 18:20:47 +00:00
Michael Bayne be68f9f7e0 Use an Integer here so that we play nicely with Java managers.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@289 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-03 00:17:38 +00:00
Mike Thomas 3fffe2e9b5 We need to use a non-negative tilsetID for the editor test tiles or things deep within the tile code will ignore us for base tiles. Since tileset IDs get cast to shorts in places for encoding into FQTileSetIds, the biggest we can use to try to not conflict is Short.MAX_VALUE.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@288 c613c5cb-e716-0410-b11b-feb51c14d237
2007-05-02 23:48:41 +00:00