Commit Graph

3475 Commits

Author SHA1 Message Date
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 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
Ray Greenwell ec31df7a99 Removed cruft.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3486 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-14 20:39:56 +00:00
Michael Bayne eda477180f Allow additional game states.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3485 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-14 01:22:38 +00:00
Andrzej Kapolka ffbf3f7082 Added another utility method.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3484 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 22:57:43 +00:00
Michael Bayne 69cd0b41a7 Provide a default green background for games that don't provide an image.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3483 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 21:41:35 +00:00
Michael Bayne 0cd9b75c09 Don't send hands to AI players.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3482 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 21:39:15 +00:00
Andrzej Kapolka 86959a5191 Added updateBounds method to LabelSprite to allow changing the label, added methods to TrickCardGameUtil to get players left/right/opposite, changed the way CardPanel handles selections.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3481 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 21:09:32 +00:00
Ray Greenwell 4c3dd9b1af Dodge the BSD bug with toStringing a channel.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3480 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 19:18:45 +00:00
Michael Bayne 9692c7d221 Moved the main functionality of the score animation into
FloatingTextAnimation which is more sensibly named and in a place where
everyone who wants to use it can do so without creating a pointless
dependency on the puzzle code.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3479 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 19:06:33 +00:00
Michael Bayne 9b3bd6ca3d Moved HourglassView and TimerView into Narya as they are generally useful.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3478 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 19:00:31 +00:00
Ray Greenwell 27e9719c8b Include a spacer to the right of the checkbox so that errant clicks on
that side don't cause the box to toggle.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3477 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 17:07:53 +00:00
Andrzej Kapolka e5442732aa Made a change to prevent cards sticking up after hand readjustment.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3476 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 02:45:32 +00:00
Andrzej Kapolka 743ff2bbbc Clear out played card fields when they shouldn't be displayed.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3475 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 01:42:18 +00:00
Andrzej Kapolka d2b4be178a Moved rematch handling up the hierarchy, made Card constructor public in order to create specific cards for searching, etc.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3474 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 01:15:43 +00:00
Eric Lundberg 259870ee81 Reordered some imports.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3473 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-13 00:35:37 +00:00
Ray Greenwell b80eec3959 Don't let our max queue reporting drift a few ms every minute.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3472 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-12 19:04:39 +00:00
Michael Bayne 09822e45c5 Don't log our channel in the normal case to avoid potentially triggering
what I believe to be a race condition in SocketChannel.toString()
(ultimately sun.nio.ch.Net.localAddress()) on FreeBSD.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3471 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-12 18:09:17 +00:00
Michael Bayne d1a19cc346 Don't report the first time, just set our next report stamp.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3470 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-12 17:46:14 +00:00
Michael Bayne 25b84d1ed6 Allow queue reporting to be activated programmatically. Fixed bug.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3469 542714f4-19e9-0310-aa3c-eee0fc999fb1
2005-04-12 17:40:13 +00:00