459 Commits

Author SHA1 Message Date
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
François Autin
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
Azra Victor
3c2f0ad6a5 Small bugfix for jumping attacks again 2021-06-24 12:45:19 +02:00
Azra Victor
fdc826f474 bugfix again. halp. 2021-06-24 12:33:38 +02:00
Azra Victor
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
François Autin
1b187025e2 Readded launcher from a67cee242be263e370b4da1c990ae94a9dd0ee11 2021-06-24 13:15:03 +02:00
Azra Victor
913ccd4de1 changed match.nextFrame so it works properly with the new nextFrameBuffer 2021-06-24 12:27:39 +02:00
Azra Victor
9a8e13bfb5 deleted nextFramesBuffer class 2021-06-24 12:05:22 +02:00
Azra Victor
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
Antoine
76f96a2bad Première implémentation du cameraPushBack 2021-06-24 03:55:43 +02:00
Antoine
a061b96759 Merge remote-tracking branch 'origin/master' 2021-06-24 03:32:20 +02:00
Antoine
7f2a4800c6 Première implémentation des pushBox 2021-06-24 03:31:54 +02:00
François Autin
af9624eeec Delete Config.java 2021-06-24 01:25:09 +00:00
Léo
0a34a66a5d fixed handlehits and handleThrows 2021-06-24 03:11:01 +02:00
Léo
ad8a67b274 hitboxes fixed 2021-06-24 02:55:39 +02:00
Antoine
1c208d9792 handleHits && handleThrows now take into account the y position of the entity 2021-06-24 02:54:22 +02:00
François Autin
a67cee242b Added 320x240 resolution option 2021-06-24 02:31:55 +02:00
François Autin
6adfc52891 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-24 02:13:05 +02:00