Commit Graph

1247 Commits

Author SHA1 Message Date
Michael Bayne ccdacd96d5 Add additional method for getting a character using a special character
sprite derived class.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1250 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 23:06:49 +00:00
Ray Greenwell f687571d0f How did this get away with having the old path for the .dat file?
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1249 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 21:30:56 +00:00
Michael Bayne 06f8a68b56 Moved RandomUtil from media.util to util.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1248 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 18:18:20 +00:00
Michael Bayne 85cdabbbee Added some imports that were needed for javadoc comment resolution that
became necesssary when *Codes were moved out of .client and into .data.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1247 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 18:06:20 +00:00
Michael Bayne 9235848ce6 Javadoc fix.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1246 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 18:05:30 +00:00
Michael Bayne 6f2dd62941 New scrolling interface; fixed up tile ids (whee!).
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1245 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 17:47:05 +00:00
Michael Bayne a88799d4a1 Scroll fiddling! We no longer set a desired x and y velocity directly,
instead we say that we want to scroll by a certain amount in a certain
amount of time. This allows the animated panel (who knows about this
stuff) to figure out when to stop scrolling without overshooting by a
pixel or two.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1244 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 17:46:41 +00:00
Michael Bayne 11251fef90 Formatting.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1243 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 17:45:24 +00:00
Michael Bayne c078f34cef Code and documentation reparations, per Mr. Greenwell.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1242 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 17:13:38 +00:00
Walter Korman db5f42d9b1 assert() -> assertTrue() to reflect new Java reserved word.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1241 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 16:34:36 +00:00
Walter Korman a97e9db978 Moved remaining client.*Codes classes into their respective data packages
as they are intended to represent codes shared between the client and the
server.  Made correspondingly necessary changes throughout.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1240 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 16:28:05 +00:00
Walter Korman f6fedf5bdf Renamed OccupantManager to OccupantDirector.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1239 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 14:38:46 +00:00
Walter Korman a6646a939a Fixed javadoc typo.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1238 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 14:35:31 +00:00
Michael Bayne 0e23a600b2 Clear out the game over flag when the game starts (or resets).
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1237 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-14 02:33:16 +00:00
Michael Bayne 66f3eac2db Modified the ant wrapper scripts to handle being passed -D arguments more
cleanly.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1236 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-14 01:32:21 +00:00
Michael Bayne fd87ec437a Moved game reset processing into main game framework. Also modified game
start processing on the server so that we don't want for the IN_PLAY
attribute change to be processed before calling gameDidStart() because we
don't want to do that when resetting the game (because someone could come
along and end the game in between gameWillStart() and gameDidStart() which
would be annoying and bad), so we need to be consistent and run straight
through both when starting the game for the first time and when resetting
it.

This means that game managers that really need to wait until their events
are processed and do some game start processing at that point will have to
listen for the IN_PLAY transition themselves *and* they'll have to be
aware that someone could have come along and ended the game in between the
call to gameDidStart() and the dispatch of the IN_PLAY event. Sketchy, but
unavoidable.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1235 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-14 00:26:05 +00:00
Walter Korman 5ec2bdcfe0 Use JPasswordField.getPassword() as per deprecation warning.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1234 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-12 16:26:12 +00:00
Michael Bayne 5379787dc5 Made postEvent() public so that external entities can add events (like
message events) to a transaction already started on a particular object.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1233 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-12 00:00:05 +00:00
Michael Bayne 3f1a21f76c To facilitate DSet extensions, we treat any distributed object type that
ends in Set as a DSet. This is not optimal, but writing a full blown
parser so that we can analyze the inheritance hierarchy of the files we're
processing to determine for sure that something extends DSet would be at
least an order of magnitude greater pain in the ass than just doing simple
textual processing. We'll leave that up to future people.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1232 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-11 19:11:07 +00:00
Michael Bayne 462724f82d Log a stack trace per Walter's suggestion.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1231 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-11 01:41:04 +00:00
Michael Bayne 9c59b1c1ad Added simple tool for dumping the serialized component map.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1230 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-11 01:34:09 +00:00
Michael Bayne 37a86781f4 Only save the component map if we changed it.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1229 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-11 01:33:51 +00:00
Michael Bayne 625fc79502 Restructured invocation director so that it can be used in the absence of
a Client instance.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1228 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-10 06:08:59 +00:00
Ray Greenwell 95017c3ebf Changed default base tile to default base tileset.
Clearing a base tile sets it to a random tile from the default tileset.
setBaseTiles() now takes a tileset and fills the rectangular area with
random tiles from that set.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1227 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-09 18:06:37 +00:00
Ray Greenwell 02dd621601 If fringing a rectangular area, you must pass in your own Random object.
If fringing an entire scene, you must pass in a randomization seed.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1226 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-09 18:05:07 +00:00
Ray Greenwell 5cedd42923 optimized getMultiTilePolygon to do less swapping
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1225 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-09 17:02:50 +00:00
Ray Greenwell 595aa68539 we love to comment.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1224 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-09 04:37:38 +00:00
Ray Greenwell b1d7c171f0 added getMultiTilePolygon, which returns a Polygon describing a rectangle
bounding the two specified tiles.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1223 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-09 04:36:06 +00:00
Ray Greenwell dc82aa0a98 We needn't add the first vertex of a polygon again at the end.
Quoth the java.awt.Polygon documentation:
    The first and final pairs of (x, y) points are joined by a line
    segment that closes the polygon.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1222 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-09 03:12:43 +00:00
