Commit Graph

Select branches

Hide Pull Requests

master

1.0

2021-06-21-SNAPSHOT

snapshot-21-06-25

Mono Color

• 809c9e5be7 1d simple perlin noise Antoine 2021-05-27 19:02:46 +02:00
• 8d039a1828 Updated gameplay.match package to fit naming conventions François Autin 2021-05-27 17:46:30 +02:00
• de721b59ab Corrected classpath, new (and clearer) package arrangement. François Autin 2021-05-27 17:45:02 +02:00
• b98d1908f6 Merge branch 'Gameplay' into 'master' François Autin 2021-05-27 15:31:21 +00:00
• ccf004ee0a Merge branch 'master' into 'Gameplay' François Autin 2021-05-27 15:31:16 +00:00
• 3452c10a02 Update README.md François Autin 2021-05-27 14:22:17 +00:00
• 6ac7b22a02 Merge branch 'Gameplay' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into Gameplay no 2021-05-27 15:29:51 +02:00
• c9b788887b update Frame keizaal 2021-05-27 16:22:25 +02:00
• 8789416057 Added constrructors for Frame and Push_HitBox keizaal 2021-05-27 16:22:08 +02:00
• 43146a3aab Changed hit function to be coherent with the attribut pushHitBox in Frame keizaal 2021-05-27 15:54:26 +02:00
• e52f8e890e Merge branch 'Gameplay' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into Gameplay keizaal 2021-05-27 15:49:13 +02:00
• f0aa2592fd Started implementation of Frame keizaal 2021-05-27 15:49:07 +02:00
• 44503c5f44 added nextFrameBuffer with basic functions no 2021-05-27 15:29:20 +02:00
• 22e2f07dca new sprite Indy 2021-05-27 15:20:24 +02:00
• de54803edf created projectile class no 2021-05-27 15:00:43 +02:00
• dfdf9b5d9e improved attack comments no 2021-05-27 15:00:20 +02:00
• bbdcf7f1d2 Merge branch 'Gameplay' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into Gameplay no 2021-05-27 14:30:15 +02:00
• e1d1803cd2 Added some comments keizaal 2021-05-27 15:18:35 +02:00
• a0a8323032 Implémentation des constructeurs et fonctions de HitBox keizaal 2021-05-27 14:53:08 +02:00
• 31d5cad0fc Added base Attack class parameters. no 2021-05-27 14:26:14 +02:00
• 2710c91b00 Added Handling of Inputs recognition. no 2021-05-27 14:13:02 +02:00
• 5c6c55826f conf/pers Indy 2021-05-27 13:51:28 +02:00
• e02acbcf5c Started adjusting the handling of Inputs no 2021-05-27 13:43:42 +02:00
• 04c28b9e0f Merge branch 'engineWIP' into 'master' François Autin 2021-05-27 11:27:41 +00:00
• 252c9d3697 Merge branch 'master' into 'engineWIP' François Autin 2021-05-27 11:27:27 +00:00
• d6c35e24c5 slight adjustmentson the inputbuffer no 2021-05-27 13:03:29 +02:00
• bf2960f58e Lancement de la fenêtre du launceur François Autin 2021-05-27 03:14:20 +02:00
• 9ced943c0a Ajout du fxml du launcher (initial) François Autin 2021-05-27 03:04:08 +02:00
• 75865640aa Progrès ajout Launcher François Autin 2021-05-27 03:02:36 +02:00
• 33a02891fc Ajout des dépendances à JavaFX François Autin 2021-05-27 02:19:42 +02:00
• cc811c93a2 Completed match constructor. no 2021-05-27 01:17:41 +02:00
• 4719b3e9f2 Added base for general entities and characters (sub-class of entity) no 2021-05-27 01:11:59 +02:00
• 296ec9c821 Ordered files and folders a bit no 2021-05-27 00:54:28 +02:00
• b3f762ca3c started making the base Match constructor. no 2021-05-27 00:37:04 +02:00
• dc2b696f7e Shaders modif Antoine 2021-05-27 00:14:28 +02:00
• abac835b84 changed inputBuffer and added base function to have it work. First creation of the Match no 2021-05-27 00:06:12 +02:00
• f7a1bfc062 Added some comments to input and input_attack class keizaal 2021-05-26 23:43:26 +02:00
• 6b97ca6046 Declaration of class Input and Input_Attack (cf class Diagram) keizaal 2021-05-26 23:38:14 +02:00
• 0d1b6de5ad Declaration of all HitBox Class keizaal 2021-05-26 23:28:33 +02:00
• db4e2d0e86 Shaders modif Antoine 2021-05-26 17:23:13 +02:00
• 72c0098f9a Pos zangief Antoine 2021-05-24 19:26:36 +02:00
• 6262dd42d7 we don't call inputGamepad if there is no gamepad Léo 2021-05-24 19:24:57 +02:00
• 5c48a88be4 système pour contrôler le rendu de sprite de taille differente # Pour l'instant toutes les sprites d'un même état doivent être de la même taille Antoine 2021-05-23 00:57:29 +02:00
• ee8473e344 Doc d'ObjectGl dans un Anglais approximatif Antoine 2021-05-21 21:01:42 +02:00
• 574e31e02d Correct frag shader when using texture + color Antoine 2021-05-21 19:51:29 +02:00
• 770d134722 J'ai viré les classes useless Antoine 2021-05-21 19:15:48 +02:00
• ecbe08fdc3 Zangief idle wrap correction Antoine 2021-05-21 18:20:49 +02:00
• 3e12e98010 left joystick control ( textures update) Léo 2021-05-21 17:26:35 +02:00
• 7bcbad5792 added Rightjoystick controls for zangief Léo 2021-05-21 16:43:45 +02:00
• 3cf4372912 test gamepad Inputs Léo 2021-05-21 15:08:02 +02:00
• e3623072ff dynamic scaling vertexArray with textureWrap (no more stretching) Antoine 2021-05-20 23:28:45 +02:00
• bdc2144145 test with Zangief Antoine 2021-05-20 20:55:51 +02:00
• 29685f8e40 swapTexWrap from pixels coordinates of the source image Antoine 2021-05-20 20:04:16 +02:00
• 4fc87e7b08 swapTexWrap added Antoine 2021-05-20 19:02:28 +02:00
• 859344b131 setTexture added Antoine 2021-05-20 18:02:24 +02:00
• 282a8b0283 added isKeyDown Class for keyboard input Léo 2021-05-20 16:26:13 +02:00
• 69cfdadf85 Merge branch 'engineWIP' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into engineWIP Léo 2021-05-20 16:13:32 +02:00
• 59d822015a Keyboard input added In Engine.java Léo 2021-05-20 15:54:54 +02:00
• 8506065de0 drawing sprite back to front Antoine 2021-05-20 15:52:20 +02:00
• 7a79c19c98 added framerate control Antoine 2021-05-19 19:08:09 +02:00
• cf4f121069 Correct projection width Antoine 2021-05-19 18:41:28 +02:00
• e9935403b6 Orthographic camera, viewpoint, correct aspect ratio Antoine 2021-05-19 17:59:05 +02:00
• 57b6be084d ObjectGlTex & ObjectGlTexColor now working :o) Antoine 2021-05-19 15:00:12 +02:00
• 7f491ad597 added ObjectGlTexColor, tweaked shaders Antoine 2021-05-19 05:37:45 +02:00
• 58e94314cc cleanup Engine.java Antoine 2021-05-19 03:35:23 +02:00
• e78b680389 new engine Antoine 2021-05-19 02:52:15 +02:00
• c6181c96fe ObjectGl, ObjectGlColor, ObjectGlTex added Antoine 2021-05-18 21:18:26 +02:00
• b7de1556cc Merge remote-tracking branch 'origin/engineWIP' into engineWIP Antoine 2021-05-18 19:01:27 +02:00
• 4abc87597d Added scaling operation in Matrix4f Antoine 2021-05-18 19:01:18 +02:00
• da6e5e3be8 Upload Architecture moteur Noliere Leo 2021-05-18 16:38:18 +00:00
• 2aa23512be z-buffer Antoine 2021-05-17 19:05:45 +02:00
• 5f4b2aa56e Problem where the angle given in the rotation function was not converted to a radian Antoine 2021-05-17 18:29:58 +02:00
• 2570553b93 transform added Antoine 2021-05-17 14:53:16 +02:00
• e241c7c9b1 Added rotation on the z axis Antoine 2021-05-17 05:56:37 +02:00
• 4c7e32f44b Added rotation on the x and y axis Antoine 2021-05-17 05:52:22 +02:00
• 565bc5edfe Presentation Matrix4f Antoine 2021-05-17 05:45:55 +02:00
• 202c141e4d Organisation Antoine 2021-05-17 05:39:23 +02:00
• 61fee3fbf5 Uploaded drawio file of gameplay loop Azra Victor 2021-05-16 14:28:15 +00:00
• e8827bfe97 Replace gameplay_loop.png Azra Victor 2021-05-16 14:26:23 +00:00
• c36d1db148 Update class-diagram Rativel Remi 2021-05-16 14:03:00 +00:00
• e811223bf9 Delete class-diagram.png Rativel Remi 2021-05-16 14:02:14 +00:00
• c2ffd8c5fb gameplay loop png Azra Victor 2021-05-14 19:44:38 +00:00
• fff3f3e4f6 delete to be properly replaced Azra Victor 2021-05-14 19:44:09 +00:00
• 7251e5ecf5 replace gameplay loop pdf by png for me readability Azra Victor 2021-05-14 19:43:12 +00:00
• 8b8d21c7f8 First flowchart of the gameplay loop. Still needs at least to add how to handle hits being taken. Azra Victor 2021-05-14 19:40:50 +00:00
• 647fe988fb Upload Class Diagram made by Antoine Dupuis, Rémi Rativel and Victor Azra Rativel Remi 2021-05-14 19:40:03 +00:00
• f7cbfe827b Delete class-diagram.png Rativel Remi 2021-05-14 19:39:40 +00:00
• ae511a2fc1 Upload Class Diagram made by Antoine Dupuis, Rémi Rativel and Victor Azra Rativel Remi 2021-05-14 19:28:49 +00:00
• 5d93325b3d Ajout d'un canal texture dans le vertexArray Antoine 2021-05-14 20:46:17 +02:00
• e1cbbb85eb Ajout d'un canal couleur dans le vertexArray Antoine 2021-05-14 18:47:05 +02:00
• 049e735e1a setUniform4f in Shader Antoine 2021-05-14 15:34:08 +02:00
• e4c1c80e4a Ajout du rectangle dans les primitives ajout de la gestion de l'EBO dans scene et VertexArray. Mode Wireframe avec le touche space. Gestion des inputs dans la classe Input Antoine 2021-05-13 21:51:40 +02:00
• b5d18197ff Ajout de classe primitive Antoine 2021-05-13 21:05:11 +02:00
• e2b43446c8 Gestion taille de rendu si modification de la taille de la fenêtre + unbind() à la fin du cycle de rendu du vertexArray Antoine 2021-05-13 20:55:04 +02:00
• b02119dca7 Ajout de la classe: Scene, VertexArray, Shader, ShaderUtils, BufferUtils, FileUtils, Matrix4f, Vector3f Ajout des shaders de test: vert.vert et frag.frag dans le dossier shaders Antoine 2021-05-13 20:40:21 +02:00
• 4e88d1d1a4 Stock Antoine 2021-05-13 16:30:18 +02:00
• 0d522685b7 Test Antoine 2021-04-26 16:06:33 +02:00
• bf781060e2 Merge branch 'fautin-master-patch-37381' into 'master' François Autin 2021-05-11 14:09:08 +00:00
• 681ce93078 Update README.md François Autin 2021-05-11 14:08:58 +00:00
• 85d4a490b9 Merge branch 'fautin-master-patch-37248' into 'master' François Autin 2021-05-11 12:34:51 +00:00