Merge remote-tracking branch 'origin/master'

.classpath

@@ -1,16 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

INSTALL.md

@@ -0,0 +1,7 @@
+# How to install Boulevard Combattant?
+
+To run Boulevard Combattant, simply get the [latest release](https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat/-/releases) and run the executable JAR. You need Java >8 installed on your computer. All libraries are packaged within the JAR.
+
+# How to build Boulevard Combattant?
+
+This project is managed via Maven. To build, simply clone the project, and run `mvn package` in the root directory of the cloned project. A JAR will be generated in `${project_folder}/target`. This project can also be imported in your prefered IDE. To run the game, run the Main class located in the default package.

README.md

@@ -7,6 +7,18 @@ Developed in the context of an end-of-year project at ISTIC (2020/2021)
 
 ![In-Game screenshot](docs/game_screenshot.png)
 
+Currently, only a single character is playable. However, the engine allows for easy expansion in the future.
+
+## How to play?
+
+Set your preferences in the launcher window, plug-in two DirectInput or XInput capable controllers in your computer, and press start! Use the left analog stick or the D-Pad to move, and the four face buttons for kick and punch, neo-geo style.
+
+Blue, the main character, knows some advanced martial arts techniques, which can be unlocked through special combinaisons ;).
+
+## How to install / build?
+
+Please refer to [INSTALL.md](https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat/-/blob/master/INSTALL.md).
+
 ## Technologies used by the project
 
 * Java
@@ -14,7 +26,7 @@ Developed in the context of an end-of-year project at ISTIC (2020/2021)
 * OpenAL via [lwjgl](https://www.lwjgl.org/)
 * [JavaFX](https://openjfx.io)
 
-## Contributors
+## Authors
 
 * [François AUTIN](https://gitlab.istic.univ-rennes1.fr/fautin)
 * [Victor AZRA](https://gitlab.istic.univ-rennes1.fr/vazra)

pom.xml

@@ -21,7 +21,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.1</version>
 				<configuration>
-					<release>11</release>
+					<release>8</release>
 				</configuration>
 			</plugin>
 			
@@ -29,17 +29,42 @@
 		    	<!-- Build an executable JAR -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.2.0</version>
 				<configuration>
 					<archive>
 						<manifest>
+							<mainClass>Main</mainClass>
 							<addClasspath>true</addClasspath>
 							<classpathPrefix>lib/</classpathPrefix>
-							<mainClass>Main</mainClass>
 						</manifest>
 					</archive>
 				</configuration>
 			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.1.1</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>Main</mainClass>
+						</manifest>
+					</archive>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 
 		</plugins>
 

src/main/java/gameplay/match/match.java

@@ -397,10 +397,19 @@ public class match {
 			case 21:
 				try {
 					handleThrows(p1, p2);
-					handleThrows(p2,p1);
+				
 				} catch (IndexOutOfBoundsException e) {}
 				try {
 					handleHits(p1, p2, inputsP2);
+			
+				}catch (IndexOutOfBoundsException e) {};
+				
+				try {
+			
+					handleThrows(p2,p1);
+				} catch (IndexOutOfBoundsException e) {}
+				try {
+					
 					handleHits(p2, p1, inputsP1);
 				}catch (IndexOutOfBoundsException e) {};
 				acCode = 22;