89 Commits

Author SHA1 Message Date
Antoine
773e72fabe CameraPushBack fonctionne 😎 2021-06-24 15:00:14 +02:00
Léo
ecc501729c roundcounter 2021-06-24 14:40:22 +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
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
Antoine
76f96a2bad Première implémentation du cameraPushBack 2021-06-24 03:55:43 +02:00
Antoine
7f2a4800c6 Première implémentation des pushBox 2021-06-24 03:31:54 +02: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
Antoine
8cc35dda85 WavyText between round 2021-06-24 01:37:07 +02:00
Antoine
e2ac89a375 refactor endRound 2021-06-24 01:27:41 +02:00
Azra Victor
20788b59c7 corrected guarding check. Guard should now be working correctly. 2021-06-24 00:19:22 +02:00
Léo
ae41d2131b shader removed on the endRound message 2021-06-23 20:47:37 +02:00
Léo
56fca86614 connection test 2021-06-23 20:44:13 +02:00
Léo
3170c713bd endRound finished 2021-06-23 20:30:14 +02:00
Léo
e0b0850af5 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-23 20:25:10 +02:00
Léo
0f430e5980 endRound finished 2021-06-23 20:22:22 +02:00
no
2d54c76bc6 Merge remote-tracking branch 'origin/master' 2021-06-23 19:21:47 +02:00
Azra Victor
7dd455740f Added handling of jump arc during jump attacks. 2021-06-23 19:21:40 +02:00
Léo
a0a5b015f1 little text when a player win a round
+ at the begining of the second round players are in the right places
2021-06-23 18:38:14 +02:00
Antoine
6b6cb0beda delete in UIElement added 2021-06-23 17:57:44 +02:00
François Autin
e645f66dc8 Added stage selection capabilities 2021-06-23 16:52:00 +02:00
François Autin
058ee337ca Added fullscreen support to Engine 2021-06-23 16:26:17 +02:00
Léo
26f3512372 added instructions to endMatch and endRound ( some bugs needs to be
fixed)
2021-06-23 00:34:28 +02:00
Antoine
507037bd37 K pour afficher les hitboxs 2021-06-21 15:22:06 +02:00
Antoine
a282a48612 Added delete function in VertexArray 2021-06-21 02:41:50 +02:00
Antoine
37e4771d95 fpsCounter added 2021-06-20 22:16:49 +02:00
Antoine
32e1810352 reverse adjusted for size 5 sprite 2021-06-20 19:01:16 +02:00
no
ebf4c198ad Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/gameplay/Characters/Blue/BlueNormals.java
2021-06-20 17:57:35 +02:00
Antoine
e6605bec94 Clonage réparé on skip toujours la première frame d'une suite pour l'inversion... 2021-06-20 18:46:36 +02:00
Antoine
c1a696ae1c commenté le clonage de la frame dans le processus d'inversion d'une hitbox 2021-06-20 17:04:21 +02:00
Antoine
11639912ad correction hitbox qui clignote 2021-06-20 17:00:35 +02:00
Azra Victor
f7a3af368b adjusted already made hitboxes so they would fit a size 5 sprite instead of size 4 2021-06-20 15:47:55 +02:00
Antoine
b4d8ce858a fDash + variable global pour contrôler la vitesse du jeu 2021-06-20 01:20:37 +02:00
Antoine
3e3e3511e8 pushbox now showing in addHitbox 2021-06-20 00:48:50 +02:00
Antoine
ec37cab5ef UIInputList affiche mtn seulement les nouvelles touches enfoncées cette frame 2021-06-19 14:39:36 +02:00
Antoine
2b193c50f3 UIInputList proto 2021-06-18 21:14:03 +02:00
Antoine
ef1a8d5583 Première implémentation de l'affichage des hitbox 2021-06-17 21:48:09 +02:00
Antoine
0c24eea79f bonne planche de sprite 2021-06-17 20:42:16 +02:00
Antoine
e389a0cb0a Glyphs for controller prompt 2021-06-17 14:55:38 +02:00
Antoine
ec45df9c5e Nouveau shader pour les barres de progression qui donne un aspect "tube" 2021-06-17 14:34:52 +02:00
Antoine
d587940b45 Gradient 2021-06-17 01:46:36 +02:00
Antoine
fc7b2b7945 correction timer update 2021-06-17 01:20:04 +02:00