François Autin 62fb41a3a2 Merge branch 'master' of ...

https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git

Conflicts:
	src/gameplay/Characters/Blue/BlueBaseFrames.java

2021-06-24 00:02:29 +02:00

..

engine

glfwGetGamepadName

2021-06-23 21:57:58 +02:00

gameplay

Merge branch 'master' of

2021-06-24 00:02:29 +02:00

launcher

partially improved launcher functionnality

2021-06-23 17:14:57 +02:00

Main.java

Main class now correctly launches the Launcher

2021-05-28 01:16:51 +02:00