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

Commit c11a1467 authored 4 years ago by

BLOCH VALENTIN

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Ajout des dialogues avec les border

See merge request chirz/cityescape!61

parents 583d5276 4f33295a

Branches

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Import/ShopItems/canne.png 0 additions, 0 deletions

Assets/Import/ShopItems/canne.png
Assets/Import/ShopItems/canne.png.meta 108 additions, 0 deletions

Assets/Import/ShopItems/canne.png.meta
Assets/Prefabs/baton.prefab 84 additions, 0 deletions

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

Assets/Prefabs/baton.prefab.meta
Assets/Scripts/GUI/Dialog.cs 18 additions, 4 deletions

Assets/Scripts/GUI/Dialog.cs
Assets/Scripts/Game/GenerateMap.cs 1 addition, 1 deletion

Assets/Scripts/Game/GenerateMap.cs
Assets/Scripts/Inventory/Border.cs 16 additions, 1 deletion

Assets/Scripts/Inventory/Border.cs

with 234 additions and 6 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