Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	build.gradle
	src/itdelatrisu/opsu/ErrorHandler.java
	src/itdelatrisu/opsu/GameImage.java
	src/itdelatrisu/opsu/Opsu.java
	src/itdelatrisu/opsu/OptionGroup.java
	src/itdelatrisu/opsu/Options.java
	src/itdelatrisu/opsu/Utils.java
	src/itdelatrisu/opsu/audio/SoundController.java
	src/itdelatrisu/opsu/beatmap/Beatmap.java
	src/itdelatrisu/opsu/beatmap/OszUnpacker.java
	src/itdelatrisu/opsu/downloads/DownloadNode.java
	src/itdelatrisu/opsu/objects/curves/EqualDistanceMultiCurve.java
	src/itdelatrisu/opsu/replay/ReplayImporter.java
	src/itdelatrisu/opsu/states/ButtonMenu.java
	src/itdelatrisu/opsu/states/MainMenu.java
	src/itdelatrisu/opsu/states/SongMenu.java
	src/itdelatrisu/opsu/ui/Fonts.java

.gitignore

@@ -1,4 +1,4 @@
-/ReplayImport/
+/Import/
 /Replays/
 /Screenshots/
 /Skins/

CREDITS.md

@@ -1,6 +1,11 @@
 Credits
 =======
 
