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

Commit 44aa681e authored 3 years ago by

BLOCH VALENTIN

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Systeme de dialogue qui marche

See merge request chirz/cityescape!28

parents 535b15e9 e4967a9a

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Import/Font/Fipps-Regular.otf 0 additions, 0 deletions

Assets/Import/Font/Fipps-Regular.otf
Assets/Import/Font/Fipps-Regular.otf.meta 21 additions, 0 deletions

Assets/Import/Font/Fipps-Regular.otf.meta
Assets/Prefabs/GUI/BarreDenature.prefab 20 additions, 1 deletion

Assets/Prefabs/GUI/BarreDenature.prefab
Assets/Scenes/Niveau2.unity 8 additions, 0 deletions

Assets/Scenes/Niveau2.unity
Assets/Scripts/GUI/Dialog.cs 74 additions, 10 deletions

Assets/Scripts/GUI/Dialog.cs
Assets/Scripts/Player/PlayerNature.cs 5 additions, 2 deletions

Assets/Scripts/Player/PlayerNature.cs
UserSettings/EditorUserSettings.asset 2 additions, 5 deletions

UserSettings/EditorUserSettings.asset

with 130 additions and 18 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