Rativel/jeu-de-combat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 9ea45e793a Button peut maintenant prendre les inputs du clavier même s'il n'y a pas de manette branchée ! Antoine 2021-06-07 15:03:23 +02:00
  • 33375d4680 corrected a little mistake in gamepadInput Léo 2021-06-07 13:57:05 +02:00
  • d7c426227d Doc pour Engine + Introduction Tracking Tore Antoine 2021-06-06 16:32:58 +02:00
  • 162f0615e3 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git keizaal 2021-06-06 15:52:38 +02:00
  • 5c54cacae7 un peu de ménage Antoine 2021-06-05 21:11:29 +02:00
  • d11a1fa293 De la doc pour les classe dans UIElement, gestion du clavier dans la classe Button. Antoine 2021-06-05 02:02:14 +02:00
  • ff38cfec5e Added the interface Action and implemented the class Attack, Dash, Jump, Throw, ThrowPart Rémi Rativel 2021-06-05 01:48:11 +02:00
  • 9ebf04338e UIDummy is now an abstract class Antoine 2021-06-04 23:29:22 +02:00
  • eaeb8ccee7 Added UIElementText Antoine 2021-06-04 22:35:31 +02:00
  • 12b89079ce UIElement scale with zoom level of the projection Antoine 2021-06-04 20:14:10 +02:00
  • db073106cd Camera zoom + package gui Antoine 2021-06-04 17:29:17 +02:00
  • ab6939466d Last fix Antoine 2021-06-04 01:05:05 +02:00
  • 0a8b5e7e7c Improved UIElement and Text Antoine 2021-06-04 00:53:14 +02:00
  • 0dc5081bff Premier jet pour les élements d'interface encore pas mal de truc à regler Antoine 2021-06-04 00:16:03 +02:00
  • d037826a3f Merge remote-tracking branch 'origin/master' Antoine 2021-06-03 22:49:01 +02:00
  • e59d6c22a5 Optimisation setNewText Antoine 2021-06-03 22:48:54 +02:00
  • 9d42cebe6e
         Set lwjgl.natives to natives-windows François Autin 2021-06-03 22:45:47 +02:00
  • 26360c0558
         Readded maven dotfiles François Autin 2021-06-03 22:45:03 +02:00
  • 3fe8e40bb5
         Readded .classpath to project François Autin 2021-06-03 22:44:20 +02:00
  • a2fb0a4719 SetNewText dans Text.java Antoine 2021-06-03 22:07:52 +02:00
  • 516f18c99c Cleanup GamepadInput.java Antoine 2021-06-03 20:36:50 +02:00
  • c5883540f8 Merge remote-tracking branch 'origin/master' Antoine 2021-06-03 20:20:05 +02:00
  • 9cb1bcc12d Added remove method in Text.java Antoine 2021-06-03 20:19:58 +02:00
  • 3873e10e30 Delete .classpath François Autin 2021-06-03 15:40:36 +00:00
  • 63a0977dcb Delete package-info.java François Autin 2021-06-03 15:40:21 +00:00
  • a6f25bb75b Gestion de toutes les lettres pour Text.java Antoine 2021-06-03 17:19:09 +02:00
  • df57374117 Correction TextFrag.glsl Antoine 2021-06-03 17:04:55 +02:00
  • 6a93931f68 Print text in OpenGl Context first implementation Antoine 2021-06-03 16:55:54 +02:00
  • f55bc8b2c1
         Updated .gitignore to follow pom.xml again François Autin 2021-06-03 14:59:02 +02:00
  • f129ed523b
         Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git François Autin 2021-06-03 14:58:37 +02:00
  • 4ba3148672
         Added .classpath to .gitignore François Autin 2021-06-03 14:57:41 +02:00
  • 2b0adacbcb Merge remote-tracking branch 'origin/master' no 2021-06-03 13:22:57 +02:00
  • 9200ae0415 Update JsonToJava.java Boyeau Indy 2021-06-03 08:22:32 +00:00
  • eb024153a8
         Updated Launcher style (WIP) François Autin 2021-06-03 03:47:04 +02:00
  • 6183e39773
         Removed FXMLController, gave controller role to Launcher instead François Autin 2021-06-03 03:46:38 +02:00
  • 1476cbed43
         Automated maven classpath update François Autin 2021-06-03 03:46:05 +02:00
  • 37caf34e79 Implementation of gameplay loop, testing of afew things in match class. Azra Victor 2021-06-03 03:03:25 +02:00
  • 621c2222c0 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat no 2021-06-03 01:42:22 +02:00
  • 97437c7143
         Remove useless resource location François Autin 2021-06-03 01:53:57 +02:00
  • 24338e344c
         Fixed resource not being found by Launcher François Autin 2021-06-03 01:53:32 +02:00
  • 0d7c08aa5d
         Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git François Autin 2021-06-03 00:50:09 +02:00
  • 85b48c40d4
         Massive improvements to launcher François Autin 2021-06-03 00:47:49 +02:00
  • 80e3a879ee Added flipTextureWrapH Antoine 2021-06-02 23:20:40 +02:00
  • ba7e093a00 Background Antoine 2021-06-02 22:16:18 +02:00
  • 9a93fafd0d Première implémentation du tracking d'un personnage Antoine 2021-06-02 22:12:57 +02:00
  • 48c0a66f11 Added correctViewport Antoine 2021-06-02 20:12:13 +02:00
  • 7b349c573b Added coordinate tracking in ObjectGl Antoine 2021-06-02 20:07:34 +02:00
  • b5319de940 Petite correction invoke in GLFWFramebufferSizeCallback Antoine 2021-06-02 17:30:43 +02:00
  • 80ab5fb99b Implémentation de la conservation de l'aspect ratio quand on modifie la taille de la fenêtre Antoine 2021-06-02 16:46:29 +02:00
  • e83aabf56f Added functions to link gamepad inputs (as recognized by the engine) and the inputs defined in the gameplay classes. no 2021-06-02 16:00:20 +02:00
  • fbf65f3a6f Implémentation minimal match.java Antoine 2021-06-02 15:37:41 +02:00
  • ab03782425 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat no 2021-06-02 14:27:12 +02:00
  • bce2220453 Exemple utilisation Input Antoine 2021-06-02 15:23:44 +02:00
  • c22f4266d1 Update config.json Boyeau Indy 2021-06-02 08:42:46 +00:00
  • cf7a1ed85b Oune poquito de docito + Rename de certaine classe pour qu'elles respectent les conventions Antoine 2021-06-01 22:33:11 +02:00
  • 62b888da92 getAxisDiscreet && getAxisContinuous added Antoine 2021-06-01 22:22:10 +02:00
  • 2fd3dc61d9 change dsome things inmatch, added the start of amain function. no 2021-06-01 21:02:11 +02:00
  • f4b7d5752d GLFW_JOYSTICK_N envoyé depuis le constructeur Antoine 2021-06-01 19:54:05 +02:00
  • 51733a2e6a Wildcard import Antoine 2021-06-01 19:51:01 +02:00
  • 094fedc3a2 inputVariables Léo 2021-06-01 19:47:47 +02:00
  • 611894537a constructor for gamepadInput Léo 2021-06-01 19:23:33 +02:00
  • b63ee09571 Classe Button.java Antoine 2021-06-01 18:04:33 +02:00
  • 6dcd7feda5 GamepadInput Antoine 2021-06-01 17:59:04 +02:00
  • b276f1eca4 Simplification des conditionnels de gamepadInput.java Antoine 2021-06-01 16:11:36 +02:00
  • 8682d99578 detection of all of the inputs ( joysticks included) Léo 2021-06-01 15:53:04 +02:00
  • b6b0d2bbc8 Update pom.xml (dependecy) Boyeau Indy 2021-05-31 18:38:03 +00:00
  • 8d5d19dffd print json file Boyeau Indy 2021-05-31 18:37:02 +00:00
  • a069067c9c Loop Antoine 2021-05-31 19:48:42 +02:00
  • aa06c55dd7 Merge remote-tracking branch 'origin/master' Antoine 2021-05-31 19:39:18 +02:00
  • ccdbbfb279 Son de test Antoine 2021-05-31 19:39:11 +02:00
  • db05036c01 detection of all gamepad buttons (except RT LT) Léo 2021-05-31 19:09:07 +02:00
  • bd587a5587 SoundManager, SoundBuffer Fixed, BufferUtils.java rename to BufferUtilsEngine.java to avoid conflict with org.lwjgl.BufferUtils Le son fonctionne yay Antoine 2021-05-31 18:45:38 +02:00
  • 00a19177c7 gamepadInput updated Léo 2021-05-31 16:54:02 +02:00
  • 888e5825ba added gamepadInputClass Léo 2021-05-31 15:36:40 +02:00
  • f2b2fa9e9b parser json to java Indy 2021-05-31 15:01:39 +02:00
  • fbd690f427 update pom + reso json Indy 2021-05-31 12:25:39 +02:00
  • 09562c4216 added input package Léo 2021-05-30 19:06:15 +02:00
  • 4f8a32d5a4 SoundManager update Antoine 2021-05-29 02:49:33 +02:00
  • a9bbde6c46
         Removed references to JXInput (using directinput instead) François Autin 2021-05-29 00:54:12 +02:00
  • efbef95aa0 SoundManager import Antoine 2021-05-29 00:46:50 +02:00
  • 17ca8eedb7 SoundBuffer, SoundListener, SoundManager, SoundSource, Correction d'un shader qui portait pas très bien son nom. Antoine 2021-05-29 00:36:33 +02:00
  • bd2a338370 Update README.md François Autin 2021-05-28 20:59:48 +00:00
  • 41784b3d2e Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git François Autin 2021-05-28 22:58:09 +02:00
  • f20bd55e9e
         Added JXInput dependency to project + POM cleanup François Autin 2021-05-28 22:57:56 +02:00
  • 9fb1de708a Merge remote-tracking branch 'origin/master' Antoine 2021-05-28 18:35:40 +02:00
  • 0185a14b0b Input """cleanup""" Antoine 2021-05-28 18:34:49 +02:00
  • a4573fd3c0 replace json file Indy 2021-05-28 16:05:30 +02:00
  • 3fdcebf93b Update config.json Boyeau Indy 2021-05-28 13:12:48 +00:00
  • 2cbf37511a Update config.json Boyeau Indy 2021-05-28 13:12:18 +00:00
  • dea8cbd562 conf file json Indy 2021-05-28 15:07:48 +02:00
  • 68580ce40b Correct camera: l'espace de jeu est compris entre les coordonnées -1000:1000 et -1000*aspectRatio:1000*aspectRatio Peut-être fixé l'aspect ratio du jeu pour ne pas avoir certains problèmes Antoine 2021-05-28 13:37:03 +02:00
  • 9612db9b49 Modification du constructeur d'Engine ajout de la largeur et la hauteur de la fenêtre ainsi que l'aspect ratio Antoine 2021-05-28 13:02:48 +02:00
  • d57696c30d
         Untracked .project François Autin 2021-05-28 02:56:38 +02:00
  • 8eea24a428 Removed .idea from repo, should be kept for IDEA users though François Autin 2021-05-28 02:52:43 +02:00
  • 7c1992e71e
         Updated .gitignore François Autin 2021-05-28 02:50:16 +02:00
  • a88cbebd18
         Removed window decorations from launcher François Autin 2021-05-28 01:20:26 +02:00
  • 0da311c65a
         Main class now correctly launches the Launcher François Autin 2021-05-28 01:16:51 +02:00
  • cd7627d36d
         Launcher now finds and correctly sets main Scene François Autin 2021-05-28 01:15:50 +02:00
  • 4e99b1e115
         Added stage attr along with getters and setters to launcher.Settings. François Autin 2021-05-28 00:55:12 +02:00
  • b52bbb506a
         Added setting file manipulator class to launcher package. François Autin 2021-05-28 00:50:57 +02:00