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

Commit f532257e authored 3 years ago by

GIMENEZ TANGUY

Downloads
- Plain Diff

Merge branch 'master' into 'debug'

Changement des hitbox usine & Ajout des évaluations de nos chers S2

See merge request chirz/cityescape!99

parents e69d2bbf b9281c10

Branches

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Prefabs/Parcelles/Melvyn_usine.prefab 8 additions, 8 deletions

Assets/Prefabs/Parcelles/Melvyn_usine.prefab
Documents/Evaluation-T4-Colin_Girault.md 227 additions, 0 deletions

Documents/Evaluation-T4-Colin_Girault.md
Documents/Evaluation-T4-Hugo_SCHELLINGER.md 201 additions, 0 deletions

Documents/Evaluation-T4-Hugo_SCHELLINGER.md
Documents/Evaluation-T4-Laurine_Mangin.md 195 additions, 0 deletions

Documents/Evaluation-T4-Laurine_Mangin.md
Documents/Evaluation-T4-Paul_Chopinet.md 189 additions, 0 deletions

Documents/Evaluation-T4-Paul_Chopinet.md

with 820 additions and 8 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