Antoine
76f96a2bad
Première implémentation du cameraPushBack
2021-06-24 03:55:43 +02:00
Antoine
a061b96759
Merge remote-tracking branch 'origin/master'
2021-06-24 03:32:20 +02:00
Antoine
7f2a4800c6
Première implémentation des pushBox
2021-06-24 03:31:54 +02:00
François Autin
af9624eeec
Delete Config.java
2021-06-24 01:25:09 +00:00
Léo
0a34a66a5d
fixed handlehits and handleThrows
2021-06-24 03:11:01 +02:00
Léo
ad8a67b274
hitboxes fixed
2021-06-24 02:55:39 +02:00
Antoine
1c208d9792
handleHits && handleThrows now take into account the y position of the entity
2021-06-24 02:54:22 +02:00
François Autin
a67cee242b
Added 320x240 resolution option
2021-06-24 02:31:55 +02:00
François Autin
6adfc52891
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
2021-06-24 02:13:05 +02:00
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
Antoine
8cc35dda85
WavyText between round
2021-06-24 01:37:07 +02:00
Antoine
e2ac89a375
refactor endRound
2021-06-24 01:27:41 +02:00
Azra Victor
20788b59c7
corrected guarding check. Guard should now be working correctly.
2021-06-24 00:19:22 +02:00
no
3f9beb1198
Merge remote-tracking branch 'origin/master'
2021-06-24 00:15:39 +02:00
Léo
e74903508d
old version of clone method in nextframebuffer
2021-06-24 00:22:54 +02:00
no
9ca70a99c5
added hitboxes for blue jump D
2021-06-24 00:15:34 +02:00
Azra Victor
00ff2fb63d
added hitboxes for blue jump B
2021-06-24 00:02:58 +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
0b4b7e8ece
added hitboxes for blue jump C
2021-06-23 23:47:32 +02:00
no
02bb004cb1
added hitboxes for blue jump A
2021-06-23 23:39:56 +02:00
Azra Victor
1bf4270129
adjusted pushbox for the knocked down frames of blue somewhat
2021-06-23 23:23:37 +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
