Commit Graph

273 Commits

Author SHA1 Message Date
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
François Autin 8fc483b7e5 Deleted configuration package.
Relocated configuration.Config to launcher.Config.
2021-06-10 15:41:39 +02:00
François Autin 1f58b184b8 Improved launcher looks. 2021-06-10 15:38:17 +02:00
François Autin bf9ba6010e Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-10 15:21:10 +02:00
François Autin 76bfe1d56e Launcher overhaul. Now capable of setting resolution and fullscreen set. 2021-06-10 15:20:26 +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
Antoine a7cc1f58ca Merge remote-tracking branch 'origin/master' 2021-06-10 14:25:01 +02:00
Antoine b363cbc9c7 Meilleur gestion d'erreur dans Engine.init() 2021-06-10 14:22:45 +02:00
no f6d44128b2 trying to avoid a stack overflow in nextFrameBuffer 2021-06-10 14:20:14 +02:00
François Autin fba6c50de0 Added partial resolution setting support. 2021-06-10 14:07:06 +02:00
Azra Victor ea4762c50e small error corrections 2021-06-10 14:06:15 +02:00
François Autin 677e4dd013 Settings agnostic to invalid configuation file 2021-06-10 14:02:48 +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
no 264f53f88d Merge remote-tracking branch 'origin/master' 2021-06-10 12:40:58 +02:00
François Autin 03c3ed0d92 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-10 13:35:15 +02:00
François Autin 29470c5e82 Added new configuration file 2021-06-10 13:32:06 +02:00
François Autin 4572a1659f Refactored launcher.Settings to use new configuration.Config
Simpler, safer design.
2021-06-10 13:31:36 +02:00
François Autin bacf117aa5 Fully rewrote configuration.Config
Now is capable of parsing configuration file and writing file.
2021-06-10 13:30:49 +02:00
François Autin bc48da8109 Refactored configuration package 2021-06-10 13:30:07 +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
Rémi Rativel f25769390a fix some type problems in HitBox 2021-06-09 18:16:45 +02:00