Skip to content

Release/2.0.0 #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cmastudios wants to merge 64 commits into
base: master
Choose a base branch
from
Draft

Release/2.0.0 #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
8d908c1
Merge branch 'release/1.9' into develop
Jun 8, 2016
53c683a
Bumped version to 1.10-SNAPSHOT for development
Jun 8, 2016
5c992c9
Set player max health
Jun 15, 2016
13e5d38
Fix #840, keep health in bounds with attributes
Jul 16, 2017
334620e
Fix #839, don't save armor slots twice
Jul 16, 2017
66445eb
Replace deprecated Bukkit functions
Jul 18, 2017
00ec38c
Remove broken maven repos, bug fixes
Jul 19, 2017
c5adfa7
Fix #838, prevent growth from occupying structures
Jul 19, 2017
9c3c43c
Add chinese support, update other translations
Jul 20, 2017
b772b71
Fix #750, rotate lobbies
Jul 20, 2017
b7138d6
Fix #201, prevent opening zone edge chests if not playing
Jul 20, 2017
ef26173
Fix #320, add permission when playing in a zone
Jul 20, 2017
b7cf696
Fix #437, add team config 'borderdrop' to permit item drop near walls
Jul 20, 2017
ddfa24f
Fix #498, prevent wolves from teleporting into warzones
Jul 20, 2017
372576a
Fix #74, add blacklist for items brought into zone
Jul 20, 2017
200bb5a
Fix #563. Capture points in Minecraft!!!
Jul 21, 2017
a4038c6
Fix #268, save/load paintings and item frames from DB
Jul 24, 2017
d3b5795
Fix #178, allow players to sign up for games
Jul 24, 2017
994fec5
When using respawn timer, lock players in spawn with potions
Jul 25, 2017
9135e5b
Chest UI for War
Jul 27, 2017
57d29f4
Fix issue with certain translations
Jul 28, 2017
0f09410
Fix fire never going out
Jul 28, 2017
8ce9586
Capture point improvements
Jul 28, 2017
910310a
Update WarzoneConfig.java
Super0JET0 Jul 28, 2017
e45b0eb
Update TeamConfig.java
Super0JET0 Jul 28, 2017
f1caca7
Merge remote-tracking branch 'jared/patch-2' into develop
Jul 28, 2017
f6b41bd
Allow changing all config options from UI
Jul 29, 2017
4f00bef
Add reset zone and restore defaults settings to UI
Jul 29, 2017
eb7b600
closes gh-365 gh-392 Preparation time
Feb 22, 2012
22cbba6
Fix #412, auto team balance for autoassign warzones
Jul 29, 2017
821c66c
Fix #790, add playercount and switching scoreboards
Jul 29, 2017
47be664
Allow editing loadouts from chest UI
Jul 29, 2017
0babe82
Fix a lot of errors in updating to 1.13
Ultra03 Nov 1, 2018
0a02e25
Fix renamed paintings
cmastudios Nov 19, 2018
69a148f
Drop all War backwards compatibility
cmastudios Nov 19, 2018
4e83ffa
Fix some deprecated stuff
cmastudios Nov 19, 2018
bca78e5
Bump War major version due to breaking changes
cmastudios Nov 19, 2018
7f7babf
Fix SQL bug
cmastudios Nov 19, 2018
db7a786
Fix wrong color for team gate
cmastudios Nov 19, 2018
5e4f002
Fix UI glitches with WarHub and Dye color updates
cmastudios Nov 19, 2018
a017493
Update WorldEdit Integration
cmastudios Nov 19, 2018
99b6bdb
Dumb WorldEdit unstable API
cmastudios Nov 19, 2018
8b76d20
Remove deprecated legacy materials
cmastudios Nov 19, 2018
81f839a
Merge pull request #845 from Ultra03/develop
Nov 20, 2018
6b90371
Drop Spoutcraft support
cmastudios Nov 20, 2018
b24e495
Drop TagAPI support
cmastudios Nov 20, 2018
2af9379
Zone database structure update
cmastudios Nov 20, 2018
87cea1a
Zone maker UUIDs, remove Tommy meme, make new format more backwards-c…
cmastudios Nov 20, 2018
03c9ad9
Update development builds link
cmastudios Nov 25, 2018
0dde3ac
Save/load tile entities (chests, skulls, etc)
Nov 28, 2018
66ef1b9
Fix saving zonemaker list updates
Nov 28, 2018
3470a0c
Merge pull request #846 from taoneill/feature/113savefiles
Nov 28, 2018
26acfa6
War v2.0.0 release candidate 1
Nov 28, 2018
c2c864d
MCStats is dead
Nov 30, 2018
cfe2ad3
Long live bStats
Nov 30, 2018
374ec7b
Build against WorldEdit 7.0.0-beta-03
Dec 5, 2018
97052de
Remove more deprecation, RC2
Dec 5, 2018
1ee0bdf
Make command usage messages more useful
Dec 10, 2018
9767676
Update translations
Dec 10, 2018
7ee7b6b
Hide item attributes in UIs
Dec 10, 2018
ce3ab69
Give War Admins some UI launcher items
Dec 10, 2018
b717e6b
1.14 block support
Nov 8, 2019
b27c02c
Build against Spigot 1.16 (RIP org.bukkit.bukkit?)
cmastudios Oct 28, 2020
f71a55e
Fix ChestUI issue #859
cmastudios Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ Features
- Other game types: capture points and explosive-based objectives
- Up to 16 teams!
- Tons of customizable game rules, item loadouts and options (see [Instructions](http://war.tommytony.com/instructions))
- SpoutPlugin integration for an enriched UI experience during combat for Spoutcraft users (http://spout.org)

Downloads
---------
All official releases are at https://github.com/taoneill/war/downloads.

Dev Builds
----------
Continuous integration builds are available at http://ci.tommytony.com/job/War.
Development builds are available at https://cmastudios.me/cgi-bin/war.py.

Author
------
Expand All @@ -34,4 +33,4 @@ Reach him at taoneill@tommytony.com.

License
-------
War is licensed loosely under the MIT License (but still comes with the weird baggage of Bukkit licensing)
War is licensed loosely under the MIT License (but still comes with the weird baggage of Bukkit licensing)
92 changes: 37 additions & 55 deletions war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,72 +3,59 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.tommytony</groupId>
<artifactId>war</artifactId>
<version>1.9</version>
<version>2.0.0-RC6-SNAPSHOT</version>
<packaging>jar</packaging>
<name>War</name>
<url>http://war.tommytony.com</url>
<description>Minecraft PVP arenas (called warzones) for a fast-paced and structured PVP experience with TDM, CTF and more!</description>
<prerequisites>
<maven>2.2.1</maven>
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>cma-repo</id>
<url>http://ftp.cmastudios.me/maven/</url>
<id>maven.cmastudios.me</id>
<url>https://maven.cmastudios.me/</url>
</repository>
<repository>
<id>tagapi-repo</id>
<url>http://repo.kitteh.org/content/repositories/public/</url>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>sk89q-repo</id>
<url>http://maven.sk89q.com/repo/</url>
</repository>
<repository>
<id>mcstats</id>
<url>http://repo.mcstats.org/content/repositories/public/</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
<url>https://maven.sk89q.com/repo/</url>
</repository>
</repositories>
<issueManagement>
<system>Github issues</system>
<url>https://github.com/taoneill/war/issues</url>
</issueManagement>
<ciManagement>
<system>Jenkins</system>
<url>http://ci.tommytony.com</url>
</ciManagement>
<scm>
<connection>scm:git:git://github.com/taoneill/war.git</connection>
<developerConnection>scm:git:git@github.com:taoneill/war.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/taoneill/war</url>
</scm>
<distributionManagement>
<repository>
<id>maven.cmastudios.me</id>
<url>s3://maven.cmastudios.me/</url>
</repository>
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.7.1</version>
<version>3.1.0</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -78,13 +65,13 @@
<configuration>
<artifactSet>
<includes>
<include>org.mcstats.bukkit:metrics</include>
<include>org.bstats:bstats-bukkit</include>
</includes>
</artifactSet>
<minimizeJar>false</minimizeJar>
<relocations>
<relocation>
<pattern>org.mcstats</pattern>
<pattern>org.bstats.bukkit</pattern>
<shadedPattern>com.tommytony.war.metrics</shadedPattern>
</relocation>
</relocations>
Expand All @@ -93,6 +80,13 @@
</executions>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.kuali.maven.wagons</groupId>
<artifactId>maven-s3-wagon</artifactId>
<version>1.2.1</version>
</extension>
</extensions>
<resources>
<resource>
<filtering>true</filtering>
Expand All @@ -101,29 +95,17 @@
</resources>
</build>
<dependencies>
<dependency>
<groupId>org.spout</groupId>
<artifactId>spoutplugin</artifactId>
<version>1.5.2-R1.0</version>
<scope>compile</scope>
<type>jar</type>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.9.4-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.kitteh</groupId>
<artifactId>tagapi</artifactId>
<version>2.7.1</version>
<scope>compile</scope>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.16.3-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand All @@ -133,21 +115,21 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldedit</artifactId>
<version>5.5.8</version>
<groupId>com.tommytony</groupId>
<artifactId>worldedit-bukkit</artifactId>
<version>7.0.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mcstats.bukkit</groupId>
<artifactId>metrics</artifactId>
<version>R8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.2.32</version>
</dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>1.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
Loading