Merge branch 'main' into 'main' (78e5bbfd) · 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
78e5bbfd

Commit 78e5bbfd authored 3 years ago by

MrWarzo

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'main' into 'main'

Merge Joffrey - Jordan

See merge request !42

parents f782be47 e75cfe9d

Branches

Tags

1 merge request!42Merge Joffrey - Jordan

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

T3-Unity/Assets/Scenes/Map_Tests1.unity 74 additions, 21 deletions

T3-Unity/Assets/Scenes/Map_Tests1.unity
T3-Unity/Assets/Scenes/Map_Tests1.unity.meta 0 additions, 0 deletions

T3-Unity/Assets/Scenes/Map_Tests1.unity.meta
T3-Unity/Assets/Scripts/GameManager.cs 2 additions, 2 deletions

T3-Unity/Assets/Scripts/GameManager.cs
T3-Unity/Assets/Scripts/WaypointsFactory.cs 0 additions, 0 deletions

T3-Unity/Assets/Scripts/WaypointsFactory.cs
T3-Unity/Assets/Scripts/WaypointsFactory.cs.meta 0 additions, 0 deletions

T3-Unity/Assets/Scripts/WaypointsFactory.cs.meta
T3-Unity/Assets/test.json 415 additions, 1143 deletions

T3-Unity/Assets/test.json
T3-Unity/ProjectSettings/EditorBuildSettings.asset 1 addition, 1 deletion

T3-Unity/ProjectSettings/EditorBuildSettings.asset

with 492 additions and 1167 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