Merge branch 'dev' into 'feature/AffichageClassement'
# Conflicts: # App/Assets/Scenes/Accueil.unity
Showing
- App/Assets/Images/Avatar.meta 8 additions, 0 deletionsApp/Assets/Images/Avatar.meta
- App/Assets/Images/Avatar/joelAvatar-modified.png 0 additions, 0 deletionsApp/Assets/Images/Avatar/joelAvatar-modified.png
- App/Assets/Images/Avatar/joelAvatar-modified.png.meta 135 additions, 0 deletionsApp/Assets/Images/Avatar/joelAvatar-modified.png.meta
- App/Assets/Images/Avatar/joelAvatarGold-modified.png 0 additions, 0 deletionsApp/Assets/Images/Avatar/joelAvatarGold-modified.png
- App/Assets/Images/Avatar/joelAvatarGold-modified.png.meta 135 additions, 0 deletionsApp/Assets/Images/Avatar/joelAvatarGold-modified.png.meta
- App/Assets/Images/Avatar/joelAvatarGold2-modified.png 0 additions, 0 deletionsApp/Assets/Images/Avatar/joelAvatarGold2-modified.png
- App/Assets/Images/Avatar/joelAvatarGold2-modified.png.meta 135 additions, 0 deletionsApp/Assets/Images/Avatar/joelAvatarGold2-modified.png.meta
- App/Assets/Images/Avatar/joelAvatarGold3-modified.png 0 additions, 0 deletionsApp/Assets/Images/Avatar/joelAvatarGold3-modified.png
- App/Assets/Images/Avatar/joelAvatarGold3-modified.png.meta 135 additions, 0 deletionsApp/Assets/Images/Avatar/joelAvatarGold3-modified.png.meta
- App/Assets/Images/Avatar/joelavatar2-modified.png 0 additions, 0 deletionsApp/Assets/Images/Avatar/joelavatar2-modified.png
- App/Assets/Images/Avatar/joelavatar2-modified.png.meta 135 additions, 0 deletionsApp/Assets/Images/Avatar/joelavatar2-modified.png.meta
- App/Assets/Images/Avatar/joelavatar3-modified.png 0 additions, 0 deletionsApp/Assets/Images/Avatar/joelavatar3-modified.png
- App/Assets/Images/Avatar/joelavatar3-modified.png.meta 135 additions, 0 deletionsApp/Assets/Images/Avatar/joelavatar3-modified.png.meta
- App/Assets/Images/Avatar/joelavatar4-modified.png 0 additions, 0 deletionsApp/Assets/Images/Avatar/joelavatar4-modified.png
- App/Assets/Images/Avatar/joelavatar4-modified.png.meta 135 additions, 0 deletionsApp/Assets/Images/Avatar/joelavatar4-modified.png.meta
- App/Assets/Prefabs/PlayerDashboard.prefab 6 additions, 2 deletionsApp/Assets/Prefabs/PlayerDashboard.prefab
- App/Assets/Scenes/Main.unity 173 additions, 33 deletionsApp/Assets/Scenes/Main.unity
- App/Assets/Scripts/AvatarsHelper.cs 26 additions, 0 deletionsApp/Assets/Scripts/AvatarsHelper.cs
- App/Assets/Scripts/AvatarsHelper.cs.meta 11 additions, 0 deletionsApp/Assets/Scripts/AvatarsHelper.cs.meta
- App/Assets/Scripts/Joueur.cs 8 additions, 4 deletionsApp/Assets/Scripts/Joueur.cs
Please register or sign in to comment