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

Commit Graph

  • e2ac89a375 refactor endRound Antoine 2021-06-24 01:27:41 +02:00
  • 7986cd594e Added hit-in-air and falling frames for Blue Azra Victor 2021-06-24 01:09:19 +02:00
  • 20788b59c7 corrected guarding check. Guard should now be working correctly. Azra Victor 2021-06-24 00:19:22 +02:00
  • 3f9beb1198 Merge remote-tracking branch 'origin/master' no 2021-06-24 00:15:39 +02:00
  • e74903508d old version of clone method in nextframebuffer Léo 2021-06-24 00:22:54 +02:00
  • 9ca70a99c5 added hitboxes for blue jump D no 2021-06-24 00:15:34 +02:00
  • 00ff2fb63d added hitboxes for blue jump B Azra Victor 2021-06-24 00:02:58 +02:00
  • 62fb41a3a2 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git François Autin 2021-06-24 00:02:29 +02:00
  • 0ebc582e40 Fixed merge conflict? François Autin 2021-06-24 00:01:12 +02:00
  • 0b4b7e8ece added hitboxes for blue jump C no 2021-06-23 23:47:32 +02:00
  • 02bb004cb1 added hitboxes for blue jump A no 2021-06-23 23:39:56 +02:00
  • 1bf4270129 adjusted pushbox for the knocked down frames of blue somewhat Azra Victor 2021-06-23 23:23:37 +02:00
  • 460a3f68f8 Merge remote-tracking branch 'origin/master' no 2021-06-23 22:38:44 +02:00
  • 1b669442c0 Corrected sprites and addedhitboxes for blue cruch D no 2021-06-23 22:37:48 +02:00
  • 0001f0d7df Corrected sprites and addedhitboxes for blue crouch B Azra Victor 2021-06-23 22:20:59 +02:00
  • 6a3c6a6a2f Corrected sprites and added hitboxes for blue forward D Azra Victor 2021-06-23 22:12:00 +02:00
  • 262fef9b6c glfwGetGamepadName Antoine 2021-06-23 21:57:58 +02:00
  • 9c07f8c60a Corrected sprites and added hitboxes for blue stand C Azra Victor 2021-06-23 21:48:35 +02:00
  • 0bd14bbd5d Merge remote-tracking branch 'origin/master' Antoine 2021-06-23 21:26:19 +02:00
  • 35bc639712 Correction shader, detection des float Antoine 2021-06-23 21:26:14 +02:00
  • 74bad4b80b Merge remote-tracking branch 'origin/master' no 2021-06-23 20:05:54 +02:00
  • ae41d2131b shader removed on the endRound message Léo 2021-06-23 20:47:37 +02:00
  • f1eb93c647 changed nextframebuffer.clone() so it hopefully won't crash Azra Victor 2021-06-23 20:05:39 +02:00
  • 6c9c87b50e Merge remote-tracking branch 'origin/master' no 2021-06-23 19:47:33 +02:00
  • 56fca86614 connection test Léo 2021-06-23 20:44:13 +02:00
  • 3170c713bd endRound finished Léo 2021-06-23 20:30:14 +02:00
  • e0b0850af5 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git Léo 2021-06-23 20:25:10 +02:00
  • 0f430e5980 endRound finished Léo 2021-06-23 20:22:22 +02:00
  • 23bc9aabcd Fix of jump arcs hopefully Azra Victor 2021-06-23 19:35:18 +02:00
  • 2d54c76bc6 Merge remote-tracking branch 'origin/master' no 2021-06-23 19:21:47 +02:00
  • 7dd455740f Added handling of jump arc during jump attacks. Azra Victor 2021-06-23 19:21:40 +02:00
  • a8e7a84b7a Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git Léo 2021-06-23 18:38:54 +02:00
  • a0a5b015f1 little text when a player win a round + at the begining of the second round players are in the right places Léo 2021-06-23 18:38:14 +02:00
  • b94db90379 fix, peut-être utile Antoine 2021-06-23 18:11:40 +02:00
  • ff7aafc94b fix*2 Antoine 2021-06-23 18:09:28 +02:00
  • bfae9d3138 fix Antoine 2021-06-23 18:06:23 +02:00
  • 6b6cb0beda delete in UIElement added Antoine 2021-06-23 17:57:44 +02:00
  • c5ac0e9297 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git François Autin 2021-06-23 17:15:17 +02:00
  • e36955d948 partially improved launcher functionnality François Autin 2021-06-23 17:14:57 +02:00
  • 30b227d883 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git keizaal 2021-06-23 17:07:41 +02:00
  • 375230466d Implemented functions for knockedDown in BlueBaseFrames Rémi Rativel 2021-06-23 17:07:33 +02:00
  • e645f66dc8 Added stage selection capabilities François Autin 2021-06-23 16:52:00 +02:00
  • 2edf441b95 Merge remote-tracking branch 'origin/master' no 2021-06-23 15:54:57 +02:00
  • 058ee337ca Added fullscreen support to Engine François Autin 2021-06-23 16:26:17 +02:00
  • a9ef37eeaf corrected a small error in jumpCFrame3 keizaal 2021-06-23 16:25:10 +02:00
  • 3eaebb27a4 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git keizaal 2021-06-23 16:22:55 +02:00
  • 91b9930ecb switched all public function by protected Rémi Rativel 2021-06-23 16:22:48 +02:00
  • 2a310cfe1f Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git François Autin 2021-06-23 16:12:29 +02:00
  • 9757634881 Updated launcher to allow for character selection François Autin 2021-06-23 16:12:09 +02:00
  • 4d9d3e861f Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git keizaal 2021-06-23 15:39:18 +02:00
  • 8076bc5fd7 Implemented all Jump Normal in BlueNormals and their calling in CharacterBlue Rémi Rativel 2021-06-23 15:39:06 +02:00
  • d137af4d2c Add LICENSE François Autin 2021-06-23 13:13:53 +00:00
  • f9043d6deb Fixed launcher failing to start if game.set is absent François Autin 2021-06-23 15:03:27 +02:00
  • 6576aabbc5 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git keizaal 2021-06-23 14:57:49 +02:00
  • 5145e3cef0 added stand D hitboxes no 2021-06-23 12:32:49 +02:00
  • 8a89007304 completed attackpart.clone() which was missing some elements Azra Victor 2021-06-23 12:00:47 +02:00
  • 26f3512372 added instructions to endMatch and endRound ( some bugs needs to be fixed) Léo 2021-06-23 00:34:28 +02:00
  • ee48cc78ff Implemented functions for the other Crouch and Stand Attack in BlueNormals and added the calling in CharacterBlue keizaal 2021-06-22 16:27:05 +02:00
  • 818bd35357 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git keizaal 2021-06-21 22:06:13 +02:00
  • 507037bd37 K pour afficher les hitboxs Antoine 2021-06-21 15:22:06 +02:00
  • a282a48612 Added delete function in VertexArray Antoine 2021-06-21 02:41:50 +02:00
  • 37e4771d95 fpsCounter added Antoine 2021-06-20 22:16:49 +02:00
  • 6325f76942 Merge remote-tracking branch 'origin/master' no 2021-06-20 18:39:44 +02:00
  • 32e1810352 reverse adjusted for size 5 sprite Antoine 2021-06-20 19:01:16 +02:00
  • 24d1438801 added check for removeattackpart so that it shouldn't crash. no 2021-06-20 18:37:03 +02:00
  • ebf4c198ad Merge remote-tracking branch 'origin/master' no 2021-06-20 17:57:35 +02:00
  • e6605bec94 Clonage réparé on skip toujours la première frame d'une suite pour l'inversion... Antoine 2021-06-20 18:46:36 +02:00
  • eeece5fcd1 added blue stand and crouch block frames no 2021-06-20 17:45:25 +02:00
  • efe2d9330e added blue stand and crouch fit frames Azra Victor 2021-06-20 17:25:06 +02:00
  • c1a696ae1c commenté le clonage de la frame dans le processus d'inversion d'une hitbox Antoine 2021-06-20 17:04:21 +02:00
  • c456d2f8c5 Merge remote-tracking branch 'origin/master' Antoine 2021-06-20 17:00:51 +02:00
  • 11639912ad correction hitbox qui clignote Antoine 2021-06-20 17:00:35 +02:00
  • caf2499774 finished adding hitboxes for stand A no 2021-06-20 16:57:40 +02:00
  • 847378cbf7 finished adding hitboxes for crouch A&C Azra Victor 2021-06-20 16:38:04 +02:00
  • 15024bd497 Corrected a bug that often made the wrong frame display. no 2021-06-20 16:25:49 +02:00
  • f7a3af368b adjusted already made hitboxes so they would fit a size 5 sprite instead of size 4 Azra Victor 2021-06-20 15:47:55 +02:00
  • 51fb72fc79 sprite update Indy 2021-06-20 06:18:22 +02:00
  • 03851448f4 bDash Antoine 2021-06-20 01:24:45 +02:00
  • b4d8ce858a fDash + variable global pour contrôler la vitesse du jeu Antoine 2021-06-20 01:20:37 +02:00
  • 1bf7218257 Slowed standFrame Antoine 2021-06-20 01:06:19 +02:00
  • 5a41482469 Jump fixed Antoine 2021-06-20 01:04:01 +02:00
  • 3e3e3511e8 pushbox now showing in addHitbox Antoine 2021-06-20 00:48:50 +02:00
  • 331cd4fd64 Implemented functions for crouchshort and added in CharacterBlue atks keizaal 2021-06-19 20:08:11 +02:00
  • ec37cab5ef UIInputList affiche mtn seulement les nouvelles touches enfoncées cette frame Antoine 2021-06-19 14:39:36 +02:00
  • 631437a1e9 Plus de problème de perf Antoine 2021-06-18 22:02:00 +02:00
  • d06411aff2 Une belle liste mtn toujours des gros problèmes de perf Antoine 2021-06-18 21:27:27 +02:00
  • 63c67424db Merge remote-tracking branch 'origin/master' Antoine 2021-06-18 21:14:17 +02:00
  • 2b193c50f3 UIInputList proto Antoine 2021-06-18 21:14:03 +02:00
  • d3d933c8be update sprite Indy 2021-06-18 10:56:29 +02:00
  • ff16ea1ae9 Hitbox reverse pour taille 4 Antoine 2021-06-17 22:43:51 +02:00
  • ef1a8d5583 Première implémentation de l'affichage des hitbox Antoine 2021-06-17 21:48:09 +02:00
  • 0c24eea79f bonne planche de sprite Antoine 2021-06-17 20:42:16 +02:00
  • adfcf068e6 Corrected small backjump glitch. added Forward Rounhouse move to Blue's attack list. no 2021-06-17 18:59:46 +02:00
  • cd1aa79277 Added (hit/push/throw)boxes to all basic frames for character Blue. no 2021-06-17 16:39:10 +02:00
  • 22a73fd98f Implemented functions for ForwardD in BlueNormals and added the attack in CharacterBlue keizaal 2021-06-17 17:28:27 +02:00
  • 1eaa149d69 Stick now used in Inputs.java Antoine 2021-06-17 16:56:16 +02:00
  • 7392978c9e fix div par 0 Antoine 2021-06-17 16:31:25 +02:00
  • 24e6ff0a45 Merge remote-tracking branch 'origin/master' Antoine 2021-06-17 16:24:19 +02:00
  • 04f1cdbff9 Petit fix, corrige le fait que les 2 personnages crouch en même temps + dash constant Antoine 2021-06-17 16:24:12 +02:00
  • 4fa23e83fd Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git keizaal 2021-06-17 15:43:03 +02:00