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

Commit eada1a9c authored 3 years ago by

BLOCH VALENTIN

Downloads
- Plain Diff

Merge branch 'master' into 'master'

On a mis mes machins

See merge request chirz/cityescape!4

parents e91be835 2e2abb28

Branches

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Assets/Prefabs/BarreDenature.prefab 431 additions, 0 deletions

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

Assets/Prefabs/BarreDenature.prefab.meta
Assets/Prefabs/Character.prefab 48 additions, 0 deletions

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

Assets/Prefabs/Character.prefab.meta
Assets/Scenes/SampleScene.unity 168 additions, 466 deletions

Assets/Scenes/SampleScene.unity
Assets/Scenes/testScene1.unity 105 additions, 0 deletions

Assets/Scenes/testScene1.unity

with 766 additions and 466 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