no
|
6325f76942
|
Merge remote-tracking branch 'origin/master'
|
2021-06-20 18:39:44 +02:00 |
|
Antoine
|
32e1810352
|
reverse adjusted for size 5 sprite
|
2021-06-20 19:01:16 +02:00 |
|
no
|
24d1438801
|
added check for removeattackpart so that it shouldn't crash.
|
2021-06-20 18:37:03 +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 |
|
no
|
eeece5fcd1
|
added blue stand and crouch block frames
|
2021-06-20 17:45:25 +02:00 |
|
Azra Victor
|
efe2d9330e
|
added blue stand and crouch fit frames
|
2021-06-20 17:25:06 +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
|
c456d2f8c5
|
Merge remote-tracking branch 'origin/master'
|
2021-06-20 17:00:51 +02:00 |
|
Antoine
|
11639912ad
|
correction hitbox qui clignote
|
2021-06-20 17:00:35 +02:00 |
|
no
|
caf2499774
|
finished adding hitboxes for stand A
|
2021-06-20 16:57:40 +02:00 |
|
Azra Victor
|
847378cbf7
|
finished adding hitboxes for crouch A&C
|
2021-06-20 16:38:04 +02:00 |
|
no
|
15024bd497
|
Corrected a bug that often made the wrong frame display.
|
2021-06-20 16:25:49 +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 |
|
Indy
|
51fb72fc79
|
sprite update
|
2021-06-20 06:18:22 +02:00 |
|
Antoine
|
03851448f4
|
bDash
|
2021-06-20 01:24:45 +02:00 |
|
Antoine
|
b4d8ce858a
|
fDash + variable global pour contrôler la vitesse du jeu
|
2021-06-20 01:20:37 +02:00 |
|
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 |
|
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 |
|