62 Commits

Author SHA1 Message Date
Michael Bayne a8cd8af2f1 [maven-release-plugin] prepare release vilya-1.5 2013-05-07 14:57:59 -07:00
Michael Bayne c89d638d61 Use new Git SCM URL.
Wow, it's been a long time since we did a Vilya release.
2013-05-07 14:55:26 -07:00
Michael Bayne e748203ca4 Cope with nenya's split into nenya/nenya-tools.
I should really split off a vilya-tools from vilya, but I can't be fucked to do
that when I'm already so deep in yak hair that I can't tell whether it's day or
night.
2013-05-07 14:55:26 -07:00
Michael Bayne 597a0fc640 Bump to latest versions of the things. 2013-05-07 14:55:26 -07:00
Mark Johnson bfc5d898b7 - Update the narya version to get the latest guice 2013-02-05 18:00:18 -08:00
Jamie Doornbos 69559df982 Alright, back to SNAPSHOT. oh snap 2012-12-02 09:58:51 -08:00
Jamie Doornbos 86c395414e Deploy actionscript library too
This looks like a bug. Since our bamboo server uses the deploy target for populating the maven
repository, we need to do both libraries there. Alternatively, maybe the build server should use
the install target. (This will overwrite the 1.4.2 jar, but it should be identical).
2012-12-02 09:48:31 -08:00
Jamie Doornbos f578184826 Release 1.4.2 2012-12-02 09:37:53 -08:00
Jamie Doornbos 87798a34d6 Upgrade dependencies so that we only export guava-jdk5 2012-12-02 09:36:46 -08:00
Mark Johnson 731ced4c7a Preparing for 1.5-SNAPSHOT development. 2012-10-16 16:12:35 -07:00
Mark Johnson 7f6e342a6e Preparing for vilya-1.4.1 release. 2012-10-16 16:07:05 -07:00
Ray J. Greenwell c2539c8cb9 Move to depot 1.6. 2012-10-10 11:25:54 -07:00
Ray J. Greenwell 709d0332dc Move to ooo-util 1.3. 2012-10-02 17:11:36 -07:00
Ray J. Greenwell b3226c0bed Match change to narya; allow "playerReady" only. 2012-07-19 11:52:25 -07:00
Ray J. Greenwell e379c289c1 GameManager needs to allow manager calls.
Enabling this to make sure code doesn't break.

