Merge branch 'master' into 'master'
rangement du git See merge request chirz/cityescape!93
Showing
- Assets/Prefabs/Parcelles/Melvyn_village 2.prefab 307 additions, 282 deletionsAssets/Prefabs/Parcelles/Melvyn_village 2.prefab
- Assets/Prefabs/Parcelles/Melvyn_village.prefab 184 additions, 126 deletionsAssets/Prefabs/Parcelles/Melvyn_village.prefab
- Assets/Scenes/sceneRaffael.unity 3981 additions, 543 deletionsAssets/Scenes/sceneRaffael.unity
- Assets/Scripts/Factory.meta 8 additions, 0 deletionsAssets/Scripts/Factory.meta
- Assets/Scripts/Factory/LoseNature.cs 0 additions, 0 deletionsAssets/Scripts/Factory/LoseNature.cs
- Assets/Scripts/Factory/LoseNature.cs.meta 1 addition, 1 deletionAssets/Scripts/Factory/LoseNature.cs.meta
- Assets/Scripts/GUI/Dialog.cs 2 additions, 1 deletionAssets/Scripts/GUI/Dialog.cs
- Assets/Scripts/Player/PlayerMovement.cs 3 additions, 3 deletionsAssets/Scripts/Player/PlayerMovement.cs
- Assets/Scripts/Shop.meta 8 additions, 0 deletionsAssets/Scripts/Shop.meta
- Assets/Scripts/Shop/Shopping.cs 0 additions, 0 deletionsAssets/Scripts/Shop/Shopping.cs
- Assets/Scripts/Shop/Shopping.cs.meta 1 addition, 1 deletionAssets/Scripts/Shop/Shopping.cs.meta
- Build/LinuxPlayer_s.debug 0 additions, 0 deletionsBuild/LinuxPlayer_s.debug
- Build/UnityPlayer.so 0 additions, 0 deletionsBuild/UnityPlayer.so
- Build/UnityPlayer_s.debug 0 additions, 0 deletionsBuild/UnityPlayer_s.debug
- Build/launch.x86_64 0 additions, 0 deletionsBuild/launch.x86_64
- Build/launch_Data/Managed/Assembly-CSharp.dll 0 additions, 0 deletionsBuild/launch_Data/Managed/Assembly-CSharp.dll
- Build/launch_Data/Managed/Mono.Security.dll 0 additions, 0 deletionsBuild/launch_Data/Managed/Mono.Security.dll
- Build/launch_Data/Managed/System.ComponentModel.Composition.dll 0 additions, 0 deletions...launch_Data/Managed/System.ComponentModel.Composition.dll
- Build/launch_Data/Managed/System.Configuration.dll 0 additions, 0 deletionsBuild/launch_Data/Managed/System.Configuration.dll
- Build/launch_Data/Managed/System.Core.dll 0 additions, 0 deletionsBuild/launch_Data/Managed/System.Core.dll
Please register or sign in to comment