Rativel/jeu-de-combat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
427 Commits 1 Branch 3 Tags
d7984e42e00a808c200ca1abd496b43ff9fd0801
Commit Graph
57 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
no a97ebb5655 Merge remote-tracking branch 'origin/master' 2021-06-24 12:27:49 +02:00
no 5e7e0e2f89 Merge remote-tracking branch 'origin/master' 2021-06-24 11:44:44 +02:00
no 113aa5ebe1 Merge remote-tracking branch 'origin/master' 2021-06-24 01:10:06 +02:00
no 3f9beb1198 Merge remote-tracking branch 'origin/master' 2021-06-24 00:15:39 +02:00
no 9ca70a99c5 added hitboxes for blue jump D 2021-06-24 00:15:34 +02:00
no 0b4b7e8ece added hitboxes for blue jump C 2021-06-23 23:47:32 +02:00
no 02bb004cb1 added hitboxes for blue jump A 2021-06-23 23:39:56 +02:00
no 460a3f68f8 Merge remote-tracking branch 'origin/master' 2021-06-23 22:38:44 +02:00
no 1b669442c0 Corrected sprites and addedhitboxes for blue cruch D 2021-06-23 22:37:48 +02:00
no 74bad4b80b Merge remote-tracking branch 'origin/master' 2021-06-23 20:05:54 +02:00
no 6c9c87b50e Merge remote-tracking branch 'origin/master' 2021-06-23 19:47:33 +02:00
no 2d54c76bc6 Merge remote-tracking branch 'origin/master' 2021-06-23 19:21:47 +02:00
no 2edf441b95 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/gameplay/Characters/Blue/BlueNormals.java
 2021-06-23 15:54:57 +02:00
no 5145e3cef0 added stand D hitboxes 2021-06-23 12:32:49 +02:00
no 6325f76942 Merge remote-tracking branch 'origin/master' 2021-06-20 18:39:44 +02:00
no 24d1438801 added check for removeattackpart so that it shouldn't crash. 2021-06-20 18:37:03 +02:00
no ebf4c198ad Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/gameplay/Characters/Blue/BlueNormals.java
 2021-06-20 17:57:35 +02:00
no eeece5fcd1 added blue stand and crouch block frames 2021-06-20 17:45:25 +02:00
no caf2499774 finished adding hitboxes for stand A 2021-06-20 16:57:40 +02:00
no 15024bd497 Corrected a bug that often made the wrong frame display. 2021-06-20 16:25:49 +02:00
no adfcf068e6 Corrected small backjump glitch. 
added Forward Rounhouse move to Blue's attack list.
 2021-06-17 18:59:46 +02:00
no cd1aa79277 Added (hit/push/throw)boxes to all basic frames for character Blue. 2021-06-17 16:39:10 +02:00
no 8fdf623724 Merge remote-tracking branch 'origin/master' 2021-06-17 14:44:06 +02:00
no 3707324146 Merge remote-tracking branch 'origin/master' 2021-06-16 11:34:44 +02:00
no 2327859b21 removed a try catch in nextFramesBuffer.goToNext() that should resolve some issues. 2021-06-15 23:54:12 +02:00
no 2f9b1c8af3 small bug correction in Attack.isSpecial(). 2021-06-15 23:43:58 +02:00
no 0da23a58db trying to avoid a stack overflow in nextFrameBuffer 2021-06-15 23:21:37 +02:00
no b95fb758b6 Created class for Blue Normals. 
removed the static option in Entity.java, which should correct some bugs.
 2021-06-15 22:30:35 +02:00
no f6d44128b2 trying to avoid a stack overflow in nextFrameBuffer 2021-06-10 14:20:14 +02:00
no 4ad12a3a59 small change in gameplay.inputbuffer to hopefully prevent stack overflows. 2021-06-10 13:54:16 +02:00
no 264f53f88d Merge remote-tracking branch 'origin/master' 2021-06-10 12:40:58 +02:00
no 93f5727569 Built a basic movement test, can't test because it doesn't recognize my gamepads. 2021-06-10 11:50:38 +02:00
no f56c84ef8e Added some more frames for Blue. 
Updated Action constructors.
 2021-06-10 10:06:44 +02:00
no 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
 2021-06-10 02:38:47 +02:00
no 1ec5cddf3d Hit Handling. Unfinished. 2021-06-09 02:14:51 +02:00
no 5d59f41edc Merge remote-tracking branch 'origin/master' 2021-06-07 17:38:51 +02:00
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
no 2b0adacbcb Merge remote-tracking branch 'origin/master' 2021-06-03 13:22:57 +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
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
no ab03782425 Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat 2021-06-02 14:27:12 +02:00
no 2fd3dc61d9 change dsome things inmatch, added the start of amain function. 2021-06-01 21:02:11 +02:00
no 6ac7b22a02 Merge branch 'Gameplay' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into Gameplay 2021-05-27 15:29:51 +02:00
no 44503c5f44 added nextFrameBuffer with basic functions 2021-05-27 15:29:20 +02:00
no de54803edf created projectile class 2021-05-27 15:00:43 +02:00
no dfdf9b5d9e improved attack comments 2021-05-27 15:00:20 +02:00
no bbdcf7f1d2 Merge branch 'Gameplay' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into Gameplay 2021-05-27 14:30:15 +02:00
no 31d5cad0fc Added base Attack class parameters. 2021-05-27 14:26:14 +02:00
no 2710c91b00 Added Handling of Inputs recognition. 2021-05-27 14:13:02 +02:00
no e02acbcf5c Started adjusting the handling of Inputs 2021-05-27 13:43:42 +02:00
no d6c35e24c5 slight adjustmentson the inputbuffer 2021-05-27 13:03:29 +02:00
no cc811c93a2 Completed match constructor. 2021-05-27 01:17:41 +02:00
no 4719b3e9f2 Added base for general entities and characters (sub-class of entity) 2021-05-27 01:11:59 +02:00
no 296ec9c821 Ordered files and folders a bit 2021-05-27 00:54:28 +02:00
no b3f762ca3c started making the base Match constructor. 2021-05-27 00:37:04 +02:00
no abac835b84 changed inputBuffer and added base function to have it work. 
First creation of the Match
 2021-05-27 00:06:12 +02:00