246 Commits

Author SHA1 Message Date
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
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
root
bcc822e093 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-09 17:45:47 +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
Indy
7ce4646e82 Sprite for demo 2021-06-09 16:04:54 +02:00
Boyeau Indy
be6c025b39 Delete perso1_sprite(to update).png 2021-06-09 13:57:25 +00:00
Antoine
d152b2c0aa TestEngine 2021-06-09 14:55:39 +02:00
Antoine
7439137e4d Hitbox added 2021-06-09 14:34:32 +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
no
1ec5cddf3d Hit Handling. Unfinished. 2021-06-09 02:14:51 +02:00
Rémi Rativel
ced29d97b8 Added an attribute for frame 2021-06-08 20:13:21 +02:00
Rémi Rativel
759ea2222d Added getter and Setter for frame's attributes 2021-06-08 20:11:13 +02:00
Antoine
987f0c3703 Merge remote-tracking branch 'origin/master' 2021-06-08 02:59:00 +02:00
Antoine
3e893cd07e TrackingSF3ThirdStrick added, attention la crise d'epilepsie 2021-06-08 02:58:53 +02:00
Dupuis Antoine
083935bfe3 Delete jump.wav 2021-06-07 23:59:25 +00:00
no
5d59f41edc Merge remote-tracking branch 'origin/master' 2021-06-07 17:38:51 +02:00
no
5b5960d554 Handling of the inputs done. Determines what the characters next frames will be depending on what th player has input. 2021-06-07 17:38:35 +02:00
Antoine
1d8c9b7a1e TrackingTore fonctionne à peu près 2021-06-07 16:59:19 +02:00
no
67d4c9be53 Added lots of parameters to Entity and Character so it woul be easier to handle actions during gameplay. 2021-06-07 15:55:04 +02:00
Antoine
9ea45e793a Button peut maintenant prendre les inputs du clavier même s'il n'y a pas de manette branchée ! 2021-06-07 15:03:23 +02:00
Léo
33375d4680 corrected a little mistake in gamepadInput 2021-06-07 13:57:05 +02:00
Antoine
d7c426227d Doc pour Engine + Introduction Tracking Tore 2021-06-06 16:32:58 +02:00
keizaal
162f0615e3 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-06 15:52:38 +02:00
Antoine
5c54cacae7 un peu de ménage 2021-06-05 21:11:29 +02:00
Antoine
d11a1fa293 De la doc pour les classe dans UIElement, gestion du clavier dans la classe Button. 2021-06-05 02:02:14 +02:00
Rémi Rativel
ff38cfec5e Added the interface Action and implemented the class Attack, Dash, Jump,
Throw, ThrowPart
2021-06-05 01:48:11 +02:00
Antoine
9ebf04338e UIDummy is now an abstract class 2021-06-04 23:29:22 +02:00
Antoine
eaeb8ccee7 Added UIElementText 2021-06-04 22:35:31 +02:00
Antoine
12b89079ce UIElement scale with zoom level of the projection 2021-06-04 20:14:10 +02:00