477 Commits

Author SHA1 Message Date
Antoine
1bf7218257 Slowed standFrame 2021-06-20 01:06:19 +02:00
Antoine
5a41482469 Jump fixed 2021-06-20 01:04:01 +02:00
Antoine
3e3e3511e8 pushbox now showing in addHitbox 2021-06-20 00:48:50 +02:00
keizaal
331cd4fd64 Implemented functions for crouchshort and added in CharacterBlue atks 2021-06-19 20:08:11 +02:00
Antoine
ec37cab5ef UIInputList affiche mtn seulement les nouvelles touches enfoncées cette frame 2021-06-19 14:39:36 +02:00
Antoine
631437a1e9 Plus de problème de perf 2021-06-18 22:02:00 +02:00
Antoine
d06411aff2 Une belle liste mtn toujours des gros problèmes de perf 2021-06-18 21:27:27 +02:00
Antoine
63c67424db Merge remote-tracking branch 'origin/master' 2021-06-18 21:14:17 +02:00
Antoine
2b193c50f3 UIInputList proto 2021-06-18 21:14:03 +02:00
Indy
d3d933c8be update sprite 2021-06-18 10:56:29 +02:00
Antoine
ff16ea1ae9 Hitbox reverse pour taille 4 2021-06-17 22:43:51 +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
no
adfcf068e6 Corrected small backjump glitch.
added Forward Rounhouse move to Blue's attack list.
2021-06-17 18:59:46 +02:00
no
cd1aa79277 Added (hit/push/throw)boxes to all basic frames for character Blue. 2021-06-17 16:39:10 +02:00
keizaal
22a73fd98f Implemented functions for ForwardD in BlueNormals and added the attack
in CharacterBlue
2021-06-17 17:28:27 +02:00
Antoine
1eaa149d69 Stick now used in Inputs.java 2021-06-17 16:56:16 +02:00
Antoine
7392978c9e fix div par 0 2021-06-17 16:31:25 +02:00
Antoine
24e6ff0a45 Merge remote-tracking branch 'origin/master' 2021-06-17 16:24:19 +02:00
Antoine
04f1cdbff9 Petit fix, corrige le fait que les 2 personnages crouch en même temps + dash constant 2021-06-17 16:24:12 +02:00
keizaal
4fa23e83fd Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-17 15:43:03 +02:00
Rémi Rativel
bd51756717 Changed some fonction in Blueormals and added functions for crouche C
Fierce
Added the new attack in CharacterBlue
2021-06-17 15:42:50 +02:00
Antoine
e389a0cb0a Glyphs for controller prompt 2021-06-17 14:55:38 +02:00
no
8fdf623724 Merge remote-tracking branch 'origin/master' 2021-06-17 14:44:06 +02:00
Azra Victor
3d4eae9911 Added a comment in blueBaseFrames to copy-past for easier Frame method generation. 2021-06-17 14:43:50 +02:00
Antoine
ec45df9c5e Nouveau shader pour les barres de progression qui donne un aspect "tube" 2021-06-17 14:34:52 +02:00
Azra Victor
5d95e2223f changed data for blue bas frames. Changed main function in that for better testing of correct hitboxes placement. 2021-06-17 14:26:38 +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
Antoine
c4e3c9623d Habillage barre de vie + timer qui fonctionne 2021-06-17 01:11:35 +02:00
Antoine
9ff78c3382 Merge remote-tracking branch 'origin/master' 2021-06-16 23:45:58 +02:00
Antoine
aecb07b227 L'image des ombres + sprite_zorder.txt pour ordonner l'agencement des sprites 2021-06-16 23:45:52 +02:00
Indy
10f2477800 add health bar texture 2021-06-16 18:05:33 +02:00
Antoine
846716db11 SortZ est maintenant VRAIMENT compatibles avec les flottants ajout d'ombre sous les sprites 2021-06-16 17:29:40 +02:00
Antoine
6dbfaa6e14 Nouvelle arène dans match.java :pog: 2021-06-16 16:12:15 +02:00
Antoine
24fc20be39 setBackground added in UIElementText.java 2021-06-16 16:05:06 +02:00
Indy
9edc455895 re size windows 2021-06-16 14:27:02 +02:00
Antoine
4c1f4eb441 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/gameplay/match/match.java
2021-06-16 14:20:16 +02:00
Antoine
7432553a70 Barre de vie + timer 2021-06-16 14:20:04 +02:00
Indy
943b254496 Awesome arena + sprite to update 2021-06-16 14:11:00 +02:00
Indy
3c63c8fffb windows size 2021-06-16 14:07:47 +02:00
Antoine
cbec6fba9d Montre les coordonnées 2021-06-16 13:48:52 +02:00
Léo
467086b3ba correction of a little error in Inputs 2021-06-16 13:28:06 +02:00
Azra Victor
fa3c5eb4a7 Input recognition modification. Hopefully finally works. 2021-06-16 12:27:49 +02:00
Azra Victor
1945e7bd4a changed dash input to prevent characters constantly dashing instead of walking. 2021-06-16 12:12:47 +02:00
Azra Victor
78014315ab added blue forward and back dash 2021-06-16 12:02:39 +02:00
no
3707324146 Merge remote-tracking branch 'origin/master' 2021-06-16 11:34:44 +02:00
Léo
4c12669013 correction of a little bug 2021-06-16 12:12:46 +02:00
Léo
442216436c Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-16 12:05:49 +02:00
Léo
67cd559e5f gamepad1 -> P1 , gamepad2-> P2 2021-06-16 12:05:18 +02:00