Merge branch 'main' into 'main' (4ae5840c) · Commits · The Pain de Mii / TheLegendOfSimon_LAS21_T3_D · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

TheLegendOfSimon_LAS21_T3_D
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

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.

The Pain de Mii
TheLegendOfSimon_LAS21_T3_D
Commits
4ae5840c

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

Commit 4ae5840c authored 3 years ago by

GIRAULT COLIN

Downloads
- Plain Diff

Merge branch 'main' into 'main'

Placement_objects

See merge request !67

parents 32449af0 3453ce2f

1 merge request!67Placement_objects

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

T3-Unity/Assets/Scenes/Map_Tests1.unity 455 additions, 449 deletions

T3-Unity/Assets/Scenes/Map_Tests1.unity
T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs 20 additions, 4 deletions

T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs
T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs 16 additions, 0 deletions

T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs
T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs.meta 11 additions, 0 deletions

T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs.meta
T3-Unity/Assets/Scripts/UI/Ui.cs 7 additions, 4 deletions

T3-Unity/Assets/Scripts/UI/Ui.cs
T3-Unity/Assets/Scripts/UI/nbObstacle.cs 3 additions, 3 deletions

T3-Unity/Assets/Scripts/UI/nbObstacle.cs
T3-Unity/Assets/scip.cs 18 additions, 0 deletions

T3-Unity/Assets/scip.cs
T3-Unity/Assets/scip.cs.meta 11 additions, 0 deletions

T3-Unity/Assets/scip.cs.meta

with 541 additions and 460 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