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

Commit da0bebab authored 3 years ago by

BLOCH VALENTIN

Downloads
- Plain Diff

Merge branch 'master' into 'master'

AJout de la première scène

See merge request chirz/cityescape!24

parents 80bf5df4 29e83a12

Branches

No related merge requests found

Changes 5

Expand all Hide whitespace changes

Inline Side-by-side

Showing

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

Assets/Import/basic-environment/Overworld.png.meta
Assets/Palets/basic-environment/overworld.prefab 4457 additions, 4457 deletions

Assets/Palets/basic-environment/overworld.prefab
Assets/Prefabs/Verdure/buisson.prefab 2 additions, 2 deletions

Assets/Prefabs/Verdure/buisson.prefab
Assets/Scenes/SampleScene.unity 14462 additions, 54 deletions

Assets/Scenes/SampleScene.unity
UserSettings/EditorUserSettings.asset 24 additions, 0 deletions

UserSettings/EditorUserSettings.asset

with 20033 additions and 5601 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