Commit Graph

363 Commits

Author SHA1 Message Date
242d30b51c activate debug mode with d key 2021-06-25 15:52:25 +02:00
7c448591ea affichage des inputs activable via une variable dans le code 2021-06-25 15:39:40 +02:00
3c20db686c debug mode activable dans le code 2021-06-25 15:36:27 +02:00
ad6593bd00 refresh inputList every rounds 2021-06-25 14:53:32 +02:00
68cc275302 endMatch évalué avant endRound 2021-06-25 14:40:04 +02:00
2dd019a8ea Merge remote-tracking branch 'origin/master' 2021-06-25 14:33:03 +02:00
82e83e0248 cleanup sprite 2021-06-25 14:32:57 +02:00
cfb056a05e P2 can now hit P1 2021-06-25 13:59:37 +02:00
717daf3831 stageBoundary
Check on camera should be done too.
2021-06-24 20:06:26 +02:00
0a165de74b cleanup todo 2021-06-24 19:32:43 +02:00
64bb46d3d5 endMatch path fix 2021-06-24 19:23:52 +02:00
0e6ca0ae3e fix shaders path 2021-06-24 19:10:37 +02:00
74919181f7 Updated project logo 2021-06-24 18:55:19 +02:00
0020799045 Removed copyrighted content from repository 2021-06-24 18:47:19 +02:00
1278f39977 Reorganized project to fit Maven's directory structure. 2021-06-24 18:39:34 +02:00
c917f8aeb0 Cleanup of Main class 2021-06-24 17:58:51 +02:00
2a65b84316 Changed some data in BlueNormals and the movements in KockedDown() 2021-06-24 17:25:24 +02:00
8a7d0e69b2 CameraPushBack fonctionne 😎 (pour de vrai 🤞) 2021-06-24 15:35:49 +02:00
a5d142332f Merge remote-tracking branch 'origin/master' 2021-06-24 15:00:20 +02:00
773e72fabe CameraPushBack fonctionne 😎 2021-06-24 15:00:14 +02:00
88ea209f05 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-24 14:51:16 +02:00
6476cb6249 Fixed launcher behaving unexpectedly if game.set was malformed 2021-06-24 14:51:06 +02:00
ecc501729c roundcounter 2021-06-24 14:40:22 +02:00
8c146b324b Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-24 14:19:05 +02:00
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
46cff73d47 Corrected sprites and added hitboxes for blue light DP 2021-06-24 13:51:39 +02:00
383cd4f213 Corrected stand B Values and hitboxes 2021-06-24 13:16:28 +02:00
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
d7984e42e0 Added Hitboxes setting support
Checking the "hitbox" checkbox in the launcher now displays Hitboxes
in-game.
2021-06-24 13:43:24 +02:00
3c2f0ad6a5 Small bugfix for jumping attacks again 2021-06-24 12:45:19 +02:00
fdc826f474 bugfix again. halp. 2021-06-24 12:33:38 +02:00
bf416cc07b bugfix with crashes at ends of jumps 2021-06-24 12:32:00 +02:00
no
a97ebb5655 Merge remote-tracking branch 'origin/master' 2021-06-24 12:27:49 +02:00
1b187025e2 Readded launcher from a67cee242b 2021-06-24 13:15:03 +02:00
913ccd4de1 changed match.nextFrame so it works properly with the new nextFrameBuffer 2021-06-24 12:27:39 +02:00
9a8e13bfb5 deleted nextFramesBuffer class 2021-06-24 12:05:22 +02:00
2e67c94d40 changed entity nextframesbuffer to a simpler ArrayList 2021-06-24 12:03:45 +02:00
no
5e7e0e2f89 Merge remote-tracking branch 'origin/master' 2021-06-24 11:44:44 +02:00
76f96a2bad Première implémentation du cameraPushBack 2021-06-24 03:55:43 +02:00
a061b96759 Merge remote-tracking branch 'origin/master' 2021-06-24 03:32:20 +02:00
7f2a4800c6 Première implémentation des pushBox 2021-06-24 03:31:54 +02:00
af9624eeec Delete Config.java 2021-06-24 01:25:09 +00:00
0a34a66a5d fixed handlehits and handleThrows 2021-06-24 03:11:01 +02:00
ad8a67b274 hitboxes fixed 2021-06-24 02:55:39 +02:00
1c208d9792 handleHits && handleThrows now take into account the y position of the entity 2021-06-24 02:54:22 +02:00
a67cee242b Added 320x240 resolution option 2021-06-24 02:31:55 +02:00
6adfc52891 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-24 02:13:05 +02:00
6bbf302a80 Refactored launcher class
launcher.Config functionality merged with launcher.Settings.
launcher.Config has been deleted.

Added Javadoc to every method of the launcher package.

Commented most methods to improve code readability.

Added authorship of most methods.

Fixed regression of commit c5ac0e9297:
launcher now properly saves to game.set file and does not default to
failsafe anymore.
2021-06-24 02:12:52 +02:00