Antoine
|
a6f25bb75b
|
Gestion de toutes les lettres pour Text.java
|
2021-06-03 17:19:09 +02:00 |
|
Antoine
|
df57374117
|
Correction TextFrag.glsl
|
2021-06-03 17:04:55 +02:00 |
|
Antoine
|
6a93931f68
|
Print text in OpenGl Context first implementation
|
2021-06-03 16:55:54 +02:00 |
|
François Autin
|
f55bc8b2c1
|
Updated .gitignore to follow pom.xml again
|
2021-06-03 14:59:02 +02:00 |
|
François Autin
|
f129ed523b
|
Merge branch 'master' of
https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
Conflicts:
.gitignore
|
2021-06-03 14:58:37 +02:00 |
|
François Autin
|
4ba3148672
|
Added .classpath to .gitignore
|
2021-06-03 14:57:41 +02:00 |
|
no
|
2b0adacbcb
|
Merge remote-tracking branch 'origin/master'
|
2021-06-03 13:22:57 +02:00 |
|
Boyeau Indy
|
9200ae0415
|
Update JsonToJava.java
|
2021-06-03 08:22:32 +00:00 |
|
François Autin
|
eb024153a8
|
Updated Launcher style (WIP)
|
2021-06-03 03:47:04 +02:00 |
|
François Autin
|
6183e39773
|
Removed FXMLController, gave controller role to Launcher instead
|
2021-06-03 03:46:38 +02:00 |
|
François Autin
|
1476cbed43
|
Automated maven classpath update
|
2021-06-03 03:46:05 +02:00 |
|
Azra Victor
|
37caf34e79
|
Implementation of gameplay loop, testing of afew things in match class.
|
2021-06-03 03:03:25 +02:00 |
|
François Autin
|
97437c7143
|
Remove useless resource location
|
2021-06-03 01:53:57 +02:00 |
|
François Autin
|
24338e344c
|
Fixed resource not being found by Launcher
|
2021-06-03 01:53:32 +02:00 |
|
no
|
621c2222c0
|
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat
|
2021-06-03 01:42:22 +02:00 |
|
François Autin
|
0d7c08aa5d
|
Merge branch 'master' of
https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
Conflicts:
.classpath
|
2021-06-03 00:50:09 +02:00 |
|
François Autin
|
85b48c40d4
|
Massive improvements to launcher
Launcher is now capable of closing itself, launching the engine and has
a saner launcher.fxml
|
2021-06-03 00:47:49 +02:00 |
|
Antoine
|
80e3a879ee
|
Added flipTextureWrapH
|
2021-06-02 23:20:40 +02:00 |
|
Antoine
|
ba7e093a00
|
Background
|
2021-06-02 22:16:18 +02:00 |
|
Antoine
|
9a93fafd0d
|
Première implémentation du tracking d'un personnage
|
2021-06-02 22:12:57 +02:00 |
|
Antoine
|
48c0a66f11
|
Added correctViewport
|
2021-06-02 20:12:13 +02:00 |
|
Antoine
|
7b349c573b
|
Added coordinate tracking in ObjectGl
|
2021-06-02 20:07:34 +02:00 |
|
Antoine
|
b5319de940
|
Petite correction invoke in GLFWFramebufferSizeCallback
|
2021-06-02 17:30:43 +02:00 |
|
Antoine
|
80ab5fb99b
|
Implémentation de la conservation de l'aspect ratio quand on modifie la taille de la fenêtre
|
2021-06-02 16:46:29 +02:00 |
|
no
|
e83aabf56f
|
Added functions to link gamepad inputs (as recognized by the engine) and the inputs defined in the gameplay classes.
|
2021-06-02 16:00:20 +02:00 |
|
Antoine
|
fbf65f3a6f
|
Implémentation minimal match.java
|
2021-06-02 15:37:41 +02:00 |
|
Antoine
|
bce2220453
|
Exemple utilisation Input
|
2021-06-02 15:23:44 +02:00 |
|
no
|
ab03782425
|
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat
|
2021-06-02 14:27:12 +02:00 |
|
Boyeau Indy
|
c22f4266d1
|
Update config.json
|
2021-06-02 08:42:46 +00:00 |
|
Antoine
|
cf7a1ed85b
|
Oune poquito de docito
+ Rename de certaine classe pour qu'elles respectent les conventions
|
2021-06-01 22:33:11 +02:00 |
|
Antoine
|
62b888da92
|
getAxisDiscreet && getAxisContinuous added
|
2021-06-01 22:22:10 +02:00 |
|
no
|
2fd3dc61d9
|
change dsome things inmatch, added the start of amain function.
|
2021-06-01 21:02:11 +02:00 |
|
Antoine
|
f4b7d5752d
|
GLFW_JOYSTICK_N envoyé depuis le constructeur
|
2021-06-01 19:54:05 +02:00 |
|
Antoine
|
51733a2e6a
|
Wildcard import
|
2021-06-01 19:51:01 +02:00 |
|
Léo
|
094fedc3a2
|
inputVariables
|
2021-06-01 19:47:47 +02:00 |
|
Léo
|
611894537a
|
constructor for gamepadInput
|
2021-06-01 19:23:33 +02:00 |
|
Antoine
|
b63ee09571
|
Classe Button.java
|
2021-06-01 18:04:33 +02:00 |
|
Antoine
|
6dcd7feda5
|
GamepadInput
|
2021-06-01 17:59:04 +02:00 |
|
Antoine
|
b276f1eca4
|
Simplification des conditionnels de gamepadInput.java
|
2021-06-01 16:11:36 +02:00 |
|
Léo
|
8682d99578
|
detection of all of the inputs ( joysticks included)
|
2021-06-01 15:53:04 +02:00 |
|
Boyeau Indy
|
b6b0d2bbc8
|
Update pom.xml (dependecy)
|
2021-05-31 18:38:03 +00:00 |
|
Boyeau Indy
|
8d5d19dffd
|
print json file
|
2021-05-31 18:37:02 +00:00 |
|
Antoine
|
a069067c9c
|
Loop
|
2021-05-31 19:48:42 +02:00 |
|
Antoine
|
aa06c55dd7
|
Merge remote-tracking branch 'origin/master'
|
2021-05-31 19:39:18 +02:00 |
|
Antoine
|
ccdbbfb279
|
Son de test
|
2021-05-31 19:39:11 +02:00 |
|
Léo
|
db05036c01
|
detection of all gamepad buttons (except RT LT)
|
2021-05-31 19:09:07 +02:00 |
|
Antoine
|
bd587a5587
|
SoundManager, SoundBuffer Fixed, BufferUtils.java rename to BufferUtilsEngine.java to avoid conflict with org.lwjgl.BufferUtils
Le son fonctionne yay
|
2021-05-31 18:45:38 +02:00 |
|
Léo
|
00a19177c7
|
gamepadInput updated
|
2021-05-31 16:54:02 +02:00 |
|
Léo
|
888e5825ba
|
added gamepadInputClass
|
2021-05-31 15:36:40 +02:00 |
|
Indy
|
f2b2fa9e9b
|
parser json to java
|
2021-05-31 15:01:39 +02:00 |
|