Updated to depend on narya 1.13-SNAPSHOT, which I'm pretty sure is bad
joojoo, but maybe that means it's time to pinch off narya 1.13
so that this can depend on a stable version.
2012-07-18 18:21:23 -07:00
Pär Winzell 556297e12d I think this has likely never run... 2012-05-01 12:33:24 -05:00
Michael Bayne a17897704c Don't try to build the ActionScript code if flexsdk.dir (or related) isn't set.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1119 c613c5cb-e716-0410-b11b-feb51c14d237
2012-02-05 17:27:11 +00:00
Michael Bayne 73d9169c0c Use new shipped Narya 1.11.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1118 c613c5cb-e716-0410-b11b-feb51c14d237
2012-02-04 00:22:23 +00:00
Ray Greenwell 9056a2d120 Comment correction correction.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1117 c613c5cb-e716-0410-b11b-feb51c14d237
2012-01-26 00:30:44 +00:00
Ray Greenwell 3174508874 Comment correction.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1116 c613c5cb-e716-0410-b11b-feb51c14d237
2012-01-26 00:29:16 +00:00
Ray Greenwell 28e0e51991 This isn't much of a transaction anymore, since r371.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1115 c613c5cb-e716-0410-b11b-feb51c14d237
2012-01-26 00:28:24 +00:00
Michael Bayne 0f141680e0 Get the latest goods from ooo-util; bump Narya to 1.10; nix redundancies.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1114 c613c5cb-e716-0410-b11b-feb51c14d237
2012-01-11 00:35:55 +00:00
Ray Greenwell 4043dab8d2 Use gauva 11.0.1.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1113 c613c5cb-e716-0410-b11b-feb51c14d237
2012-01-10 21:13:29 +00:00
Ray Greenwell 734822c1c2 Fix deprecation warnings with Interval.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1112 c613c5cb-e716-0410-b11b-feb51c14d237
2012-01-10 21:13:06 +00:00
Charlie Groves 7f78373b78 Use an ooo-ant-actionscript that respects FLEX_HOME
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1111 c613c5cb-e716-0410-b11b-feb51c14d237
2012-01-07 00:45:28 +00:00
Dave Hoover bdb3c17a8f Auld Lang Syne
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1110 c613c5cb-e716-0410-b11b-feb51c14d237
2012-01-03 18:45:42 +00:00
Michael Bayne 595b9e93c3 Updated to ooo-build 2.9, switched to install/deploy targets.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1109 c613c5cb-e716-0410-b11b-feb51c14d237
2011-10-15 16:20:33 +00:00
Michael Bayne d54d0730e2 Bump as-pom to 1.5-SNAPSHOT.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1108 c613c5cb-e716-0410-b11b-feb51c14d237
2011-09-30 03:29:05 +00:00
Michael Bayne d9e4f7ec2f Ship a 1.4 release of the AS artifact.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1107 c613c5cb-e716-0410-b11b-feb51c14d237
2011-09-30 03:25:43 +00:00
Michael Bayne ece35034e8 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1106 c613c5cb-e716-0410-b11b-feb51c14d237
2011-09-30 03:21:31 +00:00
Michael Bayne 5e885e420f [maven-release-plugin] prepare release vilya-1.4
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1104 c613c5cb-e716-0410-b11b-feb51c14d237
2011-09-30 03:21:07 +00:00
Michael Bayne d6c4b07e2f POM cleanups, version bumping, etc.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1103 c613c5cb-e716-0410-b11b-feb51c14d237
2011-09-30 03:18:09 +00:00
Ray Greenwell 0fe0305630 Guava 10.0.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1102 c613c5cb-e716-0410-b11b-feb51c14d237
2011-09-28 22:29:14 +00:00
Charlie Groves e94bae4638 Import ordering
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1101 c613c5cb-e716-0410-b11b-feb51c14d237
2011-08-17 20:05:20 +00:00
Par Winzell 3f2fad7750 Instantiate the MessageAdapter in the constructor rather than as an initializer. The old way compiled fine, but couldn't find sceneUpdated() during runtime. Flash compiler bug?
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1100 c613c5cb-e716-0410-b11b-feb51c14d237
2011-07-14 18:37:29 +00:00
Charlie Groves ea5fee9091 Use location to get absolute paths
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1099 c613c5cb-e716-0410-b11b-feb51c14d237
2011-07-14 18:25:57 +00:00
Charlie Groves 9a4d1b666c Remove and ignore Eclipse files in favor of letting people generate their own using m2eclipse
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1098 c613c5cb-e716-0410-b11b-feb51c14d237
2011-06-27 20:57:23 +00:00
Charlie Groves 12d0a938cf Bump to ooo-build 2.5 since the maven-ant-tasks jar 2.1 uses is no longer available
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1097 c613c5cb-e716-0410-b11b-feb51c14d237
2011-06-24 20:19:06 +00:00
Bruno Garcia 9419a58b87 ArrayUtil --> Arrays.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1096 c613c5cb-e716-0410-b11b-feb51c14d237
2011-06-17 22:17:04 +00:00
Dave Hoover 563ba5ed8b GHFM autolinkifies, but doesn't know to ignore the period.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1095 c613c5cb-e716-0410-b11b-feb51c14d237
2011-05-26 17:31:37 +00:00
Dave Hoover df618d3e0e Samskivert api docs are over at github now
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1094 c613c5cb-e716-0410-b11b-feb51c14d237
2011-05-26 17:31:34 +00:00
Dave Hoover 41ecb334ba We've already got a copy of that kicking around.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1093 c613c5cb-e716-0410-b11b-feb51c14d237
2011-05-26 17:31:30 +00:00
Dave Hoover d905cbef7a That documentation isn't REALLY inherited
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1092 c613c5cb-e716-0410-b11b-feb51c14d237
2011-05-26 17:31:29 +00:00
Dave Hoover ac7d98a29e Speeling
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1091 c613c5cb-e716-0410-b11b-feb51c14d237
2011-05-26 17:31:28 +00:00
Dave Hoover d59010a276 Whitespace
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1090 c613c5cb-e716-0410-b11b-feb51c14d237
2011-05-26 17:31:27 +00:00
Par Winzell be0fa3dd2e Capitalization OCD.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1089 c613c5cb-e716-0410-b11b-feb51c14d237
2011-05-12 15:04:47 +00:00
Andrzej Kapolka 59a3e8bcaf Move the CRC computation to its own method so that we can use it elsewhere.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1088 c613c5cb-e716-0410-b11b-feb51c14d237
2011-05-10 03:46:16 +00:00
Michael Bayne 5750084ad2 Snapshot not needed here.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1087 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-10 19:58:29 +00:00
Michael Bayne 859d35c4f5 Snapshot not needed.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1086 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-10 19:52:47 +00:00
Ray Greenwell 54b90b386c Latest samskivert, guava.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1085 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-10 19:42:28 +00:00
Charlie Groves 46c1af7015 InvocationResponseEvent is no longer used for listeners
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1084 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-07 00:49:35 +00:00
Michael Bayne 7a24f0c30f Reference the public OOO maven repo.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1083 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-06 23:30:23 +00:00
Michael Bayne ad765f002d Add our public OOO Maven repository so that versioned releases of naryalib and
narya-tools can be located by external parties.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1082 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-06 23:21:28 +00:00
Michael Bayne afa7ed0adb Fixed typo.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1081 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-06 22:18:54 +00:00
Michael Bayne b57c4092ea Fixed binary artifacts links.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1080 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-06 22:18:35 +00:00
Michael Bayne 7f339bede3 Further enhancement to the README.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1079 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-06 22:18:22 +00:00
Michael Bayne d272c17b7b Updated various URLs.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1078 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-06 22:18:12 +00:00
Michael Bayne 01071e1ed2 Erm, fix test directory.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1077 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-06 22:17:47 +00:00
Michael Bayne 2a19ae07c8 Markdownified. Updated links.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1076 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-06 22:17:33 +00:00
Michael Bayne e83a57e57a Use the factory methods to create our observer lists.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1075 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-05 21:07:44 +00:00
Michael Bayne 8ed475b322 Back in the snapshot saddle.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1074 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-04 05:29:23 +00:00
Michael Bayne 31ad60b04c [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1073 c613c5cb-e716-0410-b11b-feb51c14d237
2011-04-04 05:24:39 +00:00
487 changed files with 973 additions and 934 deletions
-10
View File
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
-23
View File
@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>vilya</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
-6
View File
@@ -1,6 +0,0 @@
#Thu Dec 09 14:25:50 PST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.5
-8
View File
@@ -1,8 +0,0 @@
#Thu Dec 09 14:25:25 PST 2010
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
skipCompilerPlugin=true
version=1
-59
View File
@@ -1,59 +0,0 @@
The Vilya library
-----------------
The Vilya library provides various facilities for making networked multiplayer
games. Its various packages include:
* whirled - builds on the crowd framework and defines a scene graph with
portals to move between scenes and provides hooks for distributing and
updating scene data (for example isometric rendering information) over
the network
* parlor - builds upon the crowd framework to create the notion of a
game with players and provides tools for making turn based games
* puzzle - builds on the parlor and media frameworks to provide tools
for implementing puzzle games in a networked environment
* micasa - builds on the parlor framework to provide lobbies and
matchmaking for multiplayer games
Documentation is somewhat sparse at the moment, but inspection of the code in
the tests/ directory shows examples of use of many features of the library.
Building
--------
Building the library is very simple. First ensure that the necessary third
party jar files are available in the lib/ directory. See lib/README for a list
of the necessary third party jar files and how to get them.
The library is built using Ant, a modern build tool written in and for Java. If
you aren't already using Ant for other projects, it can be found here:
http://ant.apache.org/
Invoke ant with any of the following targets:
all: builds the distribution files and javadoc documentation
compile: builds only the class files (dist/classes)
javadoc: builds only the javadoc documentation (dist/docs)
dist: builds the distribution jar files (dist/*.jar)
Distribution
------------
The Vilya library is released under the LGPL. The most recent version of the
library is available here:
http://code.google.com/p/vilya
Contributions and Contact Information
-------------------------------------
Vilya is actively developed by the scurvy dogs at Three Rings Design, Inc.
Contributions are welcome.
Questions, comments, contributions, and other worldly endeavors can be
handled in the Google Group for Three Rings libraries:
http://groups.google.com/group/ooo-libs
$Id$
+83
View File
@@ -0,0 +1,83 @@
The Vilya library
=================
The Vilya library provides various facilities for making networked multiplayer
games. Its various packages include:
* [whirled] - builds on the crowd framework and defines a scene graph with
portals to move between scenes and provides hooks for distributing and
updating scene data (for example isometric rendering information) over the
network
* [parlor] - builds upon the crowd framework to create the notion of a game with
players and provides tools for making turn based games
* [puzzle] - builds on the parlor and media frameworks to provide tools for
implementing puzzle games in a networked environment
* [micasa] - builds on the parlor framework to provide lobbies and matchmaking
for multiplayer games
[Javadoc documentation](http://threerings.github.com/vilya/apidocs/) is provided.
Tutorial-style documentation is somewhat sparse at the moment, but inspection
of the code in the `src/test/java/` directory shows examples of use of many
features of the library.
Building
--------
The library is built using [Ant](http://ant.apache.org/).
Invoke ant with any of the following targets:
all: builds the distribution files and javadoc documentation
compile: builds only the class files (dist/classes)
javadoc: builds only the javadoc documentation (dist/docs)
dist: builds the distribution jar files (dist/*.jar)
Artifacts
---------
A Maven repository containing released versions of the Vilya Java and
ActionScript artifacts are maintained here. To add a Vilya dependency to a
Maven project, add the following to your `pom.xml`:
<repositories>
<repository>
<id>ooo-repo</id>
<url>http://threerings.github.com/maven-repo</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>vilya</artifactId>
<version>1.3</version>
</dependency>
</dependencies>
To add it to an Ivy, SBT, or other Maven repository using project, simply
remove the vast majority of the boilerplate above.
If you prefer to download pre-built binaries, those can be had here:
* [vilya-1.3.jar](http://threerings.github.com/maven-repo/com/threerings/vilya/1.3/vilya-1.3.jar)
* [vilyalib-1.3.swc](http://threerings.github.com/maven-repo/com/threerings/vilyalib/1.3/vilyalib-1.3.swc)
Distribution
------------
The Vilya library is released under the LGPL. The most recent version of the
library is available at http://github.com/threerings/vilya
Contact
-------
Questions, comments, and other worldly endeavors can be handled via the [Three
Rings Libraries](http://groups.google.com/group/ooo-libs) Google Group.
Vilya is actively developed by the scurvy dogs at
[Three Rings](http://www.threerings.net) Contributions are welcome.
[whirled]: http://threerings.github.com/vilya/apidocs/com/threerings/whirled/package-summary.html
[parlor]: http://threerings.github.com/vilya/apidocs/com/threerings/parlor/package-summary.html
[puzzle]: http://threerings.github.com/vilya/apidocs/com/threerings/puzzle/package-summary.html
[micasa]: http://threerings.github.com/vilya/apidocs/com/threerings/micasa/package-summary.html
+36 -15
View File
@@ -1,13 +1,13 @@
<?xml version="1.0" standalone="yes"?> <?xml version="1.0" standalone="yes"?>
<project name="vilya" default="compile" basedir="." xmlns:artifact="urn:maven-artifact-ant"> <project name="vilya" default="compile" basedir="." xmlns:artifact="urn:maven-artifact-ant">
<property name="deploy.dir" value="dist"/> <property name="deploy.dir" location="dist"/>
<property name="src.dir" value="src/main/java"/> <property name="src.dir" location="src/main/java"/>
<property name="asrc.dir" value="src/main/as"/> <property name="asrc.dir" location="src/main/as"/>
<property name="tsrc.dir" value="src/test/java"/> <property name="tsrc.dir" location="src/test/java"/>
<property name="classes.dir" value="${deploy.dir}/classes"/> <property name="classes.dir" location="${deploy.dir}/classes"/>
<property name="tclasses.dir" value="${deploy.dir}/test-classes"/> <property name="tclasses.dir" location="${deploy.dir}/test-classes"/>
<property name="ooo-build.vers" value="2.1"/> <property name="ooo-build.vers" value="2.9"/>
<ant antfile="etc/bootstrap.xml"/> <ant antfile="etc/bootstrap.xml"/>
<import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/> <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
@@ -27,9 +27,19 @@
</path> </path>
</target> </target>
<target name="-prepare-as" depends="-prepare">
<maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.4"/>
<checkflex/> <!-- if flexsdk.dir is not already set, tries to infer it -->
<if><not><isset property="flexsdk.dir"/></not><then>
<echo>***</echo>
<echo>Not compiling Nenya ActionScript library. Set flexsdk.dir to enable.</echo>
<echo>***</echo>
</then></if>
</target>
<target name="-preptools" depends="-prepare"> <target name="-preptools" depends="-prepare">
<artifact:dependencies pathId="tools.classpath"> <artifact:dependencies pathId="tools.classpath">
<dependency groupId="com.threerings" artifactId="narya-tools" version="1.8-SNAPSHOT"/> <dependency groupId="com.threerings" artifactId="narya-tools" version="1.11"/>
</artifact:dependencies> </artifact:dependencies>
<taskdef resource="com/threerings/presents/tools.properties" classpathref="tools.classpath"/> <taskdef resource="com/threerings/presents/tools.properties" classpathref="tools.classpath"/>
</target> </target>
@@ -70,8 +80,9 @@
</instream> </instream>
</target> </target>
<target name="aslib" depends="-prepare" description="Builds the ActionScript code"> <target name="aslib" depends="-prepare-as" if="flexsdk.dir"
<maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.0"/> description="Builds the ActionScript code">
<maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.4"/>
<compc srcdir="${asrc.dir}" libpath="${aslib.path}" <compc srcdir="${asrc.dir}" libpath="${aslib.path}"
dest="${deploy.dir}/${ant.project.name}lib.swc"/> dest="${deploy.dir}/${ant.project.name}lib.swc"/>
</target> </target>
@@ -94,7 +105,7 @@
<target name="asdoc" unless="no_build_aslib" depends="-prepare" <target name="asdoc" unless="no_build_aslib" depends="-prepare"
description="Builds the ActionScript documention"> description="Builds the ActionScript documention">
<maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.0"/> <maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.4"/>
<mkdir dir="${deploy.dir}/asdocs"/> <mkdir dir="${deploy.dir}/asdocs"/>
<asdoc srcdir="${asrc.dir}" libpath="${aslib.path}" destdir="${deploy.dir}/asdocs"/> <asdoc srcdir="${asrc.dir}" libpath="${aslib.path}" destdir="${deploy.dir}/asdocs"/>
</target> </target>
@@ -235,10 +246,20 @@
</genascript> </genascript>
</target> </target>
<target name="maven-deploy" depends="dist,aslib" <target name="-as-install" depends="aslib" if="flexsdk.dir">
description="Deploys our build artifacts to a Maven repository."> <maveninstall file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
<jar basedir="${src.dir}" destfile="${deploy.dir}/${ant.project.name}-sources.jar"/> </target>
<mavendeploy file="${deploy.dir}/${ant.project.name}.jar" srcdir="${src.dir}" pom="pom.xml"/> <target name="install" depends="dist,-as-install"
description="Installs artifacts to local Maven repository.">
<maveninstall file="${deploy.dir}/${ant.project.name}.jar" pom="pom.xml"/>
</target>
<target name="-as-deploy" depends="aslib" if="flexsdk.dir">
<mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/> <mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
</target> </target>
<target name="deploy" depends="dist,-as-deploy,tests,javadoc"
description="Deploys our build artifacts to a Maven repository.">
<mavendeploy file="${deploy.dir}/${ant.project.name}.jar" pom="pom.xml"
srcdir="${src.dir}" docdir="${deploy.dir}/docs"/>
</target>
</project> </project>
+12 -21
View File
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
<artifactId>vilyalib</artifactId> <artifactId>vilyalib</artifactId>
<packaging>swc</packaging> <packaging>swc</packaging>
<version>1.3</version> <version>1.5-SNAPSHOT</version>
<name>vilya</name>
<name>Vilya for ActionScript</name>
<description>Facilities for making networked multiplayer games.</description> <description>Facilities for making networked multiplayer games.</description>
<url>http://code.google.com/p/vilya/</url> <url>http://code.google.com/p/vilya/</url>
<issueManagement> <issueManagement>
@@ -26,30 +27,20 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
<artifactId>aspirin</artifactId> <artifactId>naryalib</artifactId>
<version>1.6</version> <version>1.12.7</version>
<scope>compile</scope> <type>swc</type>
</dependency>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>nenyalib</artifactId>
<version>1.4.2</version>
<type>swc</type> <type>swc</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>as3isolib</groupId> <groupId>as3isolib</groupId>
<artifactId>as3isolib-fp9</artifactId> <artifactId>as3isolib-fp9</artifactId>
<version>r298</version> <version>r298</version>
<scope>compile</scope>
<type>swc</type>
</dependency>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>naryalib</artifactId>
<version>1.8</version>
<scope>compile</scope>
<type>swc</type>
</dependency>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>nenyalib</artifactId>
<version>1.2</version>
<scope>compile</scope>
<type>swc</type> <type>swc</type>
</dependency> </dependency>
</dependencies> </dependencies>
+1 -1
View File
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
+72 -50
View File
@@ -1,23 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.threerings</groupId>
<artifactId>vilya</artifactId>
<packaging>jar</packaging>
<version>1.3</version>
<name>vilya</name>
<description>Facilities for making networked multiplayer games.</description>
<url>http://code.google.com/p/vilya/</url>
<issueManagement>
<url>http://code.google.com/p/vilya/issues/list</url>
</issueManagement>
<parent> <parent>
<groupId>org.sonatype.oss</groupId> <groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId> <artifactId>oss-parent</artifactId>
<version>5</version> <version>7</version>
</parent> </parent>
<groupId>com.threerings</groupId>
<artifactId>vilya</artifactId>
<packaging>jar</packaging>
<version>1.5</version>
<name>Vilya</name>
<description>Facilities for making networked multiplayer games.</description>
<url>http://github.com/threerings/vilya/</url>
<issueManagement>
<url>http://github.com/threerings/vilya/issues</url>
</issueManagement>
<licenses> <licenses>
<license> <license>
<name>GNU Lesser General Public License (LGPL), Version 2.1</name> <name>GNU Lesser General Public License (LGPL), Version 2.1</name>
@@ -35,85 +36,77 @@
</developers> </developers>
<scm> <scm>
<connection>scm:svn:http://vilya.googlecode.com/svn/tags/vilya-1.3</connection> <connection>scm:git:git://github.com/threerings/vilya.git</connection>
<developerConnection>scm:svn:svn+ssh://src.earth.threerings.net/vilya/tags/vilya-1.3</developerConnection> <developerConnection>scm:git:git@github.com:threerings/vilya.git</developerConnection>
<url>http://vilya.googlecode.com/svn/tags/vilya-1.3</url> <url>http://github.com/threerings/vilya/</url>
</scm> </scm>
<repositories>
<repository>
<id>ooo-repo</id>
<url>http://threerings.github.com/maven-repo</url>
</repository>
</repositories>
<dependencies> <dependencies>
<!-- exported dependencies -->
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.threerings</groupId>
<artifactId>guava</artifactId> <artifactId>ooo-util</artifactId>
<version>r07</version> <version>1.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.samskivert</groupId>
<artifactId>samskivert</artifactId>
<version>1.3</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
<artifactId>narya</artifactId> <artifactId>narya</artifactId>
<version>1.8</version> <version>1.14</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
<artifactId>nenya</artifactId> <artifactId>nenya</artifactId>
<version>1.2</version> <version>1.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency> </dependency>
<!-- optional dependencies -->
<dependency>
<groupId>com.threerings</groupId>
<artifactId>nenya-tools</artifactId>
<version>1.5</version>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>commons-digester</groupId> <groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId> <artifactId>commons-digester</artifactId>
<version>2.0</version> <version>2.0</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.samskivert</groupId> <groupId>com.samskivert</groupId>
<artifactId>depot</artifactId> <artifactId>depot</artifactId>
<version>1.2</version> <version>1.6.1</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javassist</groupId> <groupId>javassist</groupId>
<artifactId>javassist</artifactId> <artifactId>javassist</artifactId>
<version>3.8.0.GA</version> <version>3.8.0.GA</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.megginson.sax</groupId> <groupId>com.megginson.sax</groupId>
<artifactId>xml-writer</artifactId> <artifactId>xml-writer</artifactId>
<version>0.2</version> <version>0.2</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!-- test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.8.1</version> <version>4.10</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@@ -146,11 +139,10 @@
<quiet>true</quiet> <quiet>true</quiet>
<show>public</show> <show>public</show>
<links> <links>
<link>http://samskivert.googlecode.com/svn/apidocs/</link> <link>http://samskivert.github.com/samskivert/apidocs/</link>
<link>http://depot.googlecode.com/svn/apidocs/</link> <link>http://depot.googlecode.com/svn/apidocs/</link>
<link>http://guava-libraries.googlecode.com/svn/trunk/javadoc/</link> <link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
<link>http://google-web-toolkit.googlecode.com/svn/javadoc/2.1/</link> <link>http://google-web-toolkit.googlecode.com/svn/javadoc/2.1/</link>
<link>http://evgeny-goldin.org/ant/api/</link>
</links> </links>
</configuration> </configuration>
</plugin> </plugin>
@@ -183,6 +175,36 @@
<version>2.5</version> <version>2.5</version>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement>
<plugins>
<plugin>
<!-- Tell m2eclipse to ignore the enforcer plugin from our parent. Otherwise it warns
about not being able to run it. -->
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
<goal>enforce</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build> </build>
<profiles> <profiles>
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -27,8 +27,6 @@ import com.threerings.io.ObjectOutputStream;
import com.threerings.util.Byte; import com.threerings.util.Byte;
import com.threerings.util.Comparable; import com.threerings.util.Comparable;
import com.threerings.util.Hashable; import com.threerings.util.Hashable;
import com.threerings.util.Integer;
import com.threerings.util.Joiner;
import com.threerings.presents.dobj.DSet; import com.threerings.presents.dobj.DSet;
import com.threerings.presents.dobj.DSet_Entry; import com.threerings.presents.dobj.DSet_Entry;
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
package com.threerings.parlor.card.data { package com.threerings.parlor.card.data {
import com.threerings.util.ArrayUtil; import com.threerings.util.Arrays;
import com.threerings.util.StreamableArrayList; import com.threerings.util.StreamableArrayList;
/** /**
@@ -101,7 +101,7 @@ public class Deck extends StreamableArrayList
*/ */
public function shuffle () :void public function shuffle () :void
{ {
ArrayUtil.shuffle(_array); Arrays.shuffle(_array);
} }
} }
} }
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -22,10 +22,11 @@
package com.threerings.parlor.card.trick.client { package com.threerings.parlor.card.trick.client {
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.parlor.card.data.Card;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.InvocationService;
import com.threerings.parlor.card.data.Card;
/** /**
* An ActionScript version of the Java TrickCardGameService interface. * An ActionScript version of the Java TrickCardGameService interface.
*/ */
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -22,11 +22,13 @@
package com.threerings.parlor.card.trick.data { package com.threerings.parlor.card.trick.data {
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.util.Integer;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.data.Card;
import com.threerings.parlor.card.trick.client.TrickCardGameService; import com.threerings.parlor.card.trick.client.TrickCardGameService;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.util.Integer;
/** /**
* Provides the implementation of the <code>TrickCardGameService</code> interface * Provides the implementation of the <code>TrickCardGameService</code> interface
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,19 +21,13 @@
package com.threerings.parlor.client { package com.threerings.parlor.client {
import mx.containers.Grid;
import mx.controls.CheckBox; import mx.controls.CheckBox;
import mx.controls.ComboBox; import mx.controls.ComboBox;
import mx.controls.Label; import mx.controls.Label;
import com.threerings.flex.GridUtil;
import com.threerings.parlor.data.RangeParameter; import com.threerings.parlor.data.RangeParameter;
import com.threerings.parlor.data.TableConfig; import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.data.ToggleParameter; import com.threerings.parlor.data.ToggleParameter;
import com.threerings.parlor.util.ParlorContext;
import com.threerings.parlor.game.client.FlexGameConfigurator; import com.threerings.parlor.game.client.FlexGameConfigurator;
import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.game.data.GameConfig;
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,10 +21,12 @@
package com.threerings.parlor.client { package com.threerings.parlor.client {
import com.threerings.util.Name;
import com.threerings.presents.client.InvocationDecoder;
import com.threerings.parlor.client.ParlorReceiver; import com.threerings.parlor.client.ParlorReceiver;
import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.InvocationDecoder;
import com.threerings.util.Name;
/** /**
* Dispatches calls to a {@link ParlorReceiver} instance. * Dispatches calls to a {@link ParlorReceiver} instance.
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,10 +21,10 @@
package com.threerings.parlor.client { package com.threerings.parlor.client {
import com.threerings.util.ArrayUtil; import com.threerings.util.Arrays;
import com.threerings.util.Log;
import com.threerings.util.Map; import com.threerings.util.Map;
import com.threerings.util.Maps; import com.threerings.util.Maps;
import com.threerings.util.Log;
import com.threerings.util.Name; import com.threerings.util.Name;
import com.threerings.presents.client.BasicDirector; import com.threerings.presents.client.BasicDirector;
@@ -93,7 +93,7 @@ public class ParlorDirector extends BasicDirector
*/ */
public function removeGameReadyObserver (observer :GameReadyObserver) :void public function removeGameReadyObserver (observer :GameReadyObserver) :void
{ {
ArrayUtil.removeFirst(_grobs, observer); Arrays.removeFirst(_grobs, observer);
} }
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,12 +21,13 @@
package com.threerings.parlor.client { package com.threerings.parlor.client {
import com.threerings.parlor.game.data.GameConfig; import com.threerings.util.Name;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.InvocationService;
import com.threerings.presents.client.InvocationService_ConfirmListener; import com.threerings.presents.client.InvocationService_ConfirmListener;
import com.threerings.presents.client.InvocationService_InvocationListener; import com.threerings.presents.client.InvocationService_InvocationListener;
import com.threerings.util.Name;
import com.threerings.parlor.game.data.GameConfig;
/** /**
* An ActionScript version of the Java ParlorService interface. * An ActionScript version of the Java ParlorService interface.
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,11 +21,9 @@
package com.threerings.parlor.client { package com.threerings.parlor.client {
import com.threerings.parlor.util.ParlorContext;
import com.threerings.parlor.data.TableConfig; import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.client.GameConfigurator; import com.threerings.parlor.game.client.GameConfigurator;
import com.threerings.parlor.util.ParlorContext;
/** /**
* This should be implemented some user-interface element that allows * This should be implemented some user-interface element that allows
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
package com.threerings.parlor.client { package com.threerings.parlor.client {
import com.threerings.util.ArrayUtil; import com.threerings.util.Arrays;
import com.threerings.util.Log; import com.threerings.util.Log;
import com.threerings.util.Name; import com.threerings.util.Name;
import com.threerings.util.ObserverList; import com.threerings.util.ObserverList;
@@ -31,7 +31,6 @@ import com.threerings.presents.client.BasicDirector;
import com.threerings.presents.client.Client; import com.threerings.presents.client.Client;
import com.threerings.presents.client.ClientEvent; import com.threerings.presents.client.ClientEvent;
import com.threerings.presents.client.InvocationService_ResultListener; import com.threerings.presents.client.InvocationService_ResultListener;
import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.EntryAddedEvent; import com.threerings.presents.dobj.EntryAddedEvent;
import com.threerings.presents.dobj.EntryRemovedEvent; import com.threerings.presents.dobj.EntryRemovedEvent;
@@ -39,7 +38,6 @@ import com.threerings.presents.dobj.EntryUpdatedEvent;
import com.threerings.presents.dobj.SetListener; import com.threerings.presents.dobj.SetListener;
import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.parlor.data.Table; import com.threerings.parlor.data.Table;
import com.threerings.parlor.data.TableConfig; import com.threerings.parlor.data.TableConfig;
@@ -376,7 +374,7 @@ public class TableDirector extends BasicDirector
// look for our username in the players array // look for our username in the players array
var self :BodyObject = (_pctx.getClient().getClientObject() as BodyObject); var self :BodyObject = (_pctx.getClient().getClientObject() as BodyObject);
if (ArrayUtil.contains(table.players, self.getVisibleName())) { if (Arrays.contains(table.players, self.getVisibleName())) {
_ourTable = table; _ourTable = table;
} }
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,13 +21,14 @@
package com.threerings.parlor.client { package com.threerings.parlor.client {
import com.threerings.parlor.data.TableConfig; import com.threerings.util.Name;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.InvocationService;
import com.threerings.presents.client.InvocationService_InvocationListener; import com.threerings.presents.client.InvocationService_InvocationListener;
import com.threerings.presents.client.InvocationService_ResultListener; import com.threerings.presents.client.InvocationService_ResultListener;
import com.threerings.util.Name;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.data.GameConfig;
/** /**
* An ActionScript version of the Java TableService interface. * An ActionScript version of the Java TableService interface.
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,17 +21,18 @@
package com.threerings.parlor.data { package com.threerings.parlor.data {
import com.threerings.parlor.client.ParlorService; import com.threerings.util.Integer;
import com.threerings.parlor.client.ParlorService_InviteListener; import com.threerings.util.Name;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService_ConfirmListener; import com.threerings.presents.client.InvocationService_ConfirmListener;
import com.threerings.presents.client.InvocationService_InvocationListener; import com.threerings.presents.client.InvocationService_InvocationListener;
import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller; import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
import com.threerings.util.Integer;
import com.threerings.util.Name; import com.threerings.parlor.client.ParlorService;
import com.threerings.parlor.client.ParlorService_InviteListener;
import com.threerings.parlor.game.data.GameConfig;
/** /**
* Provides the implementation of the <code>ParlorService</code> interface * Provides the implementation of the <code>ParlorService</code> interface
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,9 +21,10 @@
package com.threerings.parlor.data { package com.threerings.parlor.data {
import com.threerings.parlor.client.ParlorService_InviteListener;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
import com.threerings.parlor.client.ParlorService_InviteListener;
/** /**
* Marshalls instances of the ParlorService_InviteMarshaller interface. * Marshalls instances of the ParlorService_InviteMarshaller interface.
*/ */
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,21 +21,18 @@
package com.threerings.parlor.data { package com.threerings.parlor.data {
import com.threerings.util.ArrayUtil;
import com.threerings.util.ClassUtil;
import com.threerings.util.Hashable;
import com.threerings.util.Joiner;
import com.threerings.util.Name;
import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream; import com.threerings.io.ObjectOutputStream;
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.util.Arrays;
import com.threerings.util.Hashable;
import com.threerings.util.Joiner;
import com.threerings.util.Name;
import com.threerings.presents.dobj.DSet; import com.threerings.presents.dobj.DSet;
import com.threerings.presents.dobj.DSet_Entry; import com.threerings.presents.dobj.DSet_Entry;
import com.threerings.crowd.data.BodyObject;
import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.game.data.GameConfig;
/** /**
@@ -133,7 +130,7 @@ public class Table
for (var jj :int = 0; jj < subTeams.length; jj++) { for (var jj :int = 0; jj < subTeams.length; jj++) {
var occ :Name = (players[(subTeams[jj] as int)] as Name); var occ :Name = (players[(subTeams[jj] as int)] as Name);
if (occ != null) { if (occ != null) {
newSubTeams.push(ArrayUtil.indexOf(players, occ)); newSubTeams.push(Arrays.indexOf(players, occ));
} }
} }
newSubTeams.sort(null, Array.NUMERIC); newSubTeams.sort(null, Array.NUMERIC);
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,16 +21,17 @@
package com.threerings.parlor.data { package com.threerings.parlor.data {
import com.threerings.parlor.client.TableService; import com.threerings.util.Integer;
import com.threerings.parlor.game.data.GameConfig; import com.threerings.util.Name;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService_InvocationListener; import com.threerings.presents.client.InvocationService_InvocationListener;
import com.threerings.presents.client.InvocationService_ResultListener; import com.threerings.presents.client.InvocationService_ResultListener;
import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
import com.threerings.presents.data.InvocationMarshaller_ResultMarshaller; import com.threerings.presents.data.InvocationMarshaller_ResultMarshaller;
import com.threerings.util.Integer;
import com.threerings.util.Name; import com.threerings.parlor.client.TableService;
import com.threerings.parlor.game.data.GameConfig;
/** /**
* Provides the implementation of the <code>TableService</code> interface * Provides the implementation of the <code>TableService</code> interface
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,17 +21,15 @@
package com.threerings.parlor.game.client { package com.threerings.parlor.game.client {
import mx.core.Container;
import mx.core.UIComponent;
import mx.containers.Grid; import mx.containers.Grid;
import mx.containers.GridItem; import mx.containers.GridItem;
import mx.containers.GridRow; import mx.containers.GridRow;
import mx.core.Container;
import com.threerings.flex.GridUtil; import mx.core.UIComponent;
import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.game.data.GameConfig;
import com.threerings.parlor.util.ParlorContext;
import com.threerings.flex.GridUtil;
/** /**
* Provides the base from which interfaces can be built to configure games prior to starting them. * Provides the base from which interfaces can be built to configure games prior to starting them.
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,16 +21,16 @@
package com.threerings.parlor.game.data { package com.threerings.parlor.game.data {
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.io.TypedArray;
import com.threerings.util.ClassUtil; import com.threerings.util.ClassUtil;
import com.threerings.util.Cloneable; import com.threerings.util.Cloneable;
import com.threerings.util.Hashable; import com.threerings.util.Hashable;
import com.threerings.util.Name; import com.threerings.util.Name;
import com.threerings.util.StringUtil; import com.threerings.util.StringUtil;
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.io.TypedArray;
import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceConfig;
import com.threerings.parlor.client.TableConfigurator; import com.threerings.parlor.client.TableConfigurator;
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,16 +21,16 @@
package com.threerings.parlor.game.data { package com.threerings.parlor.game.data {
import com.threerings.util.ArrayUtil;
import com.threerings.util.Integer;
import com.threerings.util.Joiner;
import com.threerings.util.langBoolean;
import com.threerings.util.Name;
import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream; import com.threerings.io.ObjectOutputStream;
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.util.Arrays;
import com.threerings.util.Integer;
import com.threerings.util.Joiner;
import com.threerings.util.Name;
import com.threerings.util.langBoolean;
import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.data.PlaceObject;
/** /**
@@ -157,7 +157,7 @@ public class GameObject extends PlaceObject
*/ */
public function getPlayerIndex (username :Name) :int public function getPlayerIndex (username :Name) :int
{ {
return ArrayUtil.indexOf(players, username); return Arrays.indexOf(players, username);
} }
/** /**
@@ -218,7 +218,7 @@ public class GameObject extends PlaceObject
*/ */
public function getWinnerIndex () :int public function getWinnerIndex () :int
{ {
return ArrayUtil.indexOf(winners, true); return Arrays.indexOf(winners, true);
} }
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@ package com.threerings.parlor.turn.client {
import com.threerings.util.Name; import com.threerings.util.Name;
import com.threerings.presents.dobj.AttributeChangedEvent;
import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangeListener;
import com.threerings.presents.dobj.AttributeChangedEvent;
import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceConfig;
@@ -34,7 +34,6 @@ import com.threerings.crowd.util.CrowdContext;
import com.threerings.parlor.game.client.GameController; import com.threerings.parlor.game.client.GameController;
import com.threerings.parlor.game.client.GameControllerDelegate; import com.threerings.parlor.game.client.GameControllerDelegate;
import com.threerings.parlor.game.data.GameObject; import com.threerings.parlor.game.data.GameObject;
import com.threerings.parlor.turn.data.TurnGameObject; import com.threerings.parlor.turn.data.TurnGameObject;
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
package com.threerings.parlor.util { package com.threerings.parlor.util {
import com.threerings.crowd.util.CrowdContext; import com.threerings.crowd.util.CrowdContext;
import com.threerings.parlor.client.ParlorDirector; import com.threerings.parlor.client.ParlorDirector;
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -24,19 +24,20 @@ package com.threerings.stage.client {
import flash.display.DisplayObject; import flash.display.DisplayObject;
import flash.display.Sprite; import flash.display.Sprite;
import com.threerings.cast.CharacterSprite; import as3isolib.display.IsoSprite;
import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionCodes;
import com.threerings.media.Tickable;
import com.threerings.media.util.Path; import com.threerings.media.util.Path;
import com.threerings.media.util.Pathable; import com.threerings.media.util.Pathable;
import com.threerings.cast.CharacterSprite;
import com.threerings.miso.client.PriorityIsoDisplayObject; import com.threerings.miso.client.PriorityIsoDisplayObject;
import com.threerings.miso.util.MisoSceneMetrics; import com.threerings.miso.util.MisoSceneMetrics;
import com.threerings.miso.util.MisoUtil; import com.threerings.miso.util.MisoUtil;
import com.threerings.stage.data.StageLocation;
import as3isolib.display.IsoSprite; import com.threerings.stage.data.StageLocation;
import as3isolib.display.scene.IsoScene;
import as3isolib.graphics.SolidColorFill;
public class CharacterIsoSprite extends IsoSprite public class CharacterIsoSprite extends IsoSprite
implements Pathable, PriorityIsoDisplayObject implements Pathable, PriorityIsoDisplayObject
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,48 +21,47 @@
package com.threerings.stage.client { package com.threerings.stage.client {
import flash.display.DisplayObject;
import flash.geom.Point;
import flash.geom.Rectangle;
import flash.events.Event; import flash.events.Event;
import flash.events.MouseEvent; import flash.events.MouseEvent;
import flash.geom.Point;
import com.threerings.cast.CharacterSprite; import as3isolib.geom.Pt;
import com.threerings.crowd.client.OccupantObserver;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.media.Tickable;
import com.threerings.media.util.LineSegmentPath;
import com.threerings.media.util.Path;
import com.threerings.util.Controller; import com.threerings.util.Controller;
import com.threerings.util.Integer;
import com.threerings.util.Iterator; import com.threerings.util.Iterator;
import com.threerings.util.Log; import com.threerings.util.Log;
import com.threerings.util.Map; import com.threerings.util.Map;
import com.threerings.util.Maps; import com.threerings.util.Maps;
import com.threerings.util.MathUtil; import com.threerings.util.MathUtil;
import com.threerings.util.StringUtil; import com.threerings.util.StringUtil;
import com.threerings.presents.dobj.EntryUpdatedEvent;
import com.threerings.presents.dobj.SetAdapter;
import com.threerings.presents.dobj.SetListener;
import com.threerings.crowd.client.OccupantObserver;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.media.Tickable;
import com.threerings.media.util.LineSegmentPath;
import com.threerings.media.util.Path;
import com.threerings.cast.CharacterSprite;
import com.threerings.miso.util.MisoSceneMetrics;
import com.threerings.miso.util.MisoUtil;
import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.spot.data.Location;
import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.data.Portal;
import com.threerings.whirled.spot.data.SceneLocation; import com.threerings.whirled.spot.data.SceneLocation;
import com.threerings.whirled.spot.data.SpotCodes; import com.threerings.whirled.spot.data.SpotCodes;
import com.threerings.whirled.spot.data.SpotSceneObject; import com.threerings.whirled.spot.data.SpotSceneObject;
import com.threerings.whirled.util.WhirledContext;
import com.threerings.stage.data.StageSceneObject;
import com.threerings.stage.data.StageLocation; import com.threerings.stage.data.StageLocation;
import com.threerings.stage.data.StageSceneObject;
import com.threerings.stage.util.StageContext; import com.threerings.stage.util.StageContext;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.presents.dobj.EntryUpdatedEvent;
import com.threerings.presents.dobj.SetAdapter;
import com.threerings.presents.dobj.SetListener;
import com.threerings.miso.util.MisoSceneMetrics;
import com.threerings.miso.util.MisoUtil;
import as3isolib.geom.Pt;
public class CrowdStageScenePanel extends StageScenePanel public class CrowdStageScenePanel extends StageScenePanel
implements OccupantObserver, Tickable implements OccupantObserver, Tickable
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -22,14 +22,13 @@
package com.threerings.stage.client { package com.threerings.stage.client {
import flash.display.Bitmap; import flash.display.Bitmap;
import flash.display.BitmapData;
import flash.display.DisplayObject; import flash.display.DisplayObject;
import flash.geom.Point; import flash.geom.Point;
import as3isolib.display.IsoSprite; import as3isolib.display.IsoSprite;
import com.threerings.miso.client.PriorityIsoDisplayObject; import com.threerings.miso.client.PriorityIsoDisplayObject;
import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.data.Portal;
public class PortalIsoSprite extends IsoSprite public class PortalIsoSprite extends IsoSprite
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,16 +21,19 @@
package com.threerings.stage.client { package com.threerings.stage.client {
import com.threerings.util.Log;
import com.threerings.util.Map;
import com.threerings.util.Maps;
import com.threerings.media.image.ClassRecord; import com.threerings.media.image.ClassRecord;
import com.threerings.media.image.ColorPository; import com.threerings.media.image.ColorPository;
import com.threerings.media.image.ColorRecord; import com.threerings.media.image.ColorRecord;
import com.threerings.media.image.Colorization; import com.threerings.media.image.Colorization;
import com.threerings.stage.data.StageScene;
import com.threerings.miso.data.ObjectInfo;
import com.threerings.media.tile.Colorizer; import com.threerings.media.tile.Colorizer;
import com.threerings.util.Log;
import com.threerings.util.Maps; import com.threerings.miso.data.ObjectInfo;
import com.threerings.util.Map;
import com.threerings.stage.data.StageScene;
/** /**
* Handles colorization of object tiles in a scene. * Handles colorization of object tiles in a scene.
@@ -135,10 +138,12 @@ public class SceneColorizer implements Colorizer
} }
} }
import com.threerings.media.image.Colorization;
import com.threerings.media.image.ColorPository; import com.threerings.media.image.ColorPository;
import com.threerings.media.image.Colorization;
import com.threerings.media.tile.Colorizer; import com.threerings.media.tile.Colorizer;
import com.threerings.miso.data.ObjectInfo; import com.threerings.miso.data.ObjectInfo;
import com.threerings.stage.client.SceneColorizer; import com.threerings.stage.client.SceneColorizer;
class BaseColorizer implements Colorizer { class BaseColorizer implements Colorizer {
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -23,23 +23,24 @@ package com.threerings.stage.client {
import flash.display.DisplayObject; import flash.display.DisplayObject;
import com.threerings.miso.client.MisoScenePanel;
import com.threerings.miso.util.MisoContext;
import com.threerings.miso.util.MisoSceneMetrics;
import com.threerings.miso.util.MisoUtil;
import com.threerings.miso.client.SceneBlock;
import com.threerings.miso.data.MisoSceneModel;
import com.threerings.util.Iterator;
import com.threerings.util.MathUtil;
import com.threerings.whirled.spot.data.Portal;
import com.threerings.whirled.spot.data.SpotScene;
import com.threerings.whirled.spot.data.SpotSceneModel;
import com.threerings.stage.data.StageLocation;
import as3isolib.display.IsoSprite; import as3isolib.display.IsoSprite;
import as3isolib.display.IsoView; import as3isolib.display.IsoView;
import as3isolib.display.scene.IsoScene; import as3isolib.display.scene.IsoScene;
import com.threerings.util.Iterator;
import com.threerings.miso.client.MisoScenePanel;
import com.threerings.miso.client.SceneBlock;
import com.threerings.miso.data.MisoSceneModel;
import com.threerings.miso.util.MisoContext;
import com.threerings.miso.util.MisoSceneMetrics;
import com.threerings.miso.util.MisoUtil;
import com.threerings.whirled.spot.data.Portal;
import com.threerings.whirled.spot.data.SpotScene;
import com.threerings.stage.data.StageLocation;
public class StageSceneBlock extends SceneBlock public class StageSceneBlock extends SceneBlock
{ {
public function StageSceneBlock (key :int, objScene :IsoScene, portalScene :IsoScene, public function StageSceneBlock (key :int, objScene :IsoScene, portalScene :IsoScene,
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,15 +21,19 @@
package com.threerings.stage.client { package com.threerings.stage.client {
import com.threerings.util.Log;
import com.threerings.crowd.client.PlaceView; import com.threerings.crowd.client.PlaceView;
import com.threerings.crowd.util.CrowdContext; import com.threerings.crowd.util.CrowdContext;
import com.threerings.miso.util.MisoSceneMetrics; import com.threerings.miso.util.MisoSceneMetrics;
import com.threerings.stage.data.StageLocation;
import com.threerings.stage.util.StageContext;
import com.threerings.util.Log;
import com.threerings.whirled.data.SceneUpdate; import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.spot.client.SpotSceneController; import com.threerings.whirled.spot.client.SpotSceneController;
import com.threerings.stage.data.StageLocation;
import com.threerings.stage.util.StageContext;
public class StageSceneController extends SpotSceneController public class StageSceneController extends SpotSceneController
{ {
public var log :Log = Log.getLog(StageSceneController); public var log :Log = Log.getLog(StageSceneController);
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -23,26 +23,27 @@ package com.threerings.stage.client {
import flash.display.DisplayObject; import flash.display.DisplayObject;
import as3isolib.display.IsoSprite;
import as3isolib.display.scene.IsoScene;
import com.threerings.util.Controller; import com.threerings.util.Controller;
import com.threerings.util.Iterator;
import com.threerings.util.Log; import com.threerings.util.Log;
import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.spot.data.Portal;
import com.threerings.media.tile.Colorizer; import com.threerings.media.tile.Colorizer;
import com.threerings.media.tile.Tile;
import com.threerings.miso.client.MisoScenePanel; import com.threerings.miso.client.MisoScenePanel;
import com.threerings.miso.client.PriorityIsoDisplayObject; import com.threerings.miso.client.PriorityIsoDisplayObject;
import com.threerings.miso.client.SceneBlock; import com.threerings.miso.client.SceneBlock;
import com.threerings.miso.client.TileIsoSprite;
import com.threerings.miso.data.ObjectInfo; import com.threerings.miso.data.ObjectInfo;
import com.threerings.miso.util.MisoSceneMetrics; import com.threerings.miso.util.MisoSceneMetrics;
import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.spot.data.Portal;
import com.threerings.stage.data.StageMisoSceneModel; import com.threerings.stage.data.StageMisoSceneModel;
import com.threerings.stage.data.StageScene; import com.threerings.stage.data.StageScene;
import com.threerings.stage.util.StageContext; import com.threerings.stage.util.StageContext;
import as3isolib.display.IsoSprite;
import as3isolib.display.scene.IsoScene;
/** /**
* Eventually responsible for rendering a stage scene - but for now it's a stub. * Eventually responsible for rendering a stage scene - but for now it's a stub.
*/ */
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -22,11 +22,12 @@
package com.threerings.stage.client { package com.threerings.stage.client {
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.miso.data.ObjectInfo;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.InvocationService;
import com.threerings.presents.client.InvocationService_ConfirmListener; import com.threerings.presents.client.InvocationService_ConfirmListener;
import com.threerings.miso.data.ObjectInfo;
/** /**
* An ActionScript version of the Java StageSceneService interface. * An ActionScript version of the Java StageSceneService interface.
*/ */
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@ package com.threerings.stage.data {
import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream; import com.threerings.io.ObjectOutputStream;
import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
/** /**
* Update to change the default colorization for objects in a scene which * Update to change the default colorization for objects in a scene which
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -25,10 +25,11 @@ import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream; import com.threerings.io.ObjectOutputStream;
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.data.SceneModel;
import com.threerings.miso.data.ObjectInfo; import com.threerings.miso.data.ObjectInfo;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
/** /**
* A scene update that is broadcast when objects have been added to or removed * A scene update that is broadcast when objects have been added to or removed
* from the scene. * from the scene.
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,17 +21,18 @@
package com.threerings.stage.data { package com.threerings.stage.data {
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.io.SimpleStreamableObject;
import com.threerings.util.ClassUtil; import com.threerings.util.ClassUtil;
import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionCodes;
import com.threerings.util.DirectionUtil; import com.threerings.util.DirectionUtil;
import com.threerings.util.Hashable; import com.threerings.util.Hashable;
import com.threerings.io.SimpleStreamableObject; import com.threerings.whirled.spot.data.Location;
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.stage.data.StageLocation; import com.threerings.stage.data.StageLocation;
import com.threerings.whirled.spot.data.Location;
/** /**
* Contains information on a scene occupant's position and orientation. * Contains information on a scene occupant's position and orientation.
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,13 +21,14 @@
package com.threerings.stage.data { package com.threerings.stage.data {
import com.threerings.util.Integer;
import com.threerings.miso.data.SparseMisoSceneModel; import com.threerings.miso.data.SparseMisoSceneModel;
import com.threerings.miso.data.SparseMisoSceneModel_Section;
import com.threerings.whirled.data.AuxModel; import com.threerings.whirled.data.AuxModel;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.miso.data.SparseMisoSceneModel_Section;
import com.threerings.util.Integer;
import com.threerings.stage.data.StageMisoSceneModel; import com.threerings.stage.data.StageMisoSceneModel;
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,11 +21,7 @@
package com.threerings.stage.data { package com.threerings.stage.data {
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.crowd.data.OccupantInfo; import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.BodyObject;
/** /**
* Extends the standard occupant info with stage specific business. * Extends the standard occupant info with stage specific business.
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,8 +21,10 @@
package com.threerings.stage.data { package com.threerings.stage.data {
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.util.Iterator; import com.threerings.util.Iterator;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.whirled.data.SceneImpl; import com.threerings.whirled.data.SceneImpl;
import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.data.Portal;
import com.threerings.whirled.spot.data.SpotScene; import com.threerings.whirled.spot.data.SpotScene;
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,11 +21,10 @@
package com.threerings.stage.data { package com.threerings.stage.data {
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.stage.client.StageSceneController;
import com.threerings.crowd.client.PlaceController; import com.threerings.crowd.client.PlaceController;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.stage.client.StageSceneController;
/** /**
* Place configuration for the main isometric scenes in Stage. * Place configuration for the main isometric scenes in Stage.
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -22,11 +22,13 @@
package com.threerings.stage.data { package com.threerings.stage.data {
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.miso.data.ObjectInfo;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService_ConfirmListener; import com.threerings.presents.client.InvocationService_ConfirmListener;
import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller; import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller;
import com.threerings.miso.data.ObjectInfo;
import com.threerings.stage.client.StageSceneService; import com.threerings.stage.client.StageSceneService;
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -24,11 +24,13 @@ package com.threerings.stage.data {
import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream; import com.threerings.io.ObjectOutputStream;
import com.threerings.stage.data.StageSceneModel;
import com.threerings.util.Integer; import com.threerings.util.Integer;
import com.threerings.util.StreamableHashMap; import com.threerings.util.StreamableHashMap;
import com.threerings.whirled.spot.data.SpotSceneModel;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.spot.data.SpotSceneModel;
import com.threerings.stage.data.StageSceneModel;
/** /**
* Extends the basic scene model with the notion of a scene type and * Extends the basic scene model with the notion of a scene type and
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
package com.threerings.stage.data { package com.threerings.stage.data {
import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectInputStream;
import com.threerings.whirled.spot.data.SpotSceneObject; import com.threerings.whirled.spot.data.SpotSceneObject;
public class StageSceneObject extends SpotSceneObject public class StageSceneObject extends SpotSceneObject
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
package com.threerings.stage.util { package com.threerings.stage.util {
import com.threerings.media.image.ColorPository; import com.threerings.media.image.ColorPository;
import com.threerings.miso.util.MisoContext; import com.threerings.miso.util.MisoContext;
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -46,6 +46,14 @@ public /*abstract*/ class SceneController extends PlaceController
{ {
super.init(ctx, config); super.init(ctx, config);
_wctx = WhirledContext(ctx); _wctx = WhirledContext(ctx);
_updateListener = new MessageAdapter(
function (event :MessageEvent) :void {
if (event.getName() == SceneCodes.SCENE_UPDATE) {
sceneUpdated(event.getArgs()[0] as SceneUpdate);
}
}
);
} }
// documentation inherited // documentation inherited
@@ -75,13 +83,7 @@ public /*abstract*/ class SceneController extends PlaceController
} }
/** Used to listen for scene updates. */ /** Used to listen for scene updates. */
protected var _updateListener :MessageListener = new MessageAdapter( protected var _updateListener :MessageListener;
function (event :MessageEvent) :void {
if (event.getName() == SceneCodes.SCENE_UPDATE) {
sceneUpdated(event.getArgs()[0] as SceneUpdate);
}
}
);
protected var _wctx :WhirledContext; protected var _wctx :WhirledContext;
} }
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
package com.threerings.whirled.client { package com.threerings.whirled.client {
import com.threerings.presents.client.InvocationDecoder; import com.threerings.presents.client.InvocationDecoder;
import com.threerings.whirled.client.SceneReceiver; import com.threerings.whirled.client.SceneReceiver;
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -24,13 +24,13 @@ package com.threerings.whirled.client {
import flash.errors.IOError; import flash.errors.IOError;
import flash.errors.IllegalOperationError; import flash.errors.IllegalOperationError;
import com.threerings.io.TypedArray;
import com.threerings.util.Log; import com.threerings.util.Log;
import com.threerings.util.Map; import com.threerings.util.Map;
import com.threerings.util.Maps; import com.threerings.util.Maps;
import com.threerings.util.ResultListener; import com.threerings.util.ResultListener;
import com.threerings.io.TypedArray;
import com.threerings.presents.client.BasicDirector; import com.threerings.presents.client.BasicDirector;
import com.threerings.presents.client.Client; import com.threerings.presents.client.Client;
import com.threerings.presents.client.ClientEvent; import com.threerings.presents.client.ClientEvent;
@@ -431,7 +431,7 @@ public class SceneDirector extends BasicDirector
} else { } else {
log.info("Delaying forced move because we have a move pending", log.info("Delaying forced move because we have a move pending",
"pendId", _pendingData.sceneId, "reqId", sceneId); "pendId", _pendingData.sceneId, "reqId", sceneId);
addPendingForcedMove(new function() :void { addPendingForcedMove(function() :void {
forcedMove(sceneId); forcedMove(sceneId);
}); });
} }
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,7 +21,6 @@
package com.threerings.whirled.client { package com.threerings.whirled.client {
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.InvocationService;
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,9 +21,12 @@
package com.threerings.whirled.client { package com.threerings.whirled.client {
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.presents.client.InvocationService_InvocationListener; import com.threerings.presents.client.InvocationService_InvocationListener;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,10 +21,10 @@
package com.threerings.whirled.data { package com.threerings.whirled.data {
import com.threerings.util.Cloneable;
import com.threerings.io.Streamable; import com.threerings.io.Streamable;
import com.threerings.util.Cloneable;
/** /**
* An interface that must be implemented by auxiliary scene models. * An interface that must be implemented by auxiliary scene models.
*/ */
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,9 +21,10 @@
package com.threerings.whirled.data { package com.threerings.whirled.data {
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.util.Integer; import com.threerings.util.Integer;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.whirled.client.SceneService; import com.threerings.whirled.client.SceneService;
import com.threerings.whirled.client.SceneService_SceneMoveListener; import com.threerings.whirled.client.SceneService_SceneMoveListener;
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,9 +21,12 @@
package com.threerings.whirled.data { package com.threerings.whirled.data {
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.whirled.client.SceneService_SceneMoveListener; import com.threerings.whirled.client.SceneService_SceneMoveListener;
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,14 +21,14 @@
package com.threerings.whirled.data { package com.threerings.whirled.data {
import com.threerings.util.ClassUtil;
import com.threerings.util.Cloneable;
import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream; import com.threerings.io.ObjectOutputStream;
import com.threerings.io.SimpleStreamableObject; import com.threerings.io.SimpleStreamableObject;
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.util.ClassUtil;
import com.threerings.util.Cloneable;
/** /**
* The scene model is the bare bones representation of the data for a * The scene model is the bare bones representation of the data for a
* scene in the Whirled system. From the scene model, one would create an * scene in the Whirled system. From the scene model, one would create an
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -23,13 +23,12 @@ package com.threerings.whirled.data {
import flash.errors.IllegalOperationError; import flash.errors.IllegalOperationError;
import com.threerings.util.Joiner;
import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream; import com.threerings.io.ObjectOutputStream;
import com.threerings.io.Streamable; import com.threerings.io.Streamable;
import com.threerings.util.Cloneable; import com.threerings.util.Cloneable;
import com.threerings.util.Joiner;
import com.threerings.util.Log; import com.threerings.util.Log;
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -20,7 +20,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.whirled.spot.client { package com.threerings.whirled.spot.client {
import com.threerings.crowd.client.CrowdClient;
import com.threerings.util.Log; import com.threerings.util.Log;
import com.threerings.util.ResultListener; import com.threerings.util.ResultListener;
@@ -28,7 +27,6 @@ import com.threerings.presents.client.BasicDirector;
import com.threerings.presents.client.Client; import com.threerings.presents.client.Client;
import com.threerings.presents.client.ClientEvent; import com.threerings.presents.client.ClientEvent;
import com.threerings.presents.client.ConfirmAdapter; import com.threerings.presents.client.ConfirmAdapter;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangeListener;
import com.threerings.presents.dobj.AttributeChangedEvent; import com.threerings.presents.dobj.AttributeChangedEvent;
import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.DObject;
@@ -38,6 +36,7 @@ import com.threerings.presents.dobj.Subscriber;
import com.threerings.crowd.chat.client.ChatDirector; import com.threerings.crowd.chat.client.ChatDirector;
import com.threerings.crowd.chat.data.ChatCodes; import com.threerings.crowd.chat.data.ChatCodes;
import com.threerings.crowd.client.CrowdClient;
import com.threerings.crowd.client.LocationAdapter; import com.threerings.crowd.client.LocationAdapter;
import com.threerings.crowd.client.LocationDirector; import com.threerings.crowd.client.LocationDirector;
import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.BodyObject;
@@ -46,8 +45,6 @@ import com.threerings.crowd.data.PlaceObject;
import com.threerings.whirled.client.SceneDirector; import com.threerings.whirled.client.SceneDirector;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.ScenePlace; import com.threerings.whirled.data.ScenePlace;
import com.threerings.whirled.util.WhirledContext;
import com.threerings.whirled.spot.data.ClusteredBodyObject; import com.threerings.whirled.spot.data.ClusteredBodyObject;
import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.spot.data.Location;
import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.data.Portal;
@@ -56,6 +53,7 @@ import com.threerings.whirled.spot.data.SpotCodes;
import com.threerings.whirled.spot.data.SpotMarshaller; import com.threerings.whirled.spot.data.SpotMarshaller;
import com.threerings.whirled.spot.data.SpotScene; import com.threerings.whirled.spot.data.SpotScene;
import com.threerings.whirled.spot.data.SpotSceneObject; import com.threerings.whirled.spot.data.SpotSceneObject;
import com.threerings.whirled.util.WhirledContext;
/** /**
* Extends the standard scene director with facilities to move between locations within a scene. * Extends the standard scene director with facilities to move between locations within a scene.
@@ -463,7 +461,9 @@ public class SpotSceneDirector extends BasicDirector
} }
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceConfig;
import com.threerings.whirled.client.SceneDirector; import com.threerings.whirled.client.SceneDirector;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.spot.client.SpotService_SpotSceneMoveListener; import com.threerings.whirled.spot.client.SpotService_SpotSceneMoveListener;
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,9 +21,9 @@
package com.threerings.whirled.spot.client { package com.threerings.whirled.spot.client {
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.InvocationService;
import com.threerings.presents.client.InvocationService_ConfirmListener; import com.threerings.presents.client.InvocationService_ConfirmListener;
import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.spot.data.Location;
/** /**
@@ -2,7 +2,7 @@
// $Id$ // $Id$
// //
// Vilya library - tools for developing networked games // Vilya library - tools for developing networked games
// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
// http://code.google.com/p/vilya/ // http://code.google.com/p/vilya/
// //
// This library is free software; you can redistribute it and/or modify it // This library is free software; you can redistribute it and/or modify it
@@ -21,9 +21,12 @@
package com.threerings.whirled.spot.client { package com.threerings.whirled.spot.client {
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.io.TypedArray; import com.threerings.io.TypedArray;
import com.threerings.presents.client.InvocationService_InvocationListener; import com.threerings.presents.client.InvocationService_InvocationListener;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
/** /**

Some files were not shown because too many files have changed in this diff Show More