Compare commits
18 Commits
vilya-1.6
...
vilya-1.7.1
| Author | SHA1 | Date | |
|---|---|---|---|
| d4a1665550 | |||
| 4b3598093c | |||
| b23d91cfd4 | |||
| 279206ce88 | |||
| 1f49dd6c40 | |||
| 44928f4084 | |||
| 865c06d916 | |||
| f6fd0d2cb5 | |||
| 702c2d697f | |||
| 8bbdabe5d6 | |||
| 074ef440b8 | |||
| 486d4c80b1 | |||
| 5a6a960cd9 | |||
| fe05edab42 | |||
| a0e8a23b9d | |||
| 968fb80a7b | |||
| 84b4ef98b4 | |||
| cbaaa514e1 |
@@ -0,0 +1 @@
|
|||||||
|
*/target/
|
||||||
+19
@@ -0,0 +1,19 @@
|
|||||||
|
sudo: false
|
||||||
|
|
||||||
|
language: java
|
||||||
|
|
||||||
|
jdk:
|
||||||
|
- openjdk7
|
||||||
|
- oraclejdk8
|
||||||
|
|
||||||
|
branches:
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- '$HOME/.m2/repository'
|
||||||
|
|
||||||
|
script:
|
||||||
|
- mvn -B test
|
||||||
|
- rm -rf $HOME/.m2/repository/com/threerings/vilya*
|
||||||
+3
-29
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.threerings</groupId>
|
<groupId>com.threerings</groupId>
|
||||||
<artifactId>vilya-parent</artifactId>
|
<artifactId>vilya-parent</artifactId>
|
||||||
<version>1.6</version>
|
<version>1.7-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>vilyalib</artifactId>
|
<artifactId>vilyalib</artifactId>
|
||||||
@@ -13,16 +13,8 @@
|
|||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>flexlib-repo</id>
|
<id>flex-mojos-repository</id>
|
||||||
<url>http://maven.ow2.org/maven2</url>
|
<url>http://repository.sonatype.org/content/groups/flexgroup</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>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
@@ -31,24 +23,6 @@
|
|||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<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>
|
<dependency>
|
||||||
<groupId>com.threerings</groupId>
|
<groupId>com.threerings</groupId>
|
||||||
<artifactId>nenyalib</artifactId>
|
<artifactId>nenyalib</artifactId>
|
||||||
|
|||||||
+6
-6
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.threerings</groupId>
|
<groupId>com.threerings</groupId>
|
||||||
<artifactId>vilya-parent</artifactId>
|
<artifactId>vilya-parent</artifactId>
|
||||||
<version>1.6</version>
|
<version>1.7.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>vilya</artifactId>
|
<artifactId>vilya</artifactId>
|
||||||
@@ -16,24 +16,24 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.threerings</groupId>
|
<groupId>com.threerings</groupId>
|
||||||
<artifactId>ooo-util</artifactId>
|
<artifactId>ooo-util</artifactId>
|
||||||
<version>1.4.1</version>
|
<version>1.5</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.threerings</groupId>
|
<groupId>com.threerings</groupId>
|
||||||
<artifactId>narya</artifactId>
|
<artifactId>narya</artifactId>
|
||||||
<version>1.15</version>
|
<version>1.17</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.threerings</groupId>
|
<groupId>com.threerings</groupId>
|
||||||
<artifactId>nenya</artifactId>
|
<artifactId>nenya</artifactId>
|
||||||
<version>1.6</version>
|
<version>1.7</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- optional dependencies -->
|
<!-- optional dependencies -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.threerings</groupId>
|
<groupId>com.threerings</groupId>
|
||||||
<artifactId>nenya-tools</artifactId>
|
<artifactId>nenya-tools</artifactId>
|
||||||
<version>1.6</version>
|
<version>1.7</version>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.samskivert</groupId>
|
<groupId>com.samskivert</groupId>
|
||||||
<artifactId>depot</artifactId>
|
<artifactId>depot</artifactId>
|
||||||
<version>1.7</version>
|
<version>1.8</version>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -238,6 +238,11 @@ public class GameObject extends PlaceObject
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public void sendPlayerReady () {
|
||||||
|
manager.invoke("playerReady");
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used by {@link #isActivePlayer} to determine if the supplied status is associated with an
|
* Used by {@link #isActivePlayer} to determine if the supplied status is associated with an
|
||||||
* active player (one that has not resigned from the game and/or left the game room).
|
* active player (one that has not resigned from the game and/or left the game room).
|
||||||
|
|||||||
@@ -22,9 +22,12 @@
|
|||||||
package com.threerings.whirled.spot.data;
|
package com.threerings.whirled.spot.data;
|
||||||
|
|
||||||
import java.awt.Rectangle;
|
import java.awt.Rectangle;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
import com.samskivert.util.StringUtil;
|
import com.samskivert.util.StringUtil;
|
||||||
|
|
||||||
|
import com.threerings.io.ObjectInputStream;
|
||||||
|
import com.threerings.io.ObjectOutputStream;
|
||||||
import com.threerings.util.ActionScript;
|
import com.threerings.util.ActionScript;
|
||||||
|
|
||||||
import com.threerings.presents.dobj.DSet;
|
import com.threerings.presents.dobj.DSet;
|
||||||
@@ -48,6 +51,31 @@ public class Cluster extends Rectangle
|
|||||||
return _key;
|
return _key;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Writes our streamable fields. This is needed because we can no longer reflectively access the
|
||||||
|
* internals of java.awt.Rectangle.
|
||||||
|
*/
|
||||||
|
public void writeObject (ObjectOutputStream out)
|
||||||
|
throws IOException
|
||||||
|
{
|
||||||
|
out.writeInt(this.x);
|
||||||
|
out.writeInt(this.y);
|
||||||
|
out.writeInt(this.width);
|
||||||
|
out.writeInt(this.height);
|
||||||
|
out.writeInt(this.clusterOid);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads our streamable fields. This is needed because we can no longer reflectively access the
|
||||||
|
* internals of java.awt.Rectangle.
|
||||||
|
*/
|
||||||
|
public void readObject (ObjectInputStream in)
|
||||||
|
throws IOException, ClassNotFoundException
|
||||||
|
{
|
||||||
|
this.setBounds(in.readInt(), in.readInt(), in.readInt(), in.readInt());
|
||||||
|
this.clusterOid = in.readInt();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ActionScript(omit=true)
|
@ActionScript(omit=true)
|
||||||
public boolean equals (Object other)
|
public boolean equals (Object other)
|
||||||
|
|||||||
@@ -95,9 +95,9 @@
|
|||||||
providing top-down 2D display of its scenes. <br>
|
providing top-down 2D display of its scenes. <br>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<center>
|
<p>
|
||||||
<img align="center" src="images/scene.png" alt="Example scene image">
|
<img src="images/scene.png" alt="Example scene image">
|
||||||
</center>
|
</p>
|
||||||
|
|
||||||
<p> The arrows would, of course, not be rendered but are shown to
|
<p> The arrows would, of course, not be rendered but are shown to
|
||||||
indicate the presence of locations (and portals) and their
|
indicate the presence of locations (and portals) and their
|
||||||
|
|||||||
@@ -1,28 +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>
|
||||||
<parent>
|
|
||||||
<groupId>org.sonatype.oss</groupId>
|
|
||||||
<artifactId>oss-parent</artifactId>
|
|
||||||
<version>7</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<groupId>com.threerings</groupId>
|
<groupId>com.threerings</groupId>
|
||||||
<artifactId>vilya-parent</artifactId>
|
<artifactId>vilya-parent</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>1.6</version>
|
<version>1.7.1</version>
|
||||||
|
|
||||||
<name>Vilya</name>
|
<name>Vilya</name>
|
||||||
<description>Facilities for making networked multiplayer games.</description>
|
<description>Facilities for making networked multiplayer games.</description>
|
||||||
<url>http://github.com/threerings/vilya/</url>
|
<url>https://github.com/threerings/vilya/</url>
|
||||||
<issueManagement>
|
<issueManagement>
|
||||||
<url>http://github.com/threerings/vilya/issues</url>
|
<url>https://github.com/threerings/vilya/issues</url>
|
||||||
</issueManagement>
|
</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>
|
||||||
<url>http://www.fsf.org/licensing/licenses/lgpl.txt</url>
|
<url>https://www.fsf.org/licensing/licenses/lgpl.txt</url>
|
||||||
<distribution>repo</distribution>
|
<distribution>repo</distribution>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
@@ -38,13 +33,12 @@
|
|||||||
<scm>
|
<scm>
|
||||||
<connection>scm:git:git://github.com/threerings/vilya.git</connection>
|
<connection>scm:git:git://github.com/threerings/vilya.git</connection>
|
||||||
<developerConnection>scm:git:git@github.com:threerings/vilya.git</developerConnection>
|
<developerConnection>scm:git:git@github.com:threerings/vilya.git</developerConnection>
|
||||||
<url>http://github.com/threerings/vilya/</url>
|
<url>https://github.com/threerings/vilya/</url>
|
||||||
|
<tag>vilya-1.7.1</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>core</module>
|
<module>core</module>
|
||||||
<!--<module>tools</module>-->
|
|
||||||
<module>aslib</module>
|
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
@@ -52,10 +46,9 @@
|
|||||||
<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>3.13.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.5</source>
|
<release>10</release>
|
||||||
<target>1.5</target>
|
|
||||||
<fork>true</fork>
|
<fork>true</fork>
|
||||||
<showDeprecation>true</showDeprecation>
|
<showDeprecation>true</showDeprecation>
|
||||||
<showWarnings>true</showWarnings>
|
<showWarnings>true</showWarnings>
|
||||||
@@ -87,12 +80,6 @@
|
|||||||
<quiet>true</quiet>
|
<quiet>true</quiet>
|
||||||
<show>public</show>
|
<show>public</show>
|
||||||
<additionalparam>-Xdoclint:all -Xdoclint:-missing</additionalparam>
|
<additionalparam>-Xdoclint:all -Xdoclint:-missing</additionalparam>
|
||||||
<links>
|
|
||||||
<link>http://samskivert.github.com/samskivert/apidocs/</link>
|
|
||||||
<link>http://threerings.github.com/depot/apidocs/</link>
|
|
||||||
<link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
|
|
||||||
<link>http://www.jajakarta.org/ant/ant-1.6.1/docs/ja/manual/api/</link>
|
|
||||||
</links>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
@@ -105,10 +92,27 @@
|
|||||||
<artifactId>maven-deploy-plugin</artifactId>
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
<version>2.5</version>
|
<version>2.5</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.sonatype.central</groupId>
|
||||||
|
<artifactId>central-publishing-maven-plugin</artifactId>
|
||||||
|
<version>0.8.0</version>
|
||||||
|
<extensions>true</extensions>
|
||||||
|
<configuration>
|
||||||
|
<publishingServerId>central</publishingServerId>
|
||||||
|
<autoPublish>true</autoPublish>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
|
<!-- build with mvn -Paslib to build the ActionScript code; the Maven ActionScript plugins
|
||||||
|
are old and broken, so I've disabled this by default -->
|
||||||
|
<profile>
|
||||||
|
<id>aslib</id>
|
||||||
|
<modules><module>aslib</module></modules>
|
||||||
|
</profile>
|
||||||
|
|
||||||
<profile>
|
<profile>
|
||||||
<id>eclipse</id>
|
<id>eclipse</id>
|
||||||
<activation>
|
<activation>
|
||||||
@@ -151,16 +155,42 @@
|
|||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
<profile>
|
<profile>
|
||||||
<id>release-sign-artifacts</id>
|
<id>release-extras</id>
|
||||||
<activation>
|
<activation>
|
||||||
<property><name>performRelease</name><value>true</value></property>
|
<property><name>performRelease</name><value>true</value></property>
|
||||||
</activation>
|
</activation>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
|
<version>2.1.2</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>attach-sources</id>
|
||||||
|
<goals>
|
||||||
|
<goal>jar-no-fork</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<version>2.9.1</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>attach-javadocs</id>
|
||||||
|
<goals>
|
||||||
|
<goal>jar</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-gpg-plugin</artifactId>
|
<artifactId>maven-gpg-plugin</artifactId>
|
||||||
<version>1.1</version>
|
<version>1.5</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>sign-artifacts</id>
|
<id>sign-artifacts</id>
|
||||||
|
|||||||
Reference in New Issue
Block a user