François Autin
b98d1908f6
Merge branch 'Gameplay' into 'master'
...
Merge of Gameplay into Master
See merge request fautin/jeu-de-combat!6
2021-05-27 15:31:21 +00:00
François Autin
ccf004ee0a
Merge branch 'master' into 'Gameplay'
...
# Conflicts:
# .gitignore
2021-05-27 15:31:16 +00:00
François Autin
3452c10a02
Update README.md
2021-05-27 14:22:17 +00:00
no
6ac7b22a02
Merge branch 'Gameplay' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into Gameplay
2021-05-27 15:29:51 +02:00
keizaal
c9b788887b
update Frame
2021-05-27 16:22:25 +02:00
keizaal
8789416057
Added constrructors for Frame and Push_HitBox
2021-05-27 16:22:08 +02:00
keizaal
43146a3aab
Changed hit function to be coherent with the attribut pushHitBox in
...
Frame
2021-05-27 15:54:26 +02:00
keizaal
e52f8e890e
Merge branch 'Gameplay' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into Gameplay
2021-05-27 15:49:13 +02:00
keizaal
f0aa2592fd
Started implementation of Frame
2021-05-27 15:49:07 +02:00
no
44503c5f44
added nextFrameBuffer with basic functions
2021-05-27 15:29:20 +02:00
Indy
22e2f07dca
new sprite
2021-05-27 15:20:24 +02:00
keizaal
e1d1803cd2
Added some comments
2021-05-27 15:18:35 +02:00
no
de54803edf
created projectile class
2021-05-27 15:00:43 +02:00
no
dfdf9b5d9e
improved attack comments
2021-05-27 15:00:20 +02:00
keizaal
a0a8323032
Implémentation des constructeurs et fonctions de HitBox
2021-05-27 14:53:08 +02:00
no
bbdcf7f1d2
Merge branch 'Gameplay' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into Gameplay
2021-05-27 14:30:15 +02:00
no
31d5cad0fc
Added base Attack class parameters.
2021-05-27 14:26:14 +02:00
no
2710c91b00
Added Handling of Inputs recognition.
2021-05-27 14:13:02 +02:00
Indy
5c6c55826f
conf/pers
2021-05-27 13:51:28 +02:00
no
e02acbcf5c
Started adjusting the handling of Inputs
2021-05-27 13:43:42 +02:00
François Autin
04c28b9e0f
Merge branch 'engineWIP' into 'master'
...
EngineWIP -> master (2)
See merge request fautin/jeu-de-combat!5
2021-05-27 11:27:41 +00:00
François Autin
252c9d3697
Merge branch 'master' into 'engineWIP'
...
# Conflicts:
# src/Main.java
2021-05-27 11:27:27 +00:00
no
d6c35e24c5
slight adjustmentson the inputbuffer
2021-05-27 13:03:29 +02:00
François Autin
bf2960f58e
Lancement de la fenêtre du launceur
...
Problématique avec le fxml. Mauvaise version il semblerait ? Fichier à
refaire.
2021-05-27 03:14:20 +02:00
François Autin
9ced943c0a
Ajout du fxml du launcher (initial)
2021-05-27 03:04:08 +02:00
François Autin
75865640aa
Progrès ajout Launcher
...
Ajout de JavaFX.fxml aux dépendances, aménagement de l'architecture du
launcher pour (launcher étend maintenant Application, Main lance
correctement le Launcher)
2021-05-27 03:02:36 +02:00
François Autin
33a02891fc
Ajout des dépendances à JavaFX
2021-05-27 02:19:42 +02:00
no
cc811c93a2
Completed match constructor.
2021-05-27 01:17:41 +02:00
no
4719b3e9f2
Added base for general entities and characters (sub-class of entity)
2021-05-27 01:11:59 +02:00
no
296ec9c821
Ordered files and folders a bit
2021-05-27 00:54:28 +02:00
no
b3f762ca3c
started making the base Match constructor.
2021-05-27 00:37:04 +02:00
Antoine
dc2b696f7e
Shaders modif
2021-05-27 00:14:28 +02:00
no
abac835b84
changed inputBuffer and added base function to have it work.
...
First creation of the Match
2021-05-27 00:06:12 +02:00
keizaal
f7a1bfc062
Added some comments to input and input_attack class
2021-05-26 23:43:26 +02:00
keizaal
6b97ca6046
Declaration of class Input and Input_Attack (cf class Diagram)
2021-05-26 23:38:14 +02:00
keizaal
0d1b6de5ad
Declaration of all HitBox Class
2021-05-26 23:28:33 +02:00
Antoine
db4e2d0e86
Shaders modif
2021-05-26 17:23:13 +02:00
Antoine
72c0098f9a
Pos zangief
2021-05-24 19:26:36 +02:00
Léo
6262dd42d7
we don't call inputGamepad if there is no gamepad
2021-05-24 19:24:57 +02:00
Antoine
5c48a88be4
système pour contrôler le rendu de sprite de taille differente
...
# Pour l'instant toutes les sprites d'un même état doivent être de la même taille
2021-05-23 00:57:29 +02:00
Antoine
ee8473e344
Doc d'ObjectGl dans un Anglais approximatif
2021-05-21 21:01:42 +02:00
Antoine
574e31e02d
Correct frag shader when using texture + color
2021-05-21 19:51:29 +02:00
Antoine
770d134722
J'ai viré les classes useless
2021-05-21 19:15:48 +02:00
Antoine
ecbe08fdc3
Zangief idle wrap correction
2021-05-21 18:20:49 +02:00
Léo
3e12e98010
left joystick control ( textures update)
2021-05-21 17:26:35 +02:00
Léo
7bcbad5792
added Rightjoystick controls for zangief
2021-05-21 16:43:45 +02:00
Léo
3cf4372912
test gamepad Inputs
2021-05-21 15:08:02 +02:00
Antoine
e3623072ff
dynamic scaling vertexArray with textureWrap (no more stretching)
2021-05-20 23:28:45 +02:00
Antoine
bdc2144145
test with Zangief
2021-05-20 20:55:51 +02:00
Antoine
29685f8e40
swapTexWrap from pixels coordinates of the source image
2021-05-20 20:04:16 +02:00
