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
|
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 |
|
Azra Victor
|
5a32d5d1fb
|
Made input recognition more accurate.
Adjusted light rising punch movement.
|
2021-06-16 11:34:35 +02:00 |
|
Azra Victor
|
6863b399da
|
Added blue light rising punch special.
|
2021-06-16 11:04:20 +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 |
|
Azra Victor
|
c3430a9f3f
|
Another try for nextFrameBuffer.
|
2021-06-15 23:58:14 +02:00 |
|
no
|
2327859b21
|
removed a try catch in nextFramesBuffer.goToNext() that should resolve some issues.
|
2021-06-15 23:54:12 +02:00 |
|
no
|
2f9b1c8af3
|
small bug correction in Attack.isSpecial().
|
2021-06-15 23:43:58 +02:00 |
|
no
|
0da23a58db
|
trying to avoid a stack overflow in nextFrameBuffer
|
2021-06-15 23:21:37 +02:00 |
|
no
|
b95fb758b6
|
Created class for Blue Normals.
removed the static option in Entity.java, which should correct some bugs.
|
2021-06-15 22:30:35 +02:00 |
|
Antoine
|
f3ab1e4c4d
|
Removed STICKY property in SetTextureWrap
|
2021-06-14 18:38:37 +02:00 |
|
Antoine
|
95d2d7e21c
|
WavyTextVert.glsl + support des shaders dans UIElementText.java
|
2021-06-14 17:03:10 +02:00 |
|
Antoine
|
acf62519f4
|
Cleanup uniformInjection
|
2021-06-14 14:50:23 +02:00 |
|
Antoine
|
ae4a332eaf
|
Framework pour utliser les shaders sur du texte
|
2021-06-14 14:47:05 +02:00 |
|
Antoine
|
f93f801e0b
|
HorizontalProgressBar.java now can be filled left to right or the other way
|
2021-06-12 03:09:43 +02:00 |
|
Antoine
|
8b9d698acc
|
ProgressBar.java added, can be used to represent healthbar ;o)
|
2021-06-12 02:47:13 +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
|
9dc820b35a
|
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
|
2021-06-10 15:47:32 +02:00 |
|
Léo
|
8ef8dcc21e
|
error correction about inputs in match.java
|
2021-06-10 15:46:51 +02:00 |
|
François Autin
|
6e4a81a159
|
Now ignores game.set
|
2021-06-10 15:43:11 +02:00 |
|