Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Projet Unity S4 IUT Orsay
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sofiane Lasri
Projet Unity S4 IUT Orsay
Commits
e4ee9e3b
Commit
e4ee9e3b
authored
3 years ago
by
Sofiane Lasri
Browse files
Options
Downloads
Patches
Plain Diff
fixed broken menu scene
parent
f62bca92
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Assets/Scenes/MainMenu.unity
+0
-4
0 additions, 4 deletions
Assets/Scenes/MainMenu.unity
ProjectSettings/EditorBuildSettings.asset
+1
-12
1 addition, 12 deletions
ProjectSettings/EditorBuildSettings.asset
with
1 addition
and
16 deletions
Assets/Scenes/MainMenu.unity
+
0
−
4
View file @
e4ee9e3b
...
@@ -38,11 +38,7 @@ RenderSettings:
...
@@ -38,11 +38,7 @@ RenderSettings:
m_ReflectionIntensity
:
1
m_ReflectionIntensity
:
1
m_CustomReflection
:
{
fileID
:
0
}
m_CustomReflection
:
{
fileID
:
0
}
m_Sun
:
{
fileID
:
0
}
m_Sun
:
{
fileID
:
0
}
<<<<<<< Updated upstream
m_IndirectSpecularColor
:
{
r
:
0.4514196
,
g
:
0.5008462
,
b
:
0.5719757
,
a
:
1
}
m_IndirectSpecularColor
:
{
r
:
0.4514196
,
g
:
0.5008462
,
b
:
0.5719757
,
a
:
1
}
=======
m_IndirectSpecularColor
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
1
}
>
>>>>>>
Stashed
changes
m_UseRadianceAmbientProbe
:
0
m_UseRadianceAmbientProbe
:
0
---
!u!157
&3
---
!u!157
&3
LightmapSettings
:
LightmapSettings
:
...
...
This diff is collapsed.
Click to expand it.
ProjectSettings/EditorBuildSettings.asset
+
1
−
12
View file @
e4ee9e3b
...
@@ -4,16 +4,5 @@
...
@@ -4,16 +4,5 @@
EditorBuildSettings
:
EditorBuildSettings
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
serializedVersion
:
2
serializedVersion
:
2
m_Scenes
:
m_Scenes
:
[]
-
enabled
:
1
<<<<<<< Updated upstream
path
:
Assets/Scenes/MainMenu.unity
guid
:
50c5b4897a71dc64399811a98a1eae49
=======
path
:
Assets/Scenes/Hub.unity
guid
:
548ff420e1a556f44ab8d1326b7d9200
- enabled
:
1
path
:
Assets/Scenes/SampleScene.unity
guid
:
9fc0d4010bbf28b4594072e72b8655ab
>
>>>>>>
Stashed
changes
m_configObjects
:
{}
m_configObjects
:
{}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment