497 Commits

Author SHA1 Message Date
Antoine
12b89079ce UIElement scale with zoom level of the projection 2021-06-04 20:14:10 +02:00
Antoine
db073106cd Camera zoom + package gui 2021-06-04 17:29:17 +02:00
Antoine
ab6939466d Last fix 2021-06-04 01:05:05 +02:00
Antoine
0a8b5e7e7c Improved UIElement and Text 2021-06-04 00:53:14 +02:00
Antoine
0dc5081bff Premier jet pour les élements d'interface encore pas mal de truc à regler 2021-06-04 00:16:03 +02:00
Antoine
d037826a3f Merge remote-tracking branch 'origin/master' 2021-06-03 22:49:01 +02:00
Antoine
e59d6c22a5 Optimisation setNewText 2021-06-03 22:48:54 +02:00
François Autin
9d42cebe6e
Set lwjgl.natives to natives-windows 2021-06-03 22:45:47 +02:00
François Autin
26360c0558
Readded maven dotfiles 2021-06-03 22:45:03 +02:00
François Autin
3fe8e40bb5
Readded .classpath to project 2021-06-03 22:44:20 +02:00
Antoine
a2fb0a4719 SetNewText dans Text.java 2021-06-03 22:07:52 +02:00
Antoine
516f18c99c Cleanup GamepadInput.java 2021-06-03 20:36:50 +02:00
Antoine
c5883540f8 Merge remote-tracking branch 'origin/master' 2021-06-03 20:20:05 +02:00
Antoine
9cb1bcc12d Added remove method in Text.java 2021-06-03 20:19:58 +02:00
François Autin
3873e10e30 Delete .classpath 2021-06-03 15:40:36 +00:00
François Autin
63a0977dcb Delete package-info.java 2021-06-03 15:40:21 +00:00
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