+This software was created by Jeffrey Han ([@itdelatrisu](https://github.com/itdelatrisu/)).
+
+All game concepts and designs are based on work by [osu!](https://osu.ppy.sh/)
+developer Dean Herbert ([@ppy](https://github.com/ppy)).
+
 Images
 ------
 The images included in opsu! belong to their respective authors.
@@ -24,7 +29,7 @@ The images included in opsu! belong to their respective authors.
 
 Projects
 --------
-The following projects were referenced in creating opsu!:
+The following projects were referenced in the initial creation of opsu!:
 
 * "Wojtkosu" - Wojtek Kowaluk (https://osu.ppy.sh/forum/t/97260)
 * "osu-parser" - nojhamster (https://github.com/nojhamster/osu-parser)

README.md

@@ -19,4 +19,3 @@ https://github.com/libgdx/libgdx/wiki/Deploying-your-application
 **This software is licensed under GNU GPL version 3.**
 You can find the full text of the license [here](LICENSE).
 
-

build.gradle

@@ -24,3 +24,4 @@ sourceSets {
 eclipse.project {
     name = appName + "-core"
 }
+

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>itdelatrisu</groupId>
 	<artifactId>opsu</artifactId>
-	<version>0.13.0</version>
+	<version>0.14.0</version>
 	<properties>
 		<version>${project.version}</version>
 		<timestamp>${maven.build.timestamp}</timestamp>
@@ -142,17 +142,16 @@
 					<groupId>org.lwjgl.lwjgl</groupId>
 					<artifactId>lwjgl</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.jcraft</groupId>
+					<artifactId>jorbis</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>javax.jnlp</groupId>
 					<artifactId>jnlp-api</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.jcraft</groupId>
-			<artifactId>jorbis</artifactId>
-			<version>0.0.17</version>
-		</dependency>
 		<dependency>
 			<groupId>net.lingala.zip4j</groupId>
 			<artifactId>zip4j</artifactId>
@@ -167,11 +166,17 @@
 			<groupId>com.googlecode.soundlibs</groupId>
 			<artifactId>mp3spi</artifactId>
 			<version>1.9.5.4</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.googlecode.soundlibs</groupId>
+					<artifactId>tritonus-share</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.googlecode.soundlibs</groupId>
-			<artifactId>tritonus-share</artifactId>
-			<version>0.3.7.4</version>
+			<artifactId>tritonus-all</artifactId>
+			<version>0.3.7.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.xerial</groupId>

src/itdelatrisu/opsu/Container.java

@@ -1,6 +1,6 @@
 /*
  * opsu! - an open-source osu! client
- * Copyright (C) 2014, 2015, 2016 Jeffrey Han
+ * Copyright (C) 2014-2017 Jeffrey Han
  *
  * opsu! is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/itdelatrisu/opsu/ErrorHandler.java

@@ -1,6 +1,6 @@
 /*
  * opsu! - an open-source osu! client
- * Copyright (C) 2014, 2015, 2016 Jeffrey Han
+ * Copyright (C) 2014-2017 Jeffrey Han
  *
  * opsu! is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,8 +51,8 @@ public class ErrorHandler {
 
 	/** Error popup description text. */
 	private static final String
-		desc  = "opsu! has encountered an error.",
-		descReport = "opsu! has encountered an error. Please report this!";
+		desc = "An error occurred. :(",
+		descReport = "Something bad happened. Please report this!";
 
 	/** Error popup button options. */
 	private static final String[]
@@ -177,27 +177,37 @@ else if (n == 1)
 	}
 
 	/**
-	 * Returns the issue reporting URI.
-	 * This will auto-fill the report with the relevant information if possible.
-	 * @param error a description of the error
-	 * @param e the exception causing the error
-	 * @param trace the stack trace
-	 * @return the created URI
+	 * Returns the issue reporting URI with the given title and body.
+	 * @param title the issue title
+	 * @param body the issue body
+	 * @return the encoded URI
+	 */
+	public static URI getIssueURI(String title, String body) {
+		try {
+			return URI.create(String.format(OpsuConstants.ISSUES_URL,
+				URLEncoder.encode(title, "UTF-8"),
+				URLEncoder.encode(body, "UTF-8"))
+			);
+		} catch (UnsupportedEncodingException e) {
+			Log.warn("URLEncoder failed to encode the auto-filled issue report URL.");
+			return URI.create(String.format(OpsuConstants.ISSUES_URL, "", ""));
+		}
+	}
+
+	/**
+	 * Returns environment information formatted in markdown (for issue reports).
 	 */
 	/*
-	private static URI getIssueURI(String error, Throwable e, String trace) {
-		
-		// generate report information
-						String issueTitle = (error != null) ? error : e.getMessage();
-						StringBuilder sb = new StringBuilder();
+	public static String getEnvironmentInfoForIssue() {
+		StringBuilder sb = new StringBuilder();
 		try {
 			// read version and build date from version file, if possible
-						Properties props = new Properties();
-						props.load(ResourceLoader.getResourceAsStream(Options.VERSION_FILE));
-						String version = props.getProperty("version");
-						if (version != null && !version.equals("${pom.version}")) {
-							sb.append("**Version:** ");
-							sb.append(version);
+			Properties props = new Properties();
+			props.load(ResourceLoader.getResourceAsStream(Options.VERSION_FILE));
+			String version = props.getProperty("version");
+			if (version != null && !version.equals("${pom.version}")) {
+				sb.append("**Version:** ");
+				sb.append(version);
 				String hash = Utils.getGitHash();
 				if (hash != null) {
 					sb.append(" (");
@@ -225,10 +235,26 @@ private static URI getIssueURI(String error, Throwable e, String trace) {
 		sb.append(System.getProperty("java.version"));
 		sb.append('\n');
 		if (glString != null) {
-			sb.append("**OpenGL Version:** ");
+			sb.append("**OpenGL version:** ");
 			sb.append(glString);
 			sb.append('\n');
 		}
+		return sb.toString();
+	}
+
+	/**
+	 * Returns the issue reporting URI.
+	 * This will auto-fill the report with the relevant information if possible.
+	 * @param error a description of the error
+	 * @param e the exception causing the error
+	 * @param trace the stack trace
+	 * @return the created URI
+	 */
+	private static URI getIssueURI(String error, Throwable e, String trace) {
+		// generate report information
+		String issueTitle = (error != null) ? error : e.getMessage();
+		StringBuilder sb = new StringBuilder();
+		sb.append(getEnvironmentInfoForIssue());
 		if (error != null) {
 			sb.append("**Error:** `");
 			sb.append(error);
@@ -242,14 +268,7 @@ private static URI getIssueURI(String error, Throwable e, String trace) {
 		}
 
 		// return auto-filled URI
-		try {
-			return URI.create(String.format(Options.ISSUES_URL,
-					URLEncoder.encode(issueTitle, "UTF-8"),
-					URLEncoder.encode(sb.toString(), "UTF-8")));
-		} catch (UnsupportedEncodingException e1) {
-			Log.warn("URLEncoder failed to encode the auto-filled issue report URL.");
-			return URI.create(String.format(Options.ISSUES_URL, "", ""));
-		}
+		return getIssueURI(issueTitle, sb.toString());
 
 	}*/
 }