Merge branch 'travail' into 'main' (d613566f) · Commits · LE groupe / PEC22-T3-A · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

PEC22-T3-A
- Activity
- Members
- Labels
- Issues
  2
- 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.

LE groupe
PEC22-T3-A
Commits
d613566f

There was an error fetching the commit references. Please try again later.

Commit d613566f authored 2 years ago by

NIEDERBERGER-VIALLE LEO

Downloads
- Plain Diff

Merge branch 'travail' into 'main'

Affichage market

See merge request !163

parents 43bceabd 277b60ae

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

unity_project/Marsgriculteur/Assets/Scenes/Map.unity 73 additions, 99 deletions

unity_project/Marsgriculteur/Assets/Scenes/Map.unity
unity_project/Marsgriculteur/Assets/Script/Game/Inventory.cs 1 addition, 1 deletion

unity_project/Marsgriculteur/Assets/Script/Game/Inventory.cs
unity_project/Marsgriculteur/Assets/Script/Game/InventoryPanel.cs 2 additions, 5 deletions

...oject/Marsgriculteur/Assets/Script/Game/InventoryPanel.cs
unity_project/Marsgriculteur/Assets/Script/HUD/SlotInit.cs 1 addition, 1 deletion

unity_project/Marsgriculteur/Assets/Script/HUD/SlotInit.cs

with 77 additions and 106 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