Ray Greenwell 8adde69e3b make sure we fringe when a base tile is deleted.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1221 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-09 01:58:37 +00:00
Ray Greenwell 94feee3436 Moved the bits -> index reverse lookup from FringeConfiguration to
AutoFringer because our fringe tileset is hardcoded now.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1220 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-08 19:41:52 +00:00
Ray Greenwell 41185335c7 Don't parse the 'tiles' attribute, we decide to just hardcode the tiles
since the autofringer can create any fringe now anyway.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1219 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-08 19:40:04 +00:00
Ray Greenwell 03579fa0ef Oops: our variables were still defined as 'static'.
Changed private to protected.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1218 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-08 18:41:58 +00:00
Michael Bayne 1cf81e9882 Report the config file we're using to configure database connections.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1217 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-08 18:36:42 +00:00
Michael Bayne 03a68efe7c Switched to doing serialization by hand because I got tired of Java's
fucking serialization crapping out when the class was recompiled and its
panties got into a bunch.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1216 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-07 23:15:29 +00:00
Ray Greenwell e3bd4dfcfd configure fringe as part of the tsbundles target.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1215 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 22:18:51 +00:00
Ray Greenwell aac9c7231d ignore the generated fringeconf.dat
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1214 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 22:18:07 +00:00
Ray Greenwell ba8e515b6f added test fringe tilesets
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1213 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 22:17:09 +00:00
Ray Greenwell b69d195665 test fringe configuration
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1212 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 22:14:38 +00:00
Ray Greenwell 601d515df2 If we fail on a lookup of turning fringebits into a fringe index,
try decomposing the bits into contiguous regions and see if we
can't get fringe indexes for those regions.
This makes everything always fringes everywhere.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1211 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 22:07:41 +00:00
Ray Greenwell 0768f82fd9 Use the FringeTile multi-image functionality to allow different base tilesets
to simultaneously fringe upon another base.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1210 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 20:50:30 +00:00
Michael Bayne 341660db3f Not to be undecorated.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1209 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 04:53:05 +00:00
Michael Bayne e2239e292a Reference new ocean tiles.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1208 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 04:52:41 +00:00
Michael Bayne 20e39601c8 Changed AnimatedPanel to a JComponent from a Canvas because we no longer
need to extend the latter.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1207 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 04:49:43 +00:00
Ray Greenwell 79cde8f9eb cleanup
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1206 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 03:52:28 +00:00
Ray Greenwell 30556274df Obsolete. Functionality made more generic and moved to
com.threerings.media.util.ImageUtil.composeMaskedImage()


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1205 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 03:44:41 +00:00
Ray Greenwell 91b7065486 Store images in our mask cache, use the new FringeTile object and
ImageUtil.composeMaskedImage() to create the masked fringe images.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1204 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 03:43:24 +00:00
Ray Greenwell 3474c9c199 FringeTile- a Tile object that may contain multiple images.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1203 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 03:41:58 +00:00
Ray Greenwell d4df933e28 added composeMaskedImage() to composite the alpha from one image and the
RGB from a second.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1202 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 03:41:18 +00:00
Ray Greenwell af777c5ab6 bugfix
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1201 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-06 02:43:34 +00:00