merge conflict

This commit is contained in:
Frederic Leger
2023-12-15 15:40:13 -05:00
parent 77a982b1fa
commit 570bef266c
8 changed files with 169 additions and 181 deletions

View File

@@ -31,6 +31,7 @@
#define TEXTURE_SIZE 512
#define MAX_BULLETS 512
#define NB_BOOST 1
#define TIME_SPEED_BOOST 10 //secondes
#define TIME_DAMAGE_BOOST 10 //secondes
#define TIME_INVINCIBLE_BOOST 4 //secondes