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

Commit Graph

  • bd51756717 Changed some fonction in Blueormals and added functions for crouche C Fierce Added the new attack in CharacterBlue Rémi Rativel 2021-06-17 15:42:50 +02:00
  • 8fdf623724 Merge remote-tracking branch 'origin/master' no 2021-06-17 14:44:06 +02:00
  • e389a0cb0a Glyphs for controller prompt Antoine 2021-06-17 14:55:38 +02:00
  • 3d4eae9911 Added a comment in blueBaseFrames to copy-past for easier Frame method generation. Azra Victor 2021-06-17 14:43:50 +02:00
  • ec45df9c5e Nouveau shader pour les barres de progression qui donne un aspect "tube" Antoine 2021-06-17 14:34:52 +02:00
  • 5d95e2223f changed data for blue bas frames. Changed main function in that for better testing of correct hitboxes placement. Azra Victor 2021-06-17 14:26:38 +02:00
  • d587940b45 Gradient Antoine 2021-06-17 01:46:36 +02:00
  • fc7b2b7945 correction timer update Antoine 2021-06-17 01:20:04 +02:00
  • c4e3c9623d Habillage barre de vie + timer qui fonctionne Antoine 2021-06-17 01:11:35 +02:00
  • 9ff78c3382 Merge remote-tracking branch 'origin/master' Antoine 2021-06-16 23:45:58 +02:00
  • aecb07b227 L'image des ombres + sprite_zorder.txt pour ordonner l'agencement des sprites Antoine 2021-06-16 23:45:52 +02:00
  • 10f2477800 add health bar texture Indy 2021-06-16 18:05:33 +02:00
  • 846716db11 SortZ est maintenant VRAIMENT compatibles avec les flottants ajout d'ombre sous les sprites Antoine 2021-06-16 17:29:40 +02:00
  • 6dbfaa6e14 Nouvelle arène dans match.java :pog: Antoine 2021-06-16 16:12:15 +02:00
  • 24fc20be39 setBackground added in UIElementText.java Antoine 2021-06-16 16:05:06 +02:00
  • 9edc455895 re size windows Indy 2021-06-16 14:27:02 +02:00
  • 4c1f4eb441 Merge remote-tracking branch 'origin/master' Antoine 2021-06-16 14:20:16 +02:00
  • 7432553a70 Barre de vie + timer Antoine 2021-06-16 14:20:04 +02:00
  • 943b254496 Awesome arena + sprite to update Indy 2021-06-16 14:11:00 +02:00
  • 3c63c8fffb windows size Indy 2021-06-16 14:07:47 +02:00
  • cbec6fba9d Montre les coordonnées Antoine 2021-06-16 13:48:52 +02:00
  • 467086b3ba correction of a little error in Inputs Léo 2021-06-16 13:28:06 +02:00
  • fa3c5eb4a7 Input recognition modification. Hopefully finally works. Azra Victor 2021-06-16 12:27:49 +02:00
  • 1945e7bd4a changed dash input to prevent characters constantly dashing instead of walking. Azra Victor 2021-06-16 12:12:47 +02:00
  • 78014315ab added blue forward and back dash Azra Victor 2021-06-16 12:02:39 +02:00
  • 3707324146 Merge remote-tracking branch 'origin/master' no 2021-06-16 11:34:44 +02:00
  • 4c12669013 correction of a little bug Léo 2021-06-16 12:12:46 +02:00
  • 442216436c Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git Léo 2021-06-16 12:05:49 +02:00
  • 67cd559e5f gamepad1 -> P1 , gamepad2-> P2 Léo 2021-06-16 12:05:18 +02:00
  • 5a32d5d1fb Made input recognition more accurate. Adjusted light rising punch movement. Azra Victor 2021-06-16 11:34:35 +02:00
  • 6863b399da Added blue light rising punch special. Azra Victor 2021-06-16 11:04:20 +02:00
  • d0a842c481 added blue stand jab and heavy kick moves Azra Victor 2021-06-16 10:40:46 +02:00
  • 0fc5db4f58 correction of a small error in the updating of the position of the sprites. Azra Victor 2021-06-16 00:53:58 +02:00
  • ddaf700b55 corrected the jumps so they would rise correctly, as well as an issue with the position update in match. Azra Victor 2021-06-16 00:38:59 +02:00
  • c3430a9f3f Another try for nextFrameBuffer. Azra Victor 2021-06-15 23:58:14 +02:00
  • 2327859b21 removed a try catch in nextFramesBuffer.goToNext() that should resolve some issues. no 2021-06-15 23:54:12 +02:00
  • 2f9b1c8af3 small bug correction in Attack.isSpecial(). no 2021-06-15 23:43:58 +02:00
  • 0da23a58db trying to avoid a stack overflow in nextFrameBuffer no 2021-06-15 23:21:37 +02:00
  • b95fb758b6 Created class for Blue Normals. removed the static option in Entity.java, which should correct some bugs. no 2021-06-15 22:30:35 +02:00
  • f3ab1e4c4d Removed STICKY property in SetTextureWrap Antoine 2021-06-14 18:38:37 +02:00
  • 95d2d7e21c WavyTextVert.glsl + support des shaders dans UIElementText.java Antoine 2021-06-14 17:03:10 +02:00
  • acf62519f4 Cleanup uniformInjection Antoine 2021-06-14 14:50:23 +02:00
  • ae4a332eaf Framework pour utliser les shaders sur du texte Antoine 2021-06-14 14:47:05 +02:00
  • f93f801e0b HorizontalProgressBar.java now can be filled left to right or the other way Antoine 2021-06-12 03:09:43 +02:00
  • 8b9d698acc ProgressBar.java added, can be used to represent healthbar ;o) Antoine 2021-06-12 02:47:13 +02:00
  • f85a15b393 Plus besoin d'avoir deux manettes branchées Antoine 2021-06-11 16:11:19 +02:00
  • 6ac2db30ea Affiche le controleur utilisé par chaque joueur Antoine 2021-06-11 16:03:51 +02:00
  • e2586cbcd2 Les manettes devraient maintenant être detectées dans main -> match.java Antoine 2021-06-11 15:55:08 +02:00
  • 913adb8d92 Match se ferme quand on clique sur la croix Antoine 2021-06-10 16:04:18 +02:00
  • 9779f41266 trying to avoid a stack overflow in ac Azra Victor 2021-06-10 14:54:51 +02:00
  • 0c8f5743e5 error correction about inputs in match.java Léo 2021-06-10 15:49:18 +02:00
  • 9dc820b35a Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git Léo 2021-06-10 15:47:32 +02:00
  • 8ef8dcc21e error correction about inputs in match.java Léo 2021-06-10 15:46:51 +02:00
  • 6e4a81a159
         Now ignores game.set François Autin 2021-06-10 15:43:11 +02:00
  • 8fc483b7e5
         Deleted configuration package. François Autin 2021-06-10 15:41:39 +02:00
  • 1f58b184b8
         Improved launcher looks. François Autin 2021-06-10 15:38:17 +02:00
  • bf9ba6010e Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git François Autin 2021-06-10 15:21:10 +02:00
  • 76bfe1d56e
         Launcher overhaul. Now capable of setting resolution and fullscreen set. François Autin 2021-06-10 15:20:26 +02:00
  • 83635cff06 Merge remote-tracking branch 'origin/master' Antoine 2021-06-10 15:20:26 +02:00
  • 50a32512b7 Premier fix Antoine 2021-06-10 15:20:20 +02:00
  • 6028c8e965 Merge remote-tracking branch 'origin/master' Antoine 2021-06-10 15:18:02 +02:00
  • ce0bbf20b4 Premier fix il faut encore corriger le clignotement Antoine 2021-06-10 15:16:56 +02:00
  • a7cc1f58ca Merge remote-tracking branch 'origin/master' Antoine 2021-06-10 14:25:01 +02:00
  • b363cbc9c7 Meilleur gestion d'erreur dans Engine.init() Antoine 2021-06-10 14:22:45 +02:00
  • f6d44128b2 trying to avoid a stack overflow in nextFrameBuffer no 2021-06-10 14:20:14 +02:00
  • ea4762c50e small error corrections Azra Victor 2021-06-10 14:06:15 +02:00
  • 4ad12a3a59 small change in gameplay.inputbuffer to hopefully prevent stack overflows. no 2021-06-10 13:54:16 +02:00
  • 0d5aaad4f0 erreur d'inputRefresh contrée Léo 2021-06-10 14:44:46 +02:00
  • 0939c047ad small changes in match Azra Victor 2021-06-10 13:28:58 +02:00
  • fba6c50de0
         Added partial resolution setting support. François Autin 2021-06-10 14:07:06 +02:00
  • 677e4dd013
         Settings agnostic to invalid configuation file François Autin 2021-06-10 14:02:48 +02:00
  • 264f53f88d Merge remote-tracking branch 'origin/master' no 2021-06-10 12:40:58 +02:00
  • 03c3ed0d92 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git François Autin 2021-06-10 13:35:15 +02:00
  • 29470c5e82
         Added new configuration file François Autin 2021-06-10 13:32:06 +02:00
  • 4572a1659f
         Refactored launcher.Settings to use new configuration.Config François Autin 2021-06-10 13:31:36 +02:00
  • bacf117aa5
         Fully rewrote configuration.Config François Autin 2021-06-10 13:30:49 +02:00
  • bc48da8109
         Refactored configuration package François Autin 2021-06-10 13:30:07 +02:00
  • 63ac95865a small changes in match to reduce crashes Azra Victor 2021-06-10 12:40:09 +02:00
  • 93f5727569 Built a basic movement test, can't test because it doesn't recognize my gamepads. no 2021-06-10 11:50:38 +02:00
  • f56c84ef8e Added some more frames for Blue. Updated Action constructors. no 2021-06-10 10:06:44 +02:00
  • 10b3b60598 - added some of the first frames (though still incomplete themselves) for the first character. - changed pos and size data for hitboxes from double to float no 2021-06-10 02:38:47 +02:00
  • 1f0a14bb23 deleted an unused constructor in Push Hitbox Rémi Rativel 2021-06-09 18:18:44 +02:00
  • f25769390a fix some type problems in HitBox Rémi Rativel 2021-06-09 18:16:45 +02:00
  • bcc822e093 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git root 2021-06-09 17:45:47 +02:00
  • 0d929b67ca Implemented HandleThrow in match and added some fonction in Character and ThrowPart Rémi Rativel 2021-06-09 17:45:09 +02:00
  • 7ce4646e82 Sprite for demo Indy 2021-06-09 16:04:54 +02:00
  • be6c025b39 Delete perso1_sprite(to update).png Boyeau Indy 2021-06-09 13:57:25 +00:00
  • d152b2c0aa TestEngine Antoine 2021-06-09 14:55:39 +02:00
  • 7439137e4d Hitbox added Antoine 2021-06-09 14:34:32 +02:00
  • ed2f49ad0e Main Gameplay Loop done. Only Missing Throws and Projectile handling. Need to be fused with engine. Azra Victor 2021-06-09 13:14:17 +02:00
  • 1ec5cddf3d Hit Handling. Unfinished. no 2021-06-09 02:14:51 +02:00
  • ced29d97b8 Added an attribute for frame Rémi Rativel 2021-06-08 20:13:21 +02:00
  • 759ea2222d Added getter and Setter for frame's attributes Rémi Rativel 2021-06-08 20:11:13 +02:00
  • 987f0c3703 Merge remote-tracking branch 'origin/master' Antoine 2021-06-08 02:59:00 +02:00
  • 3e893cd07e TrackingSF3ThirdStrick added, attention la crise d'epilepsie Antoine 2021-06-08 02:58:53 +02:00
  • 083935bfe3 Delete jump.wav Dupuis Antoine 2021-06-07 23:59:25 +00:00
  • 5d59f41edc Merge remote-tracking branch 'origin/master' no 2021-06-07 17:38:51 +02:00
  • 5b5960d554 Handling of the inputs done. Determines what the characters next frames will be depending on what th player has input. no 2021-06-07 17:38:35 +02:00
  • 1d8c9b7a1e TrackingTore fonctionne à peu près Antoine 2021-06-07 16:59:19 +02:00
  • 67d4c9be53 Added lots of parameters to Entity and Character so it woul be easier to handle actions during gameplay. no 2021-06-07 15:55:04 +02:00