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

Commit 1eba3ff1 authored 3 years ago by

GIRAULT COLIN

Downloads
- Plain Diff

Merge branch 'main' into 'main'

Resize_UI

See merge request !52

parents 2a65fdf8 dddcfff9

1 merge request!52Resize_UI

Changes 5

Expand all Hide whitespace changes

Inline Side-by-side

Showing

T3-Unity/Assets/Prefabs/strong_obj .prefab 3 additions, 3 deletions

T3-Unity/Assets/Prefabs/strong_obj .prefab
T3-Unity/Assets/Scenes/Map_Tests1.unity 430 additions, 345 deletions

T3-Unity/Assets/Scenes/Map_Tests1.unity
T3-Unity/Assets/Scripts/Ui.cs 1 addition, 1 deletion

T3-Unity/Assets/Scripts/Ui.cs
T3-Unity/Assets/Scripts/strongObj.cs 1 addition, 1 deletion

T3-Unity/Assets/Scripts/strongObj.cs
T3-Unity/Assets/test.json 434 additions, 286 deletions

T3-Unity/Assets/test.json

with 869 additions and 636 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