From 7ae9af040d41b98e0711faa43ccc30a7c5f32508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Autin?= Date: Fri, 25 Jun 2021 04:44:02 +0200 Subject: [PATCH 1/5] Updated classpath and POM to allow for packaging of a fat jar --- .classpath | 24 ++++++++++++++++++++---- pom.xml | 31 ++++++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/.classpath b/.classpath index 2daff1b..6183517 100644 --- a/.classpath +++ b/.classpath @@ -1,16 +1,32 @@ - - + - + - + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 0d795e3..f6b292d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ maven-compiler-plugin 3.8.1 - 11 + 8 @@ -29,17 +29,42 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.0 + 3.2.0 + Main true lib/ - Main + + + org.apache.maven.plugins + maven-assembly-plugin + 3.1.1 + + + + Main + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + From 1f87e20877ec3ea6147e673f5ca610ec00abffd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Autin?= Date: Fri, 25 Jun 2021 03:29:02 +0000 Subject: [PATCH 2/5] Add INSTALL.md --- INSTALL.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 INSTALL.md diff --git a/INSTALL.md b/INSTALL.md new file mode 100644 index 0000000..88a9dd5 --- /dev/null +++ b/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. From 6984a8bd231023a6e3498d5c4b65596c13abc28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Autin?= Date: Fri, 25 Jun 2021 03:30:46 +0000 Subject: [PATCH 3/5] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 82ebbd6..dc6f1f5 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,10 @@ 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) +## How to install / build ? + +Please refer to [INSTALL.md](https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat/-/blob/master/INSTALL.md). + ## Contributors * [François AUTIN](https://gitlab.istic.univ-rennes1.fr/fautin) From 39d214a3a2181bafa8a220b51b733c6ff4878524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Autin?= Date: Fri, 25 Jun 2021 03:35:54 +0000 Subject: [PATCH 4/5] Update README.md --- README.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dc6f1f5..b8171ce 100644 --- a/README.md +++ b/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,11 +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) -## How to install / build ? - -Please refer to [INSTALL.md](https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat/-/blob/master/INSTALL.md). - -## Contributors +## Authors * [François AUTIN](https://gitlab.istic.univ-rennes1.fr/fautin) * [Victor AZRA](https://gitlab.istic.univ-rennes1.fr/vazra) From cfb056a05e796396d72945892a83bc553d1a0d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o?= Date: Fri, 25 Jun 2021 13:59:37 +0200 Subject: [PATCH 5/5] P2 can now hit P1 --- src/main/java/gameplay/match/match.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/gameplay/match/match.java b/src/main/java/gameplay/match/match.java index 266e9d5..dd1257a 100644 --- a/src/main/java/gameplay/match/match.java +++ b/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;