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

Commit 542c0182 authored 3 years ago by

BLOCH VALENTIN

Downloads
- Plain Diff

Merge branch 'master' into 'master'

On perd de la vie petit a petit

See merge request chirz/cityescape!15

parents 6187e9c0 e078814b

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
.vs/cityescape/xs/UserPrefs.xml 0 additions, 30 deletions

.vs/cityescape/xs/UserPrefs.xml
.vs/cityescape/xs/project-cache/Assembly-CSharp-Debug.json 0 additions, 1 deletion

.vs/cityescape/xs/project-cache/Assembly-CSharp-Debug.json
Assets/Prefabs/Player.prefab 22 additions, 1 deletion

Assets/Prefabs/Player.prefab
Assets/Scenes/Valentin.unity 50 additions, 101 deletions

Assets/Scenes/Valentin.unity
Assets/Scenes/sceneTanguy.unity 113 additions, 87 deletions

Assets/Scenes/sceneTanguy.unity
Assets/Scripts/Camera/CameraMouvement.cs 11 additions, 7 deletions

Assets/Scripts/Camera/CameraMouvement.cs
Assets/Scripts/GUI/Bar.cs 2 additions, 2 deletions

Assets/Scripts/GUI/Bar.cs
Assets/Scripts/Player/PlayerNature.cs 28 additions, 5 deletions

Assets/Scripts/Player/PlayerNature.cs

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