Merge branch 'master' into 'master' (695942ed) · Commits · Chirz / 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
- Terraform modules
- 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.

Chirz
CityEscape
Commits
695942ed

There was an error fetching the commit references. Please try again later.

Commit 695942ed authored 3 years ago by

GIMENEZ TANGUY

Downloads
- Plain Diff

Merge branch 'master' into 'master'

systeme d'inventaire

See merge request chirz/cityescape!44

parents 50040de1 36a67c21

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Assets/Import/basic-environment/Overworld 1.png.meta 1076 additions, 1076 deletions

Assets/Import/basic-environment/Overworld 1.png.meta
Assets/Prefabs/Player.prefab 3 additions, 0 deletions

Assets/Prefabs/Player.prefab
Assets/Prefabs/Shop.prefab 164 additions, 0 deletions

Assets/Prefabs/Shop.prefab
Assets/Prefabs/Shop.prefab.meta 7 additions, 0 deletions

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

Assets/Scenes/Valentin.unity
Assets/Scripts/GUI/Dialog.cs 0 additions, 1 deletion

Assets/Scripts/GUI/Dialog.cs
Assets/Shopping.cs 40 additions, 0 deletions

Assets/Shopping.cs
Assets/Shopping.cs.meta 11 additions, 0 deletions

Assets/Shopping.cs.meta
ProjectSettings/TagManager.asset 6 additions, 0 deletions

ProjectSettings/TagManager.asset

with 1535 additions and 1077 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