Reecriture complete du calcul et de l'affichage du preview d'un combat
Merge remote-tracking branch 'upstream/develop' into develop2
Merge pull request #3 from gmuller668/develop2

merge develop2 into develop