Merge branch 'master' of git.unistra.fr:chirz/cityescape (b5219ccc) · 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
b5219ccc

Commit b5219ccc authored 3 years ago by

v.bloch

Downloads
- Plain Diff

Merge branch 'master' of git.unistra.fr:chirz/cityescape

parents 29f93a42 87ea5fd1

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Assets/Import/Image/DialogueBOX.png 0 additions, 0 deletions

Assets/Import/Image/DialogueBOX.png
Assets/Import/Image/DialogueBOX.png.meta 96 additions, 0 deletions

Assets/Import/Image/DialogueBOX.png.meta
Assets/Import/Image/keys.png 0 additions, 0 deletions

Assets/Import/Image/keys.png
Assets/Import/Image/keys.png.meta 96 additions, 0 deletions

Assets/Import/Image/keys.png.meta
Assets/Items/2.Baton.asset 1 addition, 1 deletion

Assets/Items/2.Baton.asset
Assets/Prefabs/GUI/BarreDenature.prefab 317 additions, 5 deletions

Assets/Prefabs/GUI/BarreDenature.prefab
Assets/Scenes/sceneRaffael.unity 125 additions, 199 deletions

Assets/Scenes/sceneRaffael.unity
Assets/Scripts/Game/GenerateMap.cs 16 additions, 2 deletions

Assets/Scripts/Game/GenerateMap.cs
Assets/Shopping.cs 56 additions, 1 deletion

Assets/Shopping.cs

with 707 additions and 208 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