François Autin
6bbf302a80
Refactored launcher class
...
launcher.Config functionality merged with launcher.Settings.
launcher.Config has been deleted.
Added Javadoc to every method of the launcher package.
Commented most methods to improve code readability.
Added authorship of most methods.
Fixed regression of commit c5ac0e9297d7aabc2e7eed52fd1f952cc77087a4:
launcher now properly saves to game.set file and does not default to
failsafe anymore.
2021-06-24 02:12:52 +02:00
François Autin
62fb41a3a2
Merge branch 'master' of
...
https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
Conflicts:
src/gameplay/Characters/Blue/BlueBaseFrames.java
2021-06-24 00:02:29 +02:00
François Autin
0ebc582e40
Fixed merge conflict?
2021-06-24 00:01:12 +02:00
no
460a3f68f8
Merge remote-tracking branch 'origin/master'
2021-06-23 22:38:44 +02:00
no
1b669442c0
Corrected sprites and addedhitboxes for blue cruch D
2021-06-23 22:37:48 +02:00
Azra Victor
0001f0d7df
Corrected sprites and addedhitboxes for blue crouch B
2021-06-23 22:20:59 +02:00
Azra Victor
6a3c6a6a2f
Corrected sprites and added hitboxes for blue forward D
2021-06-23 22:12:00 +02:00
Antoine
262fef9b6c
glfwGetGamepadName
2021-06-23 21:57:58 +02:00
Azra Victor
9c07f8c60a
Corrected sprites and added hitboxes for blue stand C
2021-06-23 21:48:35 +02:00
Antoine
0bd14bbd5d
Merge remote-tracking branch 'origin/master'
2021-06-23 21:26:19 +02:00
Antoine
35bc639712
Correction shader, detection des float
2021-06-23 21:26:14 +02:00
no
74bad4b80b
Merge remote-tracking branch 'origin/master'
2021-06-23 20:05:54 +02:00
Léo
ae41d2131b
shader removed on the endRound message
2021-06-23 20:47:37 +02:00
Azra Victor
f1eb93c647
changed nextframebuffer.clone() so it hopefully won't crash
2021-06-23 20:05:39 +02:00
no
6c9c87b50e
Merge remote-tracking branch 'origin/master'
2021-06-23 19:47:33 +02:00
Léo
56fca86614
connection test
2021-06-23 20:44:13 +02:00
Léo
3170c713bd
endRound finished
2021-06-23 20:30:14 +02:00
Léo
e0b0850af5
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
2021-06-23 20:25:10 +02:00
Léo
0f430e5980
endRound finished
2021-06-23 20:22:22 +02:00
Azra Victor
23bc9aabcd
Fix of jump arcs hopefully
2021-06-23 19:35:18 +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
Léo
a8e7a84b7a
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
2021-06-23 18:38:54 +02:00
Léo
a0a5b015f1
little text when a player win a round
...
+ at the begining of the second round players are in the right places
2021-06-23 18:38:14 +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
