Antoine
aa06c55dd7
Merge remote-tracking branch 'origin/master'
2021-05-31 19:39:18 +02:00
Antoine
ccdbbfb279
Son de test
2021-05-31 19:39:11 +02:00
Léo
db05036c01
detection of all gamepad buttons (except RT LT)
2021-05-31 19:09:07 +02:00
Antoine
bd587a5587
SoundManager, SoundBuffer Fixed, BufferUtils.java rename to BufferUtilsEngine.java to avoid conflict with org.lwjgl.BufferUtils
...
Le son fonctionne yay
2021-05-31 18:45:38 +02:00
Léo
00a19177c7
gamepadInput updated
2021-05-31 16:54:02 +02:00
Léo
888e5825ba
added gamepadInputClass
2021-05-31 15:36:40 +02:00
Indy
f2b2fa9e9b
parser json to java
2021-05-31 15:01:39 +02:00
Indy
fbd690f427
update pom + reso json
2021-05-31 12:25:39 +02:00
Léo
09562c4216
added input package
...
test for control binding
2021-05-30 19:06:15 +02:00
Antoine
4f8a32d5a4
SoundManager update
2021-05-29 02:49:33 +02:00
François Autin
a9bbde6c46
Removed references to JXInput (using directinput instead)
2021-05-29 00:54:12 +02:00
Antoine
efbef95aa0
SoundManager import
2021-05-29 00:46:50 +02:00
Antoine
17ca8eedb7
SoundBuffer, SoundListener, SoundManager, SoundSource, Correction d'un shader qui portait pas très bien son nom.
2021-05-29 00:36:33 +02:00
François Autin
bd2a338370
Update README.md
2021-05-28 20:59:48 +00:00
François Autin
41784b3d2e
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
2021-05-28 22:58:09 +02:00
François Autin
f20bd55e9e
Added JXInput dependency to project + POM cleanup
2021-05-28 22:57:56 +02:00
Antoine
9fb1de708a
Merge remote-tracking branch 'origin/master'
2021-05-28 18:35:40 +02:00
Antoine
0185a14b0b
Input """cleanup"""
2021-05-28 18:34:49 +02:00
Indy
a4573fd3c0
replace json file
2021-05-28 16:05:30 +02:00
Boyeau Indy
3fdcebf93b
Update config.json
2021-05-28 13:12:48 +00:00
Boyeau Indy
2cbf37511a
Update config.json
2021-05-28 13:12:18 +00:00
Indy
dea8cbd562
conf file json
2021-05-28 15:07:48 +02:00
Antoine
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
2021-05-28 13:37:03 +02:00
Antoine
9612db9b49
Modification du constructeur d'Engine ajout de la largeur et la hauteur de la fenêtre ainsi que l'aspect ratio
2021-05-28 13:02:48 +02:00
François Autin
d57696c30d
Untracked .project
2021-05-28 02:56:38 +02:00
François Autin
8eea24a428
Removed .idea from repo, should be kept for IDEA users though
2021-05-28 02:52:43 +02:00
François Autin
7c1992e71e
Updated .gitignore
2021-05-28 02:50:16 +02:00
François Autin
a88cbebd18
Removed window decorations from launcher
...
Prevents resizing the window thus renders theme development easier
2021-05-28 01:20:26 +02:00
François Autin
0da311c65a
Main class now correctly launches the Launcher
...
Commented out game object from being created
2021-05-28 01:16:51 +02:00
François Autin
cd7627d36d
Launcher now finds and correctly sets main Scene
2021-05-28 01:15:50 +02:00
François Autin
4e99b1e115
Added stage attr along with getters and setters to launcher.Settings.
2021-05-28 00:55:12 +02:00
François Autin
b52bbb506a
Added setting file manipulator class to launcher package.
...
Contains getters, setters, setDefaultSettings method in case of failure
of parseSettings method (currently not implemented).
2021-05-28 00:50:57 +02:00
Antoine
809c9e5be7
1d simple perlin noise
2021-05-27 19:02:46 +02:00
François Autin
8d039a1828
Updated gameplay.match package to fit naming conventions
2021-05-27 17:46:30 +02:00
François Autin
de721b59ab
Corrected classpath, new (and clearer) package arrangement.
2021-05-27 17:45:02 +02:00
François Autin
b98d1908f6
Merge branch 'Gameplay' into 'master'
...
Merge of Gameplay into Master
See merge request fautin/jeu-de-combat!6
2021-05-27 15:31:21 +00:00
François Autin
ccf004ee0a
Merge branch 'master' into 'Gameplay'
...
# Conflicts:
# .gitignore
2021-05-27 15:31:16 +00:00
François Autin
3452c10a02
Update README.md
2021-05-27 14:22:17 +00: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
keizaal
c9b788887b
update Frame
2021-05-27 16:22:25 +02:00
keizaal
8789416057
Added constrructors for Frame and Push_HitBox
2021-05-27 16:22:08 +02:00
keizaal
43146a3aab
Changed hit function to be coherent with the attribut pushHitBox in
...
Frame
2021-05-27 15:54:26 +02:00
keizaal
e52f8e890e
Merge branch 'Gameplay' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into Gameplay
2021-05-27 15:49:13 +02:00
keizaal
f0aa2592fd
Started implementation of Frame
2021-05-27 15:49:07 +02:00
no
44503c5f44
added nextFrameBuffer with basic functions
2021-05-27 15:29:20 +02:00
Indy
22e2f07dca
new sprite
2021-05-27 15:20:24 +02:00
keizaal
e1d1803cd2
Added some comments
2021-05-27 15:18:35 +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
keizaal
a0a8323032
Implémentation des constructeurs et fonctions de HitBox
2021-05-27 14:53:08 +02:00
