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

Commit 40fe4cce authored 3 years ago by

GIMENEZ TANGUY

Downloads
- Plain Diff

Merge branch 'master' into 'master'

ajout des tileset decouper

See merge request chirz/cityescape!22

parents 9100d7f5 f15b48fd

Branches

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Assets/Import/basic-environment/IceTileset.png.meta 3533 additions, 5 deletions

Assets/Import/basic-environment/IceTileset.png.meta
Assets/Import/basic-environment/Overworld.png.meta 1088 additions, 1088 deletions

Assets/Import/basic-environment/Overworld.png.meta
Assets/Import/basic-environment/RPG Nature Tileset Autumn.png.meta 1684 additions, 4 deletions

...port/basic-environment/RPG Nature Tileset Autumn.png.meta
Assets/Import/basic-environment/RPG Nature Tileset.png.meta 3580 additions, 4 deletions

Assets/Import/basic-environment/RPG Nature Tileset.png.meta
Assets/Prefabs/InduHouse.prefab 111 additions, 0 deletions

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

Assets/Prefabs/InduHouse.prefab.meta
UserSettings/EditorUserSettings.asset 0 additions, 42 deletions

UserSettings/EditorUserSettings.asset

with 10003 additions and 1143 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