58 Commits

Author SHA1 Message Date
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
Antoine
c4e3c9623d Habillage barre de vie + timer qui fonctionne 2021-06-17 01:11:35 +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
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
7432553a70 Barre de vie + timer 2021-06-16 14:20:04 +02:00
Antoine
cbec6fba9d Montre les coordonnées 2021-06-16 13:48:52 +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
Azra Victor
d0a842c481 added blue stand jab and heavy kick moves 2021-06-16 10:40:46 +02:00
Azra Victor
0fc5db4f58 correction of a small error in the updating of the position of the sprites. 2021-06-16 00:53:58 +02:00
Azra Victor
ddaf700b55 corrected the jumps so they would rise correctly, as well as an issue with the position update in match. 2021-06-16 00:38:59 +02:00
no
2327859b21 removed a try catch in nextFramesBuffer.goToNext() that should resolve some issues. 2021-06-15 23:54:12 +02:00
Antoine
f3ab1e4c4d Removed STICKY property in SetTextureWrap 2021-06-14 18:38:37 +02:00
Antoine
f85a15b393 Plus besoin d'avoir deux manettes branchées 2021-06-11 16:11:19 +02:00
Antoine
6ac2db30ea Affiche le controleur utilisé par chaque joueur 2021-06-11 16:03:51 +02:00
Antoine
e2586cbcd2 Les manettes devraient maintenant être detectées dans main -> match.java 2021-06-11 15:55:08 +02:00
Antoine
913adb8d92 Match se ferme quand on clique sur la croix 2021-06-10 16:04:18 +02:00
Azra Victor
9779f41266 trying to avoid a stack overflow in ac 2021-06-10 14:54:51 +02:00
Léo
0c8f5743e5 error correction about inputs in match.java 2021-06-10 15:49:18 +02:00
Léo
8ef8dcc21e error correction about inputs in match.java 2021-06-10 15:46:51 +02:00
Antoine
50a32512b7 Premier fix 2021-06-10 15:20:20 +02:00
Antoine
6028c8e965 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/gameplay/match/match.java
2021-06-10 15:18:02 +02:00
Antoine
ce0bbf20b4 Premier fix il faut encore corriger le clignotement 2021-06-10 15:16:56 +02:00
Léo
0d5aaad4f0 erreur d'inputRefresh contrée 2021-06-10 14:44:46 +02:00
Azra Victor
0939c047ad small changes in match 2021-06-10 13:28:58 +02:00
Azra Victor
63ac95865a small changes in match to reduce crashes 2021-06-10 12:40:09 +02:00
no
93f5727569 Built a basic movement test, can't test because it doesn't recognize my gamepads. 2021-06-10 11:50:38 +02:00
Rémi Rativel
0d929b67ca Implemented HandleThrow in match and added some fonction in Character
and ThrowPart
2021-06-09 17:45:09 +02:00
Azra Victor
ed2f49ad0e Main Gameplay Loop done.
Only Missing Throws and Projectile handling.
Need to be fused with engine.
2021-06-09 13:14:17 +02:00