Merge branch 'master' into 'master' (2378d167) · Commits · BLOCH VALENTIN / CityEscape · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

CityEscape
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

BLOCH VALENTIN
CityEscape
Commits
2378d167

Commit 2378d167 authored 3 years ago by

GIMENEZ TANGUY

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Mise en fonctionnement des boutiques

See merge request chirz/cityescape!53

parents 7912e26e fa9ec24a

Branches

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Assets/Prefabs/Parcelles/Raffael_boutique.prefab 193 additions, 535 deletions

Assets/Prefabs/Parcelles/Raffael_boutique.prefab
Assets/Prefabs/Shop.prefab 49 additions, 34 deletions

Assets/Prefabs/Shop.prefab
Assets/Scenes/Valentin.unity 18 additions, 0 deletions

Assets/Scenes/Valentin.unity
Assets/Scenes/sceneRaffael.unity 70 additions, 2 deletions

Assets/Scenes/sceneRaffael.unity
Assets/Scripts/Game/GenerateMap.cs 49 additions, 6 deletions

Assets/Scripts/Game/GenerateMap.cs
Assets/Shopping.cs 5 additions, 5 deletions

Assets/Shopping.cs
ProjectSettings/TagManager.asset 2 additions, 1 deletion

ProjectSettings/TagManager.asset

with 386 additions and 583 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment