478 Commits

Author SHA1 Message Date
Antoine
d1990656cd Merge remote-tracking branch 'origin/master' 2021-06-25 18:47:05 +02:00
Antoine
7df908f500 hide debug by default + fix 2021-06-25 18:46:37 +02:00
François Autin
cbe3f8ea85
Added taskbar icon to the launcher 2021-06-25 18:42:16 +02:00
François Autin
417bd199a7 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-25 18:41:46 +02:00
François Autin
0b174aba41 Added launcher screenshot to the README.md 2021-06-25 18:41:40 +02:00
Antoine
2000ac6a30 input display toggleable with i key 2021-06-25 18:38:22 +02:00
François Autin
3799a7549b Fixed static variables impacting rounds launched after another 2021-06-25 18:33:41 +02:00
François Autin
0c2eb7acea Improved Launcher looks 2021-06-25 18:09:41 +02:00
François Autin
a92732ad1f Improved launcher looks, disabled character picker 2021-06-25 17:51:11 +02:00
François Autin
87c1ff3af1 Launcher now disappears when game starts and reappears when game ends. 2021-06-25 17:35:18 +02:00
Azra Victor
a4484404cd made jump and dash movement values higher and allowed for more lenient inputs 2021-06-25 15:28:13 +02:00
Antoine
242d30b51c activate debug mode with d key 2021-06-25 15:52:25 +02:00
Antoine
7c448591ea affichage des inputs activable via une variable dans le code 2021-06-25 15:39:40 +02:00
Antoine
3c20db686c debug mode activable dans le code 2021-06-25 15:36:27 +02:00
Antoine
ad6593bd00 refresh inputList every rounds 2021-06-25 14:53:32 +02:00
Antoine
68cc275302 endMatch évalué avant endRound 2021-06-25 14:40:04 +02:00
Antoine
2dd019a8ea Merge remote-tracking branch 'origin/master' 2021-06-25 14:33:03 +02:00
Antoine
82e83e0248 cleanup sprite 2021-06-25 14:32:57 +02:00
Léo
cfb056a05e P2 can now hit P1 2021-06-25 13:59:37 +02:00
François Autin
39d214a3a2 Update README.md 2021-06-25 03:35:54 +00:00
François Autin
6984a8bd23 Update README.md 2021-06-25 03:30:46 +00:00
François Autin
1f87e20877 Add INSTALL.md 2021-06-25 03:29:02 +00:00
François Autin
7ae9af040d Updated classpath and POM to allow for packaging of a fat jar 2021-06-21-SNAPSHOT snapshot-21-06-25 2021-06-25 04:44:02 +02:00
Antoine
717daf3831 stageBoundary
Check on camera should be done too.
2021-06-24 20:06:26 +02:00
Antoine
0a165de74b cleanup todo 2021-06-24 19:32:43 +02:00
Antoine
64bb46d3d5 endMatch path fix 2021-06-24 19:23:52 +02:00
Léo
0e6ca0ae3e fix shaders path 2021-06-24 19:10:37 +02:00
François Autin
56fe115fb9 Update README.md 2021-06-24 17:05:35 +00:00
François Autin
9014fe59c1 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-24 19:01:57 +02:00
François Autin
8999bb3dbb Added game screenshot 2021-06-24 19:01:50 +02:00
François Autin
4b14808ee6 Added logo to README.md 2021-06-24 16:56:31 +00:00
François Autin
74919181f7 Updated project logo 2021-06-24 18:55:19 +02:00
François Autin
0020799045 Removed copyrighted content from repository 2021-06-24 18:47:19 +02:00
François Autin
1278f39977 Reorganized project to fit Maven's directory structure. 2021-06-24 18:39:34 +02:00
François Autin
c917f8aeb0 Cleanup of Main class 2021-06-24 17:58:51 +02:00
Rémi Rativel
2a65b84316 Changed some data in BlueNormals and the movements in KockedDown() 2021-06-24 17:25:24 +02:00
François Autin
4b34390e10 Translated README.md 2021-06-24 15:18:10 +00:00
Antoine
8a7d0e69b2 CameraPushBack fonctionne 😎 (pour de vrai 🤞) 2021-06-24 15:35:49 +02:00
Antoine
a5d142332f Merge remote-tracking branch 'origin/master' 2021-06-24 15:00:20 +02:00
Antoine
773e72fabe CameraPushBack fonctionne 😎 2021-06-24 15:00:14 +02:00
François Autin
88ea209f05 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-24 14:51:16 +02:00
François Autin
6476cb6249 Fixed launcher behaving unexpectedly if game.set was malformed 2021-06-24 14:51:06 +02:00
Léo
ecc501729c roundcounter 2021-06-24 14:40:22 +02:00
François Autin
8c146b324b Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-24 14:19:05 +02:00
François Autin
2e86717121 Added default settings in case of parseException 2021-06-24 14:18:57 +02:00
no
0487541b33 Merge remote-tracking branch 'origin/master' 2021-06-24 13:52:36 +02:00
Azra Victor
46cff73d47 Corrected sprites and added hitboxes for blue light DP 2021-06-24 13:51:39 +02:00
Azra Victor
383cd4f213 Corrected stand B Values and hitboxes 2021-06-24 13:16:28 +02:00
Azra Victor
388fd797bf Small bugfix for jumping attacks again² 2021-06-24 12:51:46 +02:00
no
ce1439003b Merge remote-tracking branch 'origin/master' 2021-06-24 12:45:42 +02:00