Commit Graph

208 Commits

Author SHA1 Message Date
no
5b5960d554 Handling of the inputs done. Determines what the characters next frames will be depending on what th player has input. 2021-06-07 17:38:35 +02:00
no
67d4c9be53 Added lots of parameters to Entity and Character so it woul be easier to handle actions during gameplay. 2021-06-07 15:55:04 +02:00
9ea45e793a Button peut maintenant prendre les inputs du clavier même s'il n'y a pas de manette branchée ! 2021-06-07 15:03:23 +02:00
33375d4680 corrected a little mistake in gamepadInput 2021-06-07 13:57:05 +02:00
d7c426227d Doc pour Engine + Introduction Tracking Tore 2021-06-06 16:32:58 +02:00
162f0615e3 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git 2021-06-06 15:52:38 +02:00
5c54cacae7 un peu de ménage 2021-06-05 21:11:29 +02:00
d11a1fa293 De la doc pour les classe dans UIElement, gestion du clavier dans la classe Button. 2021-06-05 02:02:14 +02:00
ff38cfec5e Added the interface Action and implemented the class Attack, Dash, Jump,
Throw, ThrowPart
2021-06-05 01:48:11 +02:00
9ebf04338e UIDummy is now an abstract class 2021-06-04 23:29:22 +02:00
eaeb8ccee7 Added UIElementText 2021-06-04 22:35:31 +02:00
12b89079ce UIElement scale with zoom level of the projection 2021-06-04 20:14:10 +02:00
db073106cd Camera zoom + package gui 2021-06-04 17:29:17 +02:00
ab6939466d Last fix 2021-06-04 01:05:05 +02:00
0a8b5e7e7c Improved UIElement and Text 2021-06-04 00:53:14 +02:00
0dc5081bff Premier jet pour les élements d'interface encore pas mal de truc à regler 2021-06-04 00:16:03 +02:00
d037826a3f Merge remote-tracking branch 'origin/master' 2021-06-03 22:49:01 +02:00
e59d6c22a5 Optimisation setNewText 2021-06-03 22:48:54 +02:00
9d42cebe6e Set lwjgl.natives to natives-windows 2021-06-03 22:45:47 +02:00
26360c0558 Readded maven dotfiles 2021-06-03 22:45:03 +02:00
3fe8e40bb5 Readded .classpath to project 2021-06-03 22:44:20 +02:00
a2fb0a4719 SetNewText dans Text.java 2021-06-03 22:07:52 +02:00
516f18c99c Cleanup GamepadInput.java 2021-06-03 20:36:50 +02:00
c5883540f8 Merge remote-tracking branch 'origin/master' 2021-06-03 20:20:05 +02:00
9cb1bcc12d Added remove method in Text.java 2021-06-03 20:19:58 +02:00
3873e10e30 Delete .classpath 2021-06-03 15:40:36 +00:00
63a0977dcb Delete package-info.java 2021-06-03 15:40:21 +00:00
a6f25bb75b Gestion de toutes les lettres pour Text.java 2021-06-03 17:19:09 +02:00
df57374117 Correction TextFrag.glsl 2021-06-03 17:04:55 +02:00
6a93931f68 Print text in OpenGl Context first implementation 2021-06-03 16:55:54 +02:00
f55bc8b2c1 Updated .gitignore to follow pom.xml again 2021-06-03 14:59:02 +02:00
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
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
9200ae0415 Update JsonToJava.java 2021-06-03 08:22:32 +00:00
eb024153a8 Updated Launcher style (WIP) 2021-06-03 03:47:04 +02:00
6183e39773 Removed FXMLController, gave controller role to Launcher instead 2021-06-03 03:46:38 +02:00
1476cbed43 Automated maven classpath update 2021-06-03 03:46:05 +02:00
37caf34e79 Implementation of gameplay loop, testing of afew things in match class. 2021-06-03 03:03:25 +02:00
97437c7143 Remove useless resource location 2021-06-03 01:53:57 +02:00
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
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
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
80e3a879ee Added flipTextureWrapH 2021-06-02 23:20:40 +02:00
ba7e093a00 Background 2021-06-02 22:16:18 +02:00
9a93fafd0d Première implémentation du tracking d'un personnage 2021-06-02 22:12:57 +02:00
48c0a66f11 Added correctViewport 2021-06-02 20:12:13 +02:00
7b349c573b Added coordinate tracking in ObjectGl 2021-06-02 20:07:34 +02:00
b5319de940 Petite correction invoke in GLFWFramebufferSizeCallback 2021-06-02 17:30:43 +02:00