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

Commit a7f8ca84 authored 3 years ago by

GIRAULT COLIN

Downloads
- Plain Diff

Merge branch 'main' into 'main'

Fusion UI + Map

See merge request !46

parents f08dc83a a4208255

1 merge request!46Fusion UI + Map

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

T3-Unity/Assets/Mapbox/Ui_Object.prefab 100 additions, 0 deletions

T3-Unity/Assets/Mapbox/Ui_Object.prefab
T3-Unity/Assets/Mapbox/Ui_Object.prefab.meta 7 additions, 0 deletions

T3-Unity/Assets/Mapbox/Ui_Object.prefab.meta
T3-Unity/Assets/Scenes/Map_Tests1.unity 3057 additions, 599 deletions

T3-Unity/Assets/Scenes/Map_Tests1.unity
T3-Unity/Assets/Scenes/ui.unity 9 additions, 8 deletions

T3-Unity/Assets/Scenes/ui.unity
T3-Unity/Assets/Scripts/GameManager.cs 18 additions, 8 deletions

T3-Unity/Assets/Scripts/GameManager.cs
T3-Unity/Assets/Scripts/MotivScale.cs 0 additions, 1 deletion

T3-Unity/Assets/Scripts/MotivScale.cs
T3-Unity/Assets/Scripts/Routes/RouteTracer.cs 11 additions, 2 deletions

T3-Unity/Assets/Scripts/Routes/RouteTracer.cs
T3-Unity/Assets/Scripts/UI/ValidateGame.cs 2 additions, 1 deletion

T3-Unity/Assets/Scripts/UI/ValidateGame.cs
T3-Unity/Assets/Scripts/Ui.cs 2 additions, 10 deletions

T3-Unity/Assets/Scripts/Ui.cs
T3-Unity/Assets/Scripts/startText.prefab 197 additions, 0 deletions

T3-Unity/Assets/Scripts/startText.prefab
T3-Unity/Assets/Scripts/startText.prefab.meta 7 additions, 0 deletions

T3-Unity/Assets/Scripts/startText.prefab.meta
T3-Unity/Assets/test.json 837 additions, 129 deletions

T3-Unity/Assets/test.json
T3-Unity/ProjectSettings/EditorBuildSettings.asset 2 additions, 2 deletions

T3-Unity/ProjectSettings/EditorBuildSettings.asset

with 4249 additions and 760 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