Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
seedling
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tommé Nöll
seedling
Commits
b9b5b4e1
Commit
b9b5b4e1
authored
Oct 06, 2019
by
Tommé Nöll
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tomme'
parents
6d00e079
2c713b0b
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6127 additions
and
4678 deletions
+6127
-4678
Assets/Prefabs/Enemies/Flying Platform.prefab
Assets/Prefabs/Enemies/Flying Platform.prefab
+7
-7
Assets/Scenes/PilzGrotteL1.unity
Assets/Scenes/PilzGrotteL1.unity
+2047
-1352
Assets/Scenes/PilzGrotteL2.unity
Assets/Scenes/PilzGrotteL2.unity
+2052
-1728
Assets/Scenes/PilzGrotteL3.unity
Assets/Scenes/PilzGrotteL3.unity
+2021
-1591
No files found.
Assets/Prefabs/Enemies/Flying Platform.prefab
View file @
b9b5b4e1
...
...
@@ -129,7 +129,7 @@ SpriteRenderer:
m_RenderingLayerMask
:
1
m_RendererPriority
:
0
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
2100000
,
guid
:
29e4a79a79b470fd5b3021938034169a
,
type
:
2
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
...
...
@@ -5205,15 +5205,15 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
e42b5206757167a4eb0de34f54ab98ed
,
type
:
3
}
---
!u!1
&6241724066686691529
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
6490983961685056084
,
guid
:
e42b5206757167a4eb0de34f54ab98ed
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
903980468320547485
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&6241724066686691532
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
6490983961685056081
,
guid
:
e42b5206757167a4eb0de34f54ab98ed
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
903980468320547485
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&6241724066686691529
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
6490983961685056084
,
guid
:
e42b5206757167a4eb0de34f54ab98ed
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
903980468320547485
}
m_PrefabAsset
:
{
fileID
:
0
}
Assets/Scenes/PilzGrotteL1.unity
View file @
b9b5b4e1
This diff is collapsed.
Click to expand it.
Assets/Scenes/PilzGrotteL2.unity
View file @
b9b5b4e1
This diff is collapsed.
Click to expand it.
Assets/Scenes/PilzGrotteL3.unity
View file @
b9b5b4e1
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment