AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: AfflictionNetworks/vilya:vilya-1.6
Branches Tags
AfflictionNetworks/vilya:master AfflictionNetworks/vilya:add-pr-target-hook AfflictionNetworks/vilya:epicA1-streamers AfflictionNetworks/vilya:gh-pages AfflictionNetworks/vilya:vilya-1.4 AfflictionNetworks/vilya:vilya-1.3
AfflictionNetworks/vilya:vilya-1.7.1 AfflictionNetworks/vilya:vilya-1.7 AfflictionNetworks/vilya:v1.6 AfflictionNetworks/vilya:vilya-1.6 AfflictionNetworks/vilya:vilya-1.5.1 AfflictionNetworks/vilya:vilya-1.5
..
compare: AfflictionNetworks/vilya:vilya-1.3
Branches Tags
AfflictionNetworks/vilya:master AfflictionNetworks/vilya:add-pr-target-hook AfflictionNetworks/vilya:epicA1-streamers AfflictionNetworks/vilya:gh-pages AfflictionNetworks/vilya:vilya-1.4 AfflictionNetworks/vilya:vilya-1.3
AfflictionNetworks/vilya:vilya-1.7.1 AfflictionNetworks/vilya:vilya-1.7 AfflictionNetworks/vilya:v1.6 AfflictionNetworks/vilya:vilya-1.6 AfflictionNetworks/vilya:vilya-1.5.1 AfflictionNetworks/vilya:vilya-1.5

1 Commits
vilya-1.6 .. vilya-1.3

Author SHA1 Message Date
Michael Bayne 445e23a977 [maven-release-plugin] copy for tag vilya-1.3 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/tags/vilya-1.3@1072 c613c5cb-e716-0410-b11b-feb51c14d237
 2011-04-04 05:24:33 +00:00
499 changed files with 1066 additions and 1228 deletions
Expand all files Collapse all files
.classpath
+10
View File
@@ -0,0 +1,10 @@
<?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>
.project
+23
View File
@@ -0,0 +1,23 @@
<?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>
.settings/org.eclipse.jdt.core.prefs
+6
View File
@@ -0,0 +1,6 @@
#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
.settings/org.maven.ide.eclipse.prefs
+8
View File
@@ -0,0 +1,8 @@
#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
README
+59
View File
@@ -0,0 +1,59 @@
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$
README.md
-77
View File
@@ -1,77 +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
[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`:
<dependencies>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>vilya</artifactId>
<version>1.6</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.6.jar](http://threerings.github.com/maven-repo/com/threerings/vilya/1.6/vilya-1.6.jar)
* [vilyalib-1.6.swc](http://threerings.github.com/maven-repo/com/threerings/vilyalib/1.6/vilyalib-a1.6.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
aslib/pom.xml
-110
View File
@@ -1,110 +0,0 @@
<?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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.threerings</groupId>
<artifactId>vilya-parent</artifactId>
<version>1.6</version>
</parent>
<artifactId>vilyalib</artifactId>
<packaging>swc</packaging>
<name>Vilya ActionScript</name>
<repositories>
<repository>
<id>flexlib-repo</id>
<url>http://maven.ow2.org/maven2</url>
</repository>
<repository>
<id>ooo-ext-maven-repo</id>
<url>http://ooo-maven.googlecode.com/hg/repository</url>
</repository>
<repository>
<id>ooo-maven-repo</id>
<url>http://threerings.github.com/maven-repo</url>
</repository>
</repositories>
<properties>
<flex.version>4.1.0.16076</flex.version>
</properties>
<dependencies>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>aspirin</artifactId>
<version>1.9</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>flexlib</groupId>
<artifactId>flexlib-bin</artifactId>
<version>2.4</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>as3isolib</groupId>
<artifactId>as3isolib-fp9</artifactId>
<version>r298</version>
<type>swc</type>
</dependency>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>nenyalib</artifactId>
<version>1.5</version>
<type>swc</type>
</dependency>
<!-- needed for the build, but not an exported dependency -->
<dependency>
<groupId>com.adobe.flex.framework</groupId>
<artifactId>flex-framework</artifactId>
<version>${flex.version}</version>
<type>pom</type>
<optional>true</optional>
</dependency>
</dependencies>
<pluginRepositories>
<pluginRepository>
<id>flexmojos</id>
<url>http://repository.sonatype.org/content/groups/flexgroup/</url>
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory>src/main/as</sourceDirectory>
<plugins>
<plugin>
<groupId>org.sonatype.flexmojos</groupId>
<artifactId>flexmojos-maven-plugin</artifactId>
<extensions>true</extensions>
<version>4.2-beta</version>
<configuration>
<omitTraceStatements>false</omitTraceStatements>
<debug>true</debug>
<incremental>false</incremental>
<useNetwork>false</useNetwork>
<verboseStacktraces>true</verboseStacktraces>
<!-- we've never shown them in the Ant build, why start now? -->
<showWarnings>false</showWarnings>
</configuration>
<dependencies>
<dependency>
<groupId>com.adobe.flex</groupId>
<artifactId>compiler</artifactId>
<version>${flex.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.adobe.flex.compiler</groupId>
<artifactId>asdoc</artifactId>
<version>${flex.version}</version>
<classifier>template</classifier>
<type>zip</type>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
build.xml
+22 -50
View File
@@ -1,25 +1,20 @@
<?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" location="dist"/> <property name="deploy.dir" value="dist"/>
<property name="src.dir" location="core/src/main/java"/> <property name="src.dir" value="src/main/java"/>
<property name="asrc.dir" location="aslib/src/main/as"/> <property name="asrc.dir" value="src/main/as"/>
<property name="tsrc.dir" location="core/src/test/java"/> <property name="tsrc.dir" value="src/test/java"/>
<property name="classes.dir" location="${deploy.dir}/classes"/> <property name="classes.dir" value="${deploy.dir}/classes"/>
<property name="tclasses.dir" location="${deploy.dir}/test-classes"/> <property name="tclasses.dir" value="${deploy.dir}/test-classes"/>
<property name="ooo-build.vers" value="2.9"/> <property name="ooo-build.vers" value="2.1"/>
<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"/>
<target name="-prepare" depends="-init-ooo"> <target name="-prepare" depends="-init-ooo">
<mavendep pom="core/pom.xml" id="compile"/> <mavendep pom="pom.xml" id="compile"/>
<!-- we can't use <mavendep> here because we need to exclude our pom depends --> <mavendep pom="etc/as-pom.xml" pathProp="aslib.path"/>
<artifact:dependencies filesetId="aslib.fileset" cacheDependencyRefs="true" type="swc" <mavendep pom="pom.xml" id="test" scope="test"/>
dependencyRefsBuildFile="${deploy.dir}/aslib-pom.dependencies">
<pom file="aslib/pom.xml"/>
</artifact:dependencies>
<pathconvert pathsep="," property="aslib.path" refid="aslib.fileset"/>
<mavendep pom="core/pom.xml" id="test" scope="test"/>
<mkdir dir="${deploy.dir}"/> <mkdir dir="${deploy.dir}"/>
<path id="built.classpath"> <path id="built.classpath">
<path refid="compile.path"/> <path refid="compile.path"/>
@@ -32,19 +27,9 @@
</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.11"/> <dependency groupId="com.threerings" artifactId="narya-tools" version="1.8-SNAPSHOT"/>
</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>
@@ -55,8 +40,8 @@
<delete dir="${deploy.dir}/docs"/> <delete dir="${deploy.dir}/docs"/>
<delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.jar"/></delete> <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.jar"/></delete>
<delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.swc"/></delete> <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.swc"/></delete>
<cleanmavendepcache pom="core/pom.xml"/> <cleanmavendepcache pom="pom.xml"/>
<cleanmavendepcache pom="aslib/pom.xml"/> <cleanmavendepcache pom="etc/as-pom.xml"/>
<cleanmavendepcache id="test"/> <cleanmavendepcache id="test"/>
</target> </target>
@@ -66,12 +51,12 @@
<target name="compile" depends="-prepare" description="Builds the Java code."> <target name="compile" depends="-prepare" description="Builds the Java code.">
<mkdir dir="${classes.dir}"/> <mkdir dir="${classes.dir}"/>
<copy todir="${classes.dir}"><fileset dir="core/src/main/resources" includes="**"/></copy> <copy todir="${classes.dir}"><fileset dir="src/main/resources" includes="**"/></copy>
<ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}" <ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="compile.path"/> classpathref="compile.path"/>
<mkdir dir="${tclasses.dir}"/> <mkdir dir="${tclasses.dir}"/>
<copy todir="${tclasses.dir}"><fileset dir="core/src/test/resources" includes="**"/></copy> <copy todir="${tclasses.dir}"><fileset dir="src/test/resources" includes="**"/></copy>
<ooojavac srcdir="${tsrc.dir}" destdir="${tclasses.dir}" version="1.5" <ooojavac srcdir="${tsrc.dir}" destdir="${tclasses.dir}" version="1.5"
classpathref="test.classpath"/> classpathref="test.classpath"/>
</target> </target>
@@ -85,9 +70,8 @@
</instream> </instream>
</target> </target>
<target name="aslib" depends="-prepare-as" if="flexsdk.dir" <target name="aslib" depends="-prepare" description="Builds the ActionScript code">
description="Builds the ActionScript code"> <maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.0"/>
<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>
@@ -110,7 +94,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.4"/> <maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.0"/>
<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>
@@ -251,22 +235,10 @@
</genascript> </genascript>
</target> </target>
<target name="-as-install" depends="aslib" if="flexsdk.dir"> <target name="maven-deploy" depends="dist,aslib"
<maveninstall file="${deploy.dir}/${ant.project.name}lib.swc" pom="aslib/pom.xml"/>
</target>
<target name="install" depends="dist,-as-install"
description="Installs artifacts to local Maven repository.">
<maveninstall file="pom.xml" pom="pom.xml"/>
<maveninstall file="${deploy.dir}/${ant.project.name}.jar" pom="core/pom.xml"/>
</target>
<target name="-as-deploy" depends="aslib" if="flexsdk.dir">
<mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="aslib/pom.xml"/>
</target>
<target name="deploy" depends="dist,-as-deploy,tests,javadoc"
description="Deploys our build artifacts to a Maven repository."> description="Deploys our build artifacts to a Maven repository.">
<mavendeploy file="pom.xml" pom="pom.xml"/> <jar basedir="${src.dir}" destfile="${deploy.dir}/${ant.project.name}-sources.jar"/>
<mavendeploy file="${deploy.dir}/${ant.project.name}.jar" pom="core/pom.xml" <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" srcdir="${src.dir}" pom="pom.xml"/>
srcdir="${src.dir}" docdir="${deploy.dir}/docs"/> <mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
</target> </target>
</project> </project>
core/pom.xml
-87
View File
@@ -1,87 +0,0 @@
<?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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.threerings</groupId>
<artifactId>vilya-parent</artifactId>
<version>1.6</version>
</parent>
<artifactId>vilya</artifactId>
<packaging>jar</packaging>
<name>Vilya Core</name>
<dependencies>
<!-- exported dependencies -->
<dependency>
<groupId>com.threerings</groupId>
<artifactId>ooo-util</artifactId>
<version>1.4.1</version>
</dependency>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>narya</artifactId>
<version>1.15</version>
</dependency>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>nenya</artifactId>
<version>1.6</version>
</dependency>
<!-- optional dependencies -->
<dependency>
<groupId>com.threerings</groupId>
<artifactId>nenya-tools</artifactId>
<version>1.6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>2.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.samskivert</groupId>
<artifactId>depot</artifactId>
<version>1.7</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.18.2-GA</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.megginson.sax</groupId>
<artifactId>xml-writer</artifactId>
<version>0.2</version>
<optional>true</optional>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.6</version>
<configuration>
<includes>
<include>com/threerings/**/*Test.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</project>
etc/as-pom.xml
+56
View File
@@ -0,0 +1,56 @@
<?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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.threerings</groupId>
<artifactId>vilyalib</artifactId>
<packaging>swc</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>
<repositories>
<repository>
<id>flexlib-repo</id>
<url>http://maven.ow2.org/maven2</url>
</repository>
<repository>
<id>ooo-maven-repo</id>
<url>http://ooo-maven.googlecode.com/hg/repository</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>aspirin</artifactId>
<version>1.6</version>
<scope>compile</scope>
<type>swc</type>
</dependency>
<dependency>
<groupId>as3isolib</groupId>
<artifactId>as3isolib-fp9</artifactId>
<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>
</dependency>
</dependencies>
</project>
lib/SOURCE_HEADER
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
pom.xml
+115 -97
View File
@@ -1,24 +1,23 @@
<?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>7</version> <version>5</version>
</parent> </parent>
<groupId>com.threerings</groupId>
<artifactId>vilya-parent</artifactId>
<packaging>pom</packaging>
<version>1.6</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>
@@ -36,34 +35,99 @@
</developers> </developers>
<scm> <scm>
<connection>scm:git:git://github.com/threerings/vilya.git</connection> <connection>scm:svn:http://vilya.googlecode.com/svn/tags/vilya-1.3</connection>
<developerConnection>scm:git:git@github.com:threerings/vilya.git</developerConnection> <developerConnection>scm:svn:svn+ssh://src.earth.threerings.net/vilya/tags/vilya-1.3</developerConnection>
<url>http://github.com/threerings/vilya/</url> <url>http://vilya.googlecode.com/svn/tags/vilya-1.3</url>
</scm> </scm>
<modules> <dependencies>
<module>core</module> <dependency>
<!--<module>tools</module>--> <groupId>com.google.guava</groupId>
<module>aslib</module> <artifactId>guava</artifactId>
</modules> <version>r07</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>
<groupId>com.threerings</groupId>
<artifactId>narya</artifactId>
<version>1.8</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>nenya</artifactId>
<version>1.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>2.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.samskivert</groupId>
<artifactId>depot</artifactId>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.8.0.GA</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.megginson.sax</groupId>
<artifactId>xml-writer</artifactId>
<version>0.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>2.3.2</version>
<configuration> <configuration>
<source>1.5</source> <source>1.5</source>
<target>1.5</target> <target>1.5</target>
<fork>true</fork> <fork>true</fork>
<showDeprecation>true</showDeprecation> <showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>
<compilerArgs> <!-- yes, those quoted spaces are a workaround sanctioned by the Maven idiocracy -->
<arg>-Xlint</arg> <compilerArgument>-Xlint" "-Xlint:-serial" "-Xlint:-path</compilerArgument>
<arg>-Xlint:-serial</arg>
<arg>-Xlint:-path</arg>
</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@@ -74,27 +138,40 @@
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version> <version>2.7</version>
<configuration> <configuration>
<quiet>true</quiet> <quiet>true</quiet>
<show>public</show> <show>public</show>
<additionalparam>-Xdoclint:all -Xdoclint:-missing</additionalparam>
<links> <links>
<link>http://samskivert.github.com/samskivert/apidocs/</link> <link>http://samskivert.googlecode.com/svn/apidocs/</link>
<link>http://threerings.github.com/depot/apidocs/</link> <link>http://depot.googlecode.com/svn/apidocs/</link>
<link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link> <link>http://guava-libraries.googlecode.com/svn/trunk/javadoc/</link>
<link>http://www.jajakarta.org/ant/ant-1.6.1/docs/ja/manual/api/</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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.6</version>
<configuration>
<includes>
<include>com/threerings/**/*Test.java</include>
</includes>
<systemPropertyVariables>
<test_dir>target/test-classes</test_dir>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
@@ -109,47 +186,6 @@
</build> </build>
<profiles> <profiles>
<profile>
<id>eclipse</id>
<activation>
<property>
<name>m2e.version</name>
</property>
</activation>
<build>
<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>
</profile>
<profile> <profile>
<id>release-sign-artifacts</id> <id>release-sign-artifacts</id>
<activation> <activation>
@@ -177,23 +213,5 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<!-- For deploying to a local place -->
<profile>
<id>deploy-local</id>
<distributionManagement>
<repository>
<id>deploy-local-dir</id>
<name>Local Maven repository</name>
<url>file://${deploy.local.dir}</url>
</repository>
<snapshotRepository>
<id>deploy-local-dir</id>
<name>Local Maven repository</name>
<url>file://${deploy.local.dir}</url>
</snapshotRepository>
</distributionManagement>
</profile>
</profiles> </profiles>
</project> </project>
aslib/src/main/as/com/threerings/parlor/card/data/Card.as → src/main/as/com/threerings/parlor/card/data/Card.as
+3 -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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,6 +27,8 @@ 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;
aslib/src/main/as/com/threerings/parlor/card/data/CardCodes.as → src/main/as/com/threerings/parlor/card/data/CardCodes.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/card/data/Deck.as → src/main/as/com/threerings/parlor/card/data/Deck.as
+3 -3
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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.Arrays; import com.threerings.util.ArrayUtil;
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
{ {
Arrays.shuffle(_array); ArrayUtil.shuffle(_array);
} }
} }
} }
aslib/src/main/as/com/threerings/parlor/card/data/Hand.as → src/main/as/com/threerings/parlor/card/data/Hand.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/card/data/PlayerCard.as → src/main/as/com/threerings/parlor/card/data/PlayerCard.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as → src/main/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as
+3 -4
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,9 @@
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.presents.client.InvocationService;
import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.data.Card;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
/** /**
* An ActionScript version of the Java TrickCardGameService interface. * An ActionScript version of the Java TrickCardGameService interface.
aslib/src/main/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as → src/main/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as
+4 -6
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,13 +22,11 @@
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
aslib/src/main/as/com/threerings/parlor/client/DefaultFlexTableConfigurator.as → src/main/as/com/threerings/parlor/client/DefaultFlexTableConfigurator.as
+7 -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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,19 @@
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;
aslib/src/main/as/com/threerings/parlor/client/GameReadyObserver.as → src/main/as/com/threerings/parlor/client/GameReadyObserver.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/client/Invitation.as → src/main/as/com/threerings/parlor/client/Invitation.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/client/InvitationHandler.as → src/main/as/com/threerings/parlor/client/InvitationHandler.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/client/InvitationResponseObserver.as → src/main/as/com/threerings/parlor/client/InvitationResponseObserver.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/client/ParlorDecoder.as → src/main/as/com/threerings/parlor/client/ParlorDecoder.as
+3 -5
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,10 @@
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.
aslib/src/main/as/com/threerings/parlor/client/ParlorDirector.as → src/main/as/com/threerings/parlor/client/ParlorDirector.as
+4 -4
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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.Arrays; import com.threerings.util.ArrayUtil;
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
{ {
Arrays.removeFirst(_grobs, observer); ArrayUtil.removeFirst(_grobs, observer);
} }
/** /**
aslib/src/main/as/com/threerings/parlor/client/ParlorReceiver.as → src/main/as/com/threerings/parlor/client/ParlorReceiver.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/client/ParlorService.as → src/main/as/com/threerings/parlor/client/ParlorService.as
+4 -5
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,12 @@
package com.threerings.parlor.client { package com.threerings.parlor.client {
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_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.
aslib/src/main/as/com/threerings/parlor/client/ParlorService_InviteListener.as → src/main/as/com/threerings/parlor/client/ParlorService_InviteListener.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/client/SeatednessObserver.as → src/main/as/com/threerings/parlor/client/SeatednessObserver.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/client/TableConfigurator.as → src/main/as/com/threerings/parlor/client/TableConfigurator.as
+5 -3
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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.parlor.data.TableConfig;
import com.threerings.parlor.game.client.GameConfigurator;
import com.threerings.parlor.util.ParlorContext; import com.threerings.parlor.util.ParlorContext;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.client.GameConfigurator;
/** /**
* This should be implemented some user-interface element that allows * This should be implemented some user-interface element that allows
* the user to configure whichever TableConfig options are relevant. * the user to configure whichever TableConfig options are relevant.
aslib/src/main/as/com/threerings/parlor/client/TableDirector.as → src/main/as/com/threerings/parlor/client/TableDirector.as
+5 -3
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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.Arrays; import com.threerings.util.ArrayUtil;
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,6 +31,7 @@ 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;
@@ -38,6 +39,7 @@ 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;
@@ -374,7 +376,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 (Arrays.contains(table.players, self.getVisibleName())) { if (ArrayUtil.contains(table.players, self.getVisibleName())) {
_ourTable = table; _ourTable = table;
} }
aslib/src/main/as/com/threerings/parlor/client/TableObserver.as → src/main/as/com/threerings/parlor/client/TableObserver.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/client/TableService.as → src/main/as/com/threerings/parlor/client/TableService.as
+5 -6
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,13 @@
package com.threerings.parlor.client { package com.threerings.parlor.client {
import com.threerings.util.Name; import com.threerings.parlor.data.TableConfig;
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.
aslib/src/main/as/com/threerings/parlor/data/ChoiceParameter.as → src/main/as/com/threerings/parlor/data/ChoiceParameter.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/data/Parameter.as → src/main/as/com/threerings/parlor/data/Parameter.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/data/ParlorCodes.as → src/main/as/com/threerings/parlor/data/ParlorCodes.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/data/ParlorMarshaller.as → src/main/as/com/threerings/parlor/data/ParlorMarshaller.as
+7 -8
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,18 +21,17 @@
package com.threerings.parlor.data { package com.threerings.parlor.data {
import com.threerings.util.Integer; import com.threerings.parlor.client.ParlorService;
import com.threerings.util.Name; import com.threerings.parlor.client.ParlorService_InviteListener;
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.parlor.client.ParlorService; import com.threerings.util.Name;
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
aslib/src/main/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as → src/main/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as
+2 -3
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,8 @@
package com.threerings.parlor.data { package com.threerings.parlor.data {
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
import com.threerings.parlor.client.ParlorService_InviteListener; import com.threerings.parlor.client.ParlorService_InviteListener;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
/** /**
* Marshalls instances of the ParlorService_InviteMarshaller interface. * Marshalls instances of the ParlorService_InviteMarshaller interface.
aslib/src/main/as/com/threerings/parlor/data/RangeParameter.as → src/main/as/com/threerings/parlor/data/RangeParameter.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/data/Table.as → src/main/as/com/threerings/parlor/data/Table.as
+10 -7
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,18 +21,21 @@
package com.threerings.parlor.data { package com.threerings.parlor.data {
import com.threerings.io.ObjectInputStream; import com.threerings.util.ArrayUtil;
import com.threerings.io.ObjectOutputStream; import com.threerings.util.ClassUtil;
import com.threerings.io.TypedArray;
import com.threerings.util.Arrays;
import com.threerings.util.Hashable; import com.threerings.util.Hashable;
import com.threerings.util.Joiner; import com.threerings.util.Joiner;
import com.threerings.util.Name; import com.threerings.util.Name;
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.io.TypedArray;
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;
/** /**
@@ -130,7 +133,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(Arrays.indexOf(players, occ)); newSubTeams.push(ArrayUtil.indexOf(players, occ));
} }
} }
newSubTeams.sort(null, Array.NUMERIC); newSubTeams.sort(null, Array.NUMERIC);
aslib/src/main/as/com/threerings/parlor/data/TableConfig.as → src/main/as/com/threerings/parlor/data/TableConfig.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/data/TableLobbyObject.as → src/main/as/com/threerings/parlor/data/TableLobbyObject.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/data/TableMarshaller.as → src/main/as/com/threerings/parlor/data/TableMarshaller.as
+6 -7
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,16 @@
package com.threerings.parlor.data { package com.threerings.parlor.data {
import com.threerings.util.Integer; import com.threerings.parlor.client.TableService;
import com.threerings.util.Name; import com.threerings.parlor.game.data.GameConfig;
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.parlor.client.TableService; import com.threerings.util.Name;
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
aslib/src/main/as/com/threerings/parlor/data/ToggleParameter.as → src/main/as/com/threerings/parlor/data/ToggleParameter.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/game/client/FlexGameConfigurator.as → src/main/as/com/threerings/parlor/game/client/FlexGameConfigurator.as
+7 -5
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,18 @@
package com.threerings.parlor.game.client { package com.threerings.parlor.game.client {
import mx.containers.Grid;
import mx.containers.GridItem;
import mx.containers.GridRow;
import mx.core.Container; import mx.core.Container;
import mx.core.UIComponent; import mx.core.UIComponent;
import com.threerings.parlor.game.data.GameConfig; import mx.containers.Grid;
import mx.containers.GridItem;
import mx.containers.GridRow;
import com.threerings.flex.GridUtil; import com.threerings.flex.GridUtil;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.parlor.util.ParlorContext;
/** /**
* 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.
* Derived classes would extend the base configurator adding interface elements and wiring them up * Derived classes would extend the base configurator adding interface elements and wiring them up
aslib/src/main/as/com/threerings/parlor/game/client/GameConfigurator.as → src/main/as/com/threerings/parlor/game/client/GameConfigurator.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/game/client/GameController.as → src/main/as/com/threerings/parlor/game/client/GameController.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/game/client/GameControllerDelegate.as → src/main/as/com/threerings/parlor/game/client/GameControllerDelegate.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/game/data/GameAI.as → src/main/as/com/threerings/parlor/game/data/GameAI.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/game/data/GameCodes.as → src/main/as/com/threerings/parlor/game/data/GameCodes.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/game/data/GameConfig.as → src/main/as/com/threerings/parlor/game/data/GameConfig.as
+5 -5
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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;
aslib/src/main/as/com/threerings/parlor/game/data/GameObject.as → src/main/as/com/threerings/parlor/game/data/GameObject.as
+9 -9
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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 Arrays.indexOf(players, username); return ArrayUtil.indexOf(players, username);
} }
/** /**
@@ -218,7 +218,7 @@ public class GameObject extends PlaceObject
*/ */
public function getWinnerIndex () :int public function getWinnerIndex () :int
{ {
return Arrays.indexOf(winners, true); return ArrayUtil.indexOf(winners, true);
} }
/** /**
aslib/src/main/as/com/threerings/parlor/game/data/UserIdentifier.as → src/main/as/com/threerings/parlor/game/data/UserIdentifier.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/turn/client/TurnGameController.as → src/main/as/com/threerings/parlor/turn/client/TurnGameController.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/turn/client/TurnGameControllerDelegate.as → src/main/as/com/threerings/parlor/turn/client/TurnGameControllerDelegate.as
+3 -2
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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.AttributeChangeListener;
import com.threerings.presents.dobj.AttributeChangedEvent; import com.threerings.presents.dobj.AttributeChangedEvent;
import com.threerings.presents.dobj.AttributeChangeListener;
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,6 +34,7 @@ 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;
/** /**
aslib/src/main/as/com/threerings/parlor/turn/data/TurnGameObject.as → src/main/as/com/threerings/parlor/turn/data/TurnGameObject.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/parlor/util/ParlorContext.as → src/main/as/com/threerings/parlor/util/ParlorContext.as
+1 -2
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,7 +22,6 @@
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;
/** /**
aslib/src/main/as/com/threerings/stage/client/CharacterIsoSprite.as → src/main/as/com/threerings/stage/client/CharacterIsoSprite.as
+7 -8
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,21 +24,20 @@ package com.threerings.stage.client {
import flash.display.DisplayObject; import flash.display.DisplayObject;
import flash.display.Sprite; import flash.display.Sprite;
import as3isolib.display.IsoSprite; import com.threerings.cast.CharacterSprite;
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 com.threerings.stage.data.StageLocation;
import as3isolib.display.IsoSprite;
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
{ {
aslib/src/main/as/com/threerings/stage/client/ClusterClickedInfo.as → src/main/as/com/threerings/stage/client/ClusterClickedInfo.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/stage/client/CrowdStageScenePanel.as → src/main/as/com/threerings/stage/client/CrowdStageScenePanel.as
+25 -24
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,47 +21,48 @@
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 as3isolib.geom.Pt; import com.threerings.cast.CharacterSprite;
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.StageLocation;
import com.threerings.stage.data.StageSceneObject; import com.threerings.stage.data.StageSceneObject;
import com.threerings.stage.data.StageLocation;
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
aslib/src/main/as/com/threerings/stage/client/PortalIsoSprite.as → src/main/as/com/threerings/stage/client/PortalIsoSprite.as
+3 -2
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,13 +22,14 @@
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
aslib/src/main/as/com/threerings/stage/client/SceneColorizer.as → src/main/as/com/threerings/stage/client/SceneColorizer.as
+7 -12
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,16 @@
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.media.tile.Colorizer;
import com.threerings.miso.data.ObjectInfo;
import com.threerings.stage.data.StageScene; import com.threerings.stage.data.StageScene;
import com.threerings.miso.data.ObjectInfo;
import com.threerings.media.tile.Colorizer;
import com.threerings.util.Log;
import com.threerings.util.Maps;
import com.threerings.util.Map;
/** /**
* Handles colorization of object tiles in a scene. * Handles colorization of object tiles in a scene.
@@ -138,12 +135,10 @@ public class SceneColorizer implements Colorizer
} }
} }
import com.threerings.media.image.ColorPository;
import com.threerings.media.image.Colorization; import com.threerings.media.image.Colorization;
import com.threerings.media.image.ColorPository;
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 {
aslib/src/main/as/com/threerings/stage/client/StageSceneBlock.as → src/main/as/com/threerings/stage/client/StageSceneBlock.as
+10 -11
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,24 +23,23 @@ package com.threerings.stage.client {
import flash.display.DisplayObject; import flash.display.DisplayObject;
import as3isolib.display.IsoSprite;
import as3isolib.display.IsoView;
import as3isolib.display.scene.IsoScene;
import com.threerings.util.Iterator;
import com.threerings.miso.client.MisoScenePanel; 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.MisoContext;
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.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.Portal;
import com.threerings.whirled.spot.data.SpotScene; import com.threerings.whirled.spot.data.SpotScene;
import com.threerings.whirled.spot.data.SpotSceneModel;
import com.threerings.stage.data.StageLocation; import com.threerings.stage.data.StageLocation;
import as3isolib.display.IsoSprite;
import as3isolib.display.IsoView;
import as3isolib.display.scene.IsoScene;
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,
aslib/src/main/as/com/threerings/stage/client/StageSceneController.as → src/main/as/com/threerings/stage/client/StageSceneController.as
+4 -8
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,18 +21,14 @@
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.whirled.data.SceneUpdate;
import com.threerings.whirled.spot.client.SpotSceneController;
import com.threerings.stage.data.StageLocation; import com.threerings.stage.data.StageLocation;
import com.threerings.stage.util.StageContext; import com.threerings.stage.util.StageContext;
import com.threerings.util.Log;
import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.spot.client.SpotSceneController;
public class StageSceneController extends SpotSceneController public class StageSceneController extends SpotSceneController
{ {
aslib/src/main/as/com/threerings/stage/client/StageScenePanel.as → src/main/as/com/threerings/stage/client/StageScenePanel.as
+9 -10
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,27 +23,26 @@ 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.
*/ */
aslib/src/main/as/com/threerings/stage/client/StageSceneService.as → src/main/as/com/threerings/stage/client/StageSceneService.as
+3 -4
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,12 +22,11 @@
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.
*/ */
aslib/src/main/as/com/threerings/stage/data/DefaultColorUpdate.as → src/main/as/com/threerings/stage/data/DefaultColorUpdate.as
+2 -2
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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.SceneModel;
import com.threerings.whirled.data.SceneUpdate; import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.data.SceneModel;
/** /**
* Update to change the default colorization for objects in a scene which * Update to change the default colorization for objects in a scene which
aslib/src/main/as/com/threerings/stage/data/ModifyObjectsUpdate.as → src/main/as/com/threerings/stage/data/ModifyObjectsUpdate.as
+3 -4
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,9 @@ 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.miso.data.ObjectInfo;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate; import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.data.SceneModel;
import com.threerings.miso.data.ObjectInfo;
/** /**
* 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
aslib/src/main/as/com/threerings/stage/data/StageLocation.as → src/main/as/com/threerings/stage/data/StageLocation.as
+5 -6
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,18 +21,17 @@
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.whirled.spot.data.Location; import com.threerings.io.SimpleStreamableObject;
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.
aslib/src/main/as/com/threerings/stage/data/StageMisoSceneModel.as → src/main/as/com/threerings/stage/data/StageMisoSceneModel.as
+5 -6
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,13 @@
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;
/** /**
aslib/src/main/as/com/threerings/stage/data/StageOccupantInfo.as → src/main/as/com/threerings/stage/data/StageOccupantInfo.as
+5 -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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,11 @@
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.
aslib/src/main/as/com/threerings/stage/data/StageScene.as → src/main/as/com/threerings/stage/data/StageScene.as
+2 -4
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,8 @@
package com.threerings.stage.data { package com.threerings.stage.data {
import com.threerings.util.Iterator;
import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceConfig;
import com.threerings.util.Iterator;
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;
aslib/src/main/as/com/threerings/stage/data/StageSceneConfig.as → src/main/as/com/threerings/stage/data/StageSceneConfig.as
+4 -3
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,11 @@
package com.threerings.stage.data { package com.threerings.stage.data {
import com.threerings.crowd.client.PlaceController;
import com.threerings.crowd.data.PlaceConfig; 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.stage.client.StageSceneController;
import com.threerings.crowd.client.PlaceController;
/** /**
* Place configuration for the main isometric scenes in Stage. * Place configuration for the main isometric scenes in Stage.
aslib/src/main/as/com/threerings/stage/data/StageSceneMarshaller.as → src/main/as/com/threerings/stage/data/StageSceneMarshaller.as
+3 -5
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,13 +22,11 @@
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;
/** /**
aslib/src/main/as/com/threerings/stage/data/StageSceneModel.as → src/main/as/com/threerings/stage/data/StageSceneModel.as
+3 -5
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,11 @@ 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.data.SceneModel;
import com.threerings.whirled.spot.data.SpotSceneModel; import com.threerings.whirled.spot.data.SpotSceneModel;
import com.threerings.whirled.data.SceneModel;
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
aslib/src/main/as/com/threerings/stage/data/StageSceneObject.as → src/main/as/com/threerings/stage/data/StageSceneObject.as
+1 -2
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,7 +22,6 @@
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
aslib/src/main/as/com/threerings/stage/util/StageContext.as → src/main/as/com/threerings/stage/util/StageContext.as
+1 -2
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,7 +22,6 @@
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;
/** /**
aslib/src/main/as/com/threerings/whirled/client/PendingData.as → src/main/as/com/threerings/whirled/client/PendingData.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/client/SceneController.as → src/main/as/com/threerings/whirled/client/SceneController.as
+8 -10
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,14 +46,6 @@ 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
@@ -83,7 +75,13 @@ public /*abstract*/ class SceneController extends PlaceController
} }
/** Used to listen for scene updates. */ /** Used to listen for scene updates. */
protected var _updateListener :MessageListener; protected var _updateListener :MessageListener = new MessageAdapter(
function (event :MessageEvent) :void {
if (event.getName() == SceneCodes.SCENE_UPDATE) {
sceneUpdated(event.getArgs()[0] as SceneUpdate);
}
}
);
protected var _wctx :WhirledContext; protected var _wctx :WhirledContext;
} }
aslib/src/main/as/com/threerings/whirled/client/SceneDecoder.as → src/main/as/com/threerings/whirled/client/SceneDecoder.as
+1 -2
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,7 +22,6 @@
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;
/** /**
aslib/src/main/as/com/threerings/whirled/client/SceneDirector.as → src/main/as/com/threerings/whirled/client/SceneDirector.as
+4 -4
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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(function() :void { addPendingForcedMove(new function() :void {
forcedMove(sceneId); forcedMove(sceneId);
}); });
} }
aslib/src/main/as/com/threerings/whirled/client/SceneDirector_MoveHandler.as → src/main/as/com/threerings/whirled/client/SceneDirector_MoveHandler.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/client/SceneReceiver.as → src/main/as/com/threerings/whirled/client/SceneReceiver.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/client/SceneService.as → src/main/as/com/threerings/whirled/client/SceneService.as
+2 -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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,6 +21,7 @@
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;
/** /**
aslib/src/main/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as → src/main/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as
+3 -6
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,9 @@
package com.threerings.whirled.client { package com.threerings.whirled.client {
import com.threerings.io.TypedArray;
import com.threerings.presents.client.InvocationService_InvocationListener;
import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceConfig;
import com.threerings.io.TypedArray;
import com.threerings.presents.client.InvocationService_InvocationListener;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
/** /**
aslib/src/main/as/com/threerings/whirled/client/persist/SceneRepository.as → src/main/as/com/threerings/whirled/client/persist/SceneRepository.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/data/AuxModel.as → src/main/as/com/threerings/whirled/data/AuxModel.as
+3 -3
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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.io.Streamable;
import com.threerings.util.Cloneable; import com.threerings.util.Cloneable;
import com.threerings.io.Streamable;
/** /**
* An interface that must be implemented by auxiliary scene models. * An interface that must be implemented by auxiliary scene models.
*/ */
aslib/src/main/as/com/threerings/whirled/data/DefaultSceneConfig.as → src/main/as/com/threerings/whirled/data/DefaultSceneConfig.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/data/Scene.as → src/main/as/com/threerings/whirled/data/Scene.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/data/SceneCodes.as → src/main/as/com/threerings/whirled/data/SceneCodes.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/data/SceneImpl.as → src/main/as/com/threerings/whirled/data/SceneImpl.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/data/SceneMarshaller.as → src/main/as/com/threerings/whirled/data/SceneMarshaller.as
+3 -4
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,9 @@
package com.threerings.whirled.data { package com.threerings.whirled.data {
import com.threerings.util.Integer; import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.util.Integer;
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;
aslib/src/main/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as → src/main/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as
+3 -6
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,9 @@
package com.threerings.whirled.data { package com.threerings.whirled.data {
import com.threerings.io.TypedArray;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceConfig;
import com.threerings.io.TypedArray;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
import com.threerings.whirled.client.SceneService_SceneMoveListener; import com.threerings.whirled.client.SceneService_SceneMoveListener;
/** /**
aslib/src/main/as/com/threerings/whirled/data/SceneModel.as → src/main/as/com/threerings/whirled/data/SceneModel.as
+4 -4
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/data/SceneObject.as → src/main/as/com/threerings/whirled/data/SceneObject.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/data/ScenePlace.as → src/main/as/com/threerings/whirled/data/ScenePlace.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/data/SceneUpdate.as → src/main/as/com/threerings/whirled/data/SceneUpdate.as
+3 -2
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,12 +23,13 @@ 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;
/** /**
aslib/src/main/as/com/threerings/whirled/spot/client/SpotSceneController.as → src/main/as/com/threerings/whirled/spot/client/SpotSceneController.as
+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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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
aslib/src/main/as/com/threerings/whirled/spot/client/SpotSceneDirector.as → src/main/as/com/threerings/whirled/spot/client/SpotSceneDirector.as
+5 -5
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-2012 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2011 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,6 +20,7 @@
// 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;
@@ -27,6 +28,7 @@ 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;
@@ -36,7 +38,6 @@ 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;
@@ -45,6 +46,8 @@ 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;
@@ -53,7 +56,6 @@ 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.
@@ -461,9 +463,7 @@ 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;

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