Merge branch 'master' into 'master' (5ff70994) · 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
5ff70994

Commit 5ff70994 authored 3 years ago by

DI-PIETRO RAFFAEL

Downloads
- Plain Diff

Merge branch 'master' into 'master'

items de vente

See merge request chirz/cityescape!58

parents 075d2718 98504a48

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Import/ShopItems/Stove.png 0 additions, 0 deletions

Assets/Import/ShopItems/Stove.png
Assets/Import/ShopItems/Stove.png.meta 120 additions, 0 deletions

Assets/Import/ShopItems/Stove.png.meta
Assets/Prefabs/Stove.prefab 84 additions, 0 deletions

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

Assets/Prefabs/Stove.prefab.meta
Assets/Scenes/Niveau1.unity 1 addition, 82 deletions

Assets/Scenes/Niveau1.unity
Documents/CahierDesCharges.md 21 additions, 2 deletions

Documents/CahierDesCharges.md

with 233 additions and 84 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