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

Commit 62a6b85a authored 4 years ago by

GIMENEZ TANGUY

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Ajout de l'élement usine et de la fumée

See merge request chirz/cityescape!12

parents d42355f5 aea21886

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Import/basic-environment/Materials.meta 8 additions, 0 deletions

Assets/Import/basic-environment/Materials.meta
Assets/Import/basic-environment/Materials/usine tile.mat 37 additions, 0 deletions

Assets/Import/basic-environment/Materials/usine tile.mat
Assets/Import/basic-environment/Materials/usine tile.mat.meta 8 additions, 0 deletions

...ts/Import/basic-environment/Materials/usine tile.mat.meta
Assets/Import/basic-environment/fumee.png 0 additions, 0 deletions

Assets/Import/basic-environment/fumee.png
Assets/Import/basic-environment/fumee.png.meta 180 additions, 0 deletions

Assets/Import/basic-environment/fumee.png.meta
Assets/Import/basic-environment/usine tile.png 0 additions, 0 deletions

Assets/Import/basic-environment/usine tile.png
Assets/Import/basic-environment/usine tile.png.meta 108 additions, 0 deletions

Assets/Import/basic-environment/usine tile.png.meta

with 341 additions and 0 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