Rativel/jeu-de-combat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
429 Commits 1 Branch 3 Tags
Commit Graph

165 Commits

Author SHA1 Message Date
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
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
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
83635cff06 Merge remote-tracking branch 'origin/master' 2021-06-10 15:20:26 +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
no
f6d44128b2 trying to avoid a stack overflow in nextFrameBuffer 2021-06-10 14:20:14 +02:00
Azra Victor
ea4762c50e small error corrections 2021-06-10 14:06:15 +02:00
no
4ad12a3a59 small change in gameplay.inputbuffer to hopefully prevent stack overflows. 2021-06-10 13:54:16 +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
no
f56c84ef8e Added some more frames for Blue. 
Updated Action constructors.
 2021-06-10 10:06:44 +02:00
no
10b3b60598 - added some of the first frames (though still incomplete themselves) for the first character. 
- changed pos and size data for hitboxes from double to float
 2021-06-10 02:38:47 +02:00
Rémi Rativel
1f0a14bb23 deleted an unused constructor in Push Hitbox 2021-06-09 18:18:44 +02:00