 François Autin
|
0ebc582e40
|
Fixed merge conflict?
|
2021-06-24 00:01:12 +02:00 |
|
 no
|
2d54c76bc6
|
Merge remote-tracking branch 'origin/master'
|
2021-06-23 19:21:47 +02:00 |
|
 Azra Victor
|
7dd455740f
|
Added handling of jump arc during jump attacks.
|
2021-06-23 19:21:40 +02:00 |
|
 Antoine
|
b94db90379
|
fix, peut-être utile
|
2021-06-23 18:11:40 +02:00 |
|
|
Antoine
|
ff7aafc94b
|
fix*2
|
2021-06-23 18:09:28 +02:00 |
|
|
Antoine
|
bfae9d3138
|
fix
|
2021-06-23 18:06:23 +02:00 |
|
|
Antoine
|
6b6cb0beda
|
delete in UIElement added
|
2021-06-23 17:57:44 +02:00 |
|
|
François Autin
|
c5ac0e9297
|
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
|
2021-06-23 17:15:17 +02:00 |
|
|
François Autin
|
e36955d948
|
partially improved launcher functionnality
|
2021-06-23 17:14:57 +02:00 |
|
 keizaal
|
30b227d883
|
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
|
2021-06-23 17:07:41 +02:00 |
|
 Rémi Rativel
|
375230466d
|
Implemented functions for knockedDown in BlueBaseFrames
|
2021-06-23 17:07:33 +02:00 |
|
|
François Autin
|
e645f66dc8
|
Added stage selection capabilities
|
2021-06-23 16:52:00 +02:00 |
|
|
François Autin
|
058ee337ca
|
Added fullscreen support to Engine
|
2021-06-23 16:26:17 +02:00 |
|
|
keizaal
|
a9ef37eeaf
|
corrected a small error in jumpCFrame3
|
2021-06-23 16:25:10 +02:00 |
|
|
keizaal
|
3eaebb27a4
|
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
|
2021-06-23 16:22:55 +02:00 |
|
|
Rémi Rativel
|
91b9930ecb
|
switched all public function by protected
|
2021-06-23 16:22:48 +02:00 |
|
|
François Autin
|
2a310cfe1f
|
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
|
2021-06-23 16:12:29 +02:00 |
|
|
François Autin
|
9757634881
|
Updated launcher to allow for character selection
|
2021-06-23 16:12:09 +02:00 |
|
|
no
|
2edf441b95
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/gameplay/Characters/Blue/BlueNormals.java
|
2021-06-23 15:54:57 +02:00 |
|
|
keizaal
|
4d9d3e861f
|
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
|
2021-06-23 15:39:18 +02:00 |
|
|
Rémi Rativel
|
8076bc5fd7
|
Implemented all Jump Normal in BlueNormals and their calling in
CharacterBlue
|
2021-06-23 15:39:06 +02:00 |
|
|
François Autin
|
d137af4d2c
|
Add LICENSE
|
2021-06-23 13:13:53 +00:00 |
|
|
François Autin
|
f9043d6deb
|
Fixed launcher failing to start if game.set is absent
|
2021-06-23 15:03:27 +02:00 |
|
|
keizaal
|
6576aabbc5
|
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
|
2021-06-23 14:57:49 +02:00 |
|
|
no
|
5145e3cef0
|
added stand D hitboxes
|
2021-06-23 12:32:49 +02:00 |
|
|
Azra Victor
|
8a89007304
|
completed attackpart.clone() which was missing some elements
|
2021-06-23 12:00:47 +02:00 |
|
 Léo
|
26f3512372
|
added instructions to endMatch and endRound ( some bugs needs to be
fixed)
|
2021-06-23 00:34:28 +02:00 |
|
|
keizaal
|
ee48cc78ff
|
Implemented functions for the other Crouch and Stand Attack in
BlueNormals and added the calling in CharacterBlue
|
2021-06-22 16:27:05 +02:00 |
|
|
keizaal
|
818bd35357
|
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
|
2021-06-21 22:06:13 +02:00 |
|
|
Antoine
|
507037bd37
|
K pour afficher les hitboxs
|
2021-06-21 15:22:06 +02:00 |
|
|
Antoine
|
a282a48612
|
Added delete function in VertexArray
|
2021-06-21 02:41:50 +02:00 |
|
|
Antoine
|
37e4771d95
|
fpsCounter added
|
2021-06-20 22:16:49 +02:00 |
|
|
no
|
6325f76942
|
Merge remote-tracking branch 'origin/master'
|
2021-06-20 18:39:44 +02:00 |
|
|
Antoine
|
32e1810352
|
reverse adjusted for size 5 sprite
|
2021-06-20 19:01:16 +02:00 |
|
|
no
|
24d1438801
|
added check for removeattackpart so that it shouldn't crash.
|
2021-06-20 18:37:03 +02:00 |
|
|
no
|
ebf4c198ad
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/gameplay/Characters/Blue/BlueNormals.java
|
2021-06-20 17:57:35 +02:00 |
|
|
Antoine
|
e6605bec94
|
Clonage réparé on skip toujours la première frame d'une suite pour l'inversion...
|
2021-06-20 18:46:36 +02:00 |
|
|
no
|
eeece5fcd1
|
added blue stand and crouch block frames
|
2021-06-20 17:45:25 +02:00 |
|
|
Azra Victor
|
efe2d9330e
|
added blue stand and crouch fit frames
|
2021-06-20 17:25:06 +02:00 |
|
|
Antoine
|
c1a696ae1c
|
commenté le clonage de la frame dans le processus d'inversion d'une hitbox
|
2021-06-20 17:04:21 +02:00 |
|
|
Antoine
|
c456d2f8c5
|
Merge remote-tracking branch 'origin/master'
|
2021-06-20 17:00:51 +02:00 |
|
|
Antoine
|
11639912ad
|
correction hitbox qui clignote
|
2021-06-20 17:00:35 +02:00 |
|
|
no
|
caf2499774
|
finished adding hitboxes for stand A
|
2021-06-20 16:57:40 +02:00 |
|
|
Azra Victor
|
847378cbf7
|
finished adding hitboxes for crouch A&C
|
2021-06-20 16:38:04 +02:00 |
|
|
no
|
15024bd497
|
Corrected a bug that often made the wrong frame display.
|
2021-06-20 16:25:49 +02:00 |
|
|
Azra Victor
|
f7a3af368b
|
adjusted already made hitboxes so they would fit a size 5 sprite instead of size 4
|
2021-06-20 15:47:55 +02:00 |
|
 Indy
|
51fb72fc79
|
sprite update
|
2021-06-20 06:18:22 +02:00 |
|
|
Antoine
|
03851448f4
|
bDash
|
2021-06-20 01:24:45 +02:00 |
|
|
Antoine
|
b4d8ce858a
|
fDash + variable global pour contrôler la vitesse du jeu
|
2021-06-20 01:20:37 +02:00 |
|
|
Antoine
|
1bf7218257
|
Slowed standFrame
|
2021-06-20 01:06:19 +02:00 |
|