Commit Graph

3628 Commits

Author SHA1 Message Date
Michael Bayne d6e4fe20c3 Use vsync, we don't like the tearing.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3536 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-05-03 02:39:13 +00:00
Andrzej Kapolka 0793baaf22 Slight changes to cope with lag and unresponsiveness.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3535 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-05-03 01:49:10 +00:00
Ray Greenwell ae0547a0ff Cope with the bug we observed this morning as best we can, shut down
the conmgr (and in so doing, the entire server).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3534 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-05-02 18:52:20 +00:00
Andrzej Kapolka e16a115575 Always invalidate media on shutdown to avoid remnants.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3533 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-05-02 00:57:58 +00:00
Michael Bayne 78d32af2f9 Separate our scene graph into user interface and geometry, reflect that in
the services we make available via the context. Added a sprite and path
framework not wildly unlike that in media but based around the JME
primitives.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3532 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-05-01 23:42:46 +00:00
Michael Bayne 6c5dc815eb addChild() -> add().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3531 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-05-01 16:16:35 +00:00
Ray Greenwell bc07aa1afd Use a dobj transaction to bundle up the events that get dispatched during
each card play. More could be done, I just added this quickly.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3530 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-30 21:37:59 +00:00
Michael Bayne 357ed12b9f Switched the chat view and test app over to BUI. Modifide the build script
to create a narya-jme.jar file.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3529 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-29 03:24:07 +00:00
Ray Greenwell 16322b1422 Added some warnings for illegal DSet operations and added a small
optimization in the process.
Previously, we dumped stack on the server if a entry add was illegal but
did nothing for update/remove.
On the client, we complained for updates and (indirectly) adds, but not
removes.
Now we complain everywhere.
And- as an added bonus, on the server we now do only one binary search for
updates and removals. Whee!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3528 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-29 02:30:23 +00:00
Ray Greenwell f5e5d273e7 Moved ScoreAnimation to parlor/media so that games may make use of it.
Removed "puzzle fonts" from the narya library (lived in PuzzleBoardView).
Left convenience methods in PuzzleBoardView for creation ScoreAnimations,
as we like convenience.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3527 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-28 23:17:29 +00:00
Andrzej Kapolka 73a48a11e9 To avoid having cards bounce up and down when you hold the mouse cursor near the bottom of the hand, don't update the active sprite every frame; rather, only update it at certain key times.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3526 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-27 20:36:48 +00:00
Ray Greenwell 052cf8e0e2 Table creation refactor: Rather than have the game config specify
table configuration parameters that are unneeded once the actual game starts,
and requiring each GameConfigurator to duplicate the functionality
of standard table setup, I separated TableConfig from GameConfig.
If a game wants to be usable in a table matchmaking service, it
implements TableableGameConfig, and returns the TableConfigurator to use.
There is a default TableConfigurator implementation that just does
everything needed. TableConfigurator returns a happily customized
TableConfig, which is sent to the server with the GameConfig in order to
create the Table.
More refactoring needs to happen to get the Party stuff in line, but
right now that's all a mess since we're still supporting the old-style
party interface for the old drinking puzzle in yohoho.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3525 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-26 02:38:42 +00:00
Michael Bayne 2351316259 Removed unneeded dependence on the sound services.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3524 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-25 21:08:52 +00:00
Michael Bayne 03a1e843c1 Exclude the JME package from the build unless the library is detected.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3523 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-25 00:59:06 +00:00
Andrzej Kapolka b35468910a Added option to disable selection mode without updating offsets (to avoid playing a card more than once) and switched to checking the mouse location every frame in order to activate cards that moved themselves under the mouse cursor.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3522 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-22 21:54:21 +00:00
Ray Greenwell d35b074afd Changed the hourglass to animate a multiframe image for the sand rather
than move a wee dot.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3521 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-22 20:31:18 +00:00
Andrzej Kapolka d065bfde1c Return null for unoccupied positions in the player oid array.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3520 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-22 18:35:05 +00:00
Michael Bayne 84d7d7a611 More slow progress toward a test application that does chat to a Crowd
server. It looks like I'm going to have to write my own user interface
toolkit for JME as nothing exists for any Java-based GL library or engine
and precious few toolkits exist in C++. Yay!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3519 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-21 04:40:12 +00:00
Andrzej Kapolka fc9603fc86 Removed extra duration increase.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3518 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-21 01:33:17 +00:00
Andrzej Kapolka 93a58a719f Increase turn durations when players manage not to time out.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3517 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-21 01:31:08 +00:00
Andrzej Kapolka 5b360afd52 Decrease turn durations after players time out.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3516 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-21 00:47:17 +00:00
Michael Bayne 06899b8b7a Further massaging of the JME base application; started in on a chat client
that will run in happy 3D land.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3515 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-21 00:23:41 +00:00
Michael Bayne b1e8d60d18 More juicy delicious 3D bits.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3514 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-20 23:31:14 +00:00
Michael Bayne 3b36c61046 More JME wirey uppy bits.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3513 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-20 23:09:38 +00:00
Michael Bayne 9d2505c115 Added a simple chat server test framework onto which I will built a
JME-based client.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3512 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-20 22:30:19 +00:00
Michael Bayne 00038b69bf Some cleanups.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3511 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-20 21:48:59 +00:00
Michael Bayne ee144eb974 Created a basic application framework that integrates JME's rendering loop
(in fixed framerate format) with the Presents event queue in what will
hopefully be happy harmony. Also made some edits to the Presents code to
not sound like we assume things run on the AWT thread which we don't and
which is not the case in this framework.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3510 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-20 21:44:03 +00:00
Ray Greenwell 3fded0305b Let's lay ourselves out, if possible, when we're added to the mediapanel,
rather than relying on external initialization.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3509 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-20 17:15:36 +00:00
Ray Greenwell d75c0e83e6 Don't NPE if the turn holder is null somehow.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3508 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-20 03:18:48 +00:00
Andrzej Kapolka 2421eeb696 Moved cleanup code to gameDidEnd.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3507 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-20 01:53:49 +00:00
Andrzej Kapolka 87c169e6ac Added extra methods to support AIs.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3506 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-20 00:27:34 +00:00
Michael Bayne 321671923f Make it possible for the available scene types to be easily augmented.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3505 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-19 20:34:32 +00:00
Andrzej Kapolka ad5be61e28 Use isMoving.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3504 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-19 18:29:14 +00:00
Andrzej Kapolka 1ce83b126d Wrong operator.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3503 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-19 18:26:56 +00:00
Andrzej Kapolka ed670dd4ba Card manipulation tweaks. Don't update the positions of moving cards.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3502 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-19 18:23:59 +00:00
Andrzej Kapolka 024bc8afe1 Added method to handle multiple simultaneous transfers to ensure that cards are always subtracted from the hand before more cards are added.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3501 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-18 22:02:14 +00:00
Andrzej Kapolka 8bb219bfed Moving cards are not selectable; update card offsets when they reach the ends of their paths.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3500 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-18 21:02:20 +00:00
Michael Bayne 967f99b60c Allow the class loader to which we fall back to be configured in an
already created resource manager. Due to the way the Handler stuff is set
up, only the first resource manager ever created in a JVM will be wired up
to handle resource: URLs and thus we have to be careful to only ever
create one resource manager.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3499 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-17 19:57:07 +00:00
Ray Greenwell 3b947af265 Parenthesis population.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3498 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-16 05:26:16 +00:00
Andrzej Kapolka d93c26f158 Fixed NPE in TrickCardGameManagerDelegate, changed comment.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3497 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-16 03:41:08 +00:00
Andrzej Kapolka 4266c72977 Changed TrickCardGameUtil to use more sensible round-the-table ordering. Changed TeamGameConfig to return the actual indices of the team members, so that teammates need not have consecutive indices.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3496 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-16 02:00:57 +00:00
Ray Greenwell 90e3065751 No longer assume that all board summaries are blank at the beginning
of the game- go ahead and initialize them and set them in the game object
when the game starts.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3495 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-15 21:44:36 +00:00
Andrzej Kapolka 6d0648b0b7 Added a pause step before the drop into the hand.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3494 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-15 21:09:45 +00:00
Andrzej Kapolka dcf9c2c9e8 Don't lower card down all the way if it's still selectable.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3493 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-15 03:10:06 +00:00
Michael Bayne 12d1d00e4b We need to be able to veto the rematch.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3492 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-15 02:50:49 +00:00
Michael Bayne b221524071 Formalize the notion of rematching a game so that derived classes can get
involved in the process.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3491 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-15 02:45:20 +00:00
Andrzej Kapolka 35bef9647c Added support for an additional drop step to better show cards received from other players.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3490 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-14 23:39:41 +00:00
Ray Greenwell d6d23b5e2d Yes, it's sufficient, and now it's done too.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3489 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-14 23:20:30 +00:00
Ray Greenwell d5bf33102a Checking the active player should automatically discount unoccupied seats.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3488 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-14 23:05:16 +00:00
Andrzej Kapolka 96133e45e9 Keep track of active card sprite, making sure it keeps being shown as selectable between selection mode switches.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3487 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-14 22:54:28 +00:00