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
E
Explosive Temper
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
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
GameDevWeek
W
Wintersemester 2018-2019
Unity
Explosive Temper
Commits
c8f9a26c
Commit
c8f9a26c
authored
Mar 31, 2019
by
Larrox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Waterlevel v.2.0 / changed names
parent
98e84283
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
282 additions
and
28 deletions
+282
-28
Assets/_Game/Scenes/2.First Steps.unity
Assets/_Game/Scenes/2.First Steps.unity
+0
-0
Assets/_Game/Scenes/2.First Steps.unity.meta
Assets/_Game/Scenes/2.First Steps.unity.meta
+0
-0
Assets/_Game/Scenes/3.Waterlevel.unity
Assets/_Game/Scenes/3.Waterlevel.unity
+237
-7
Assets/_Game/Scenes/3.Waterlevel.unity.meta
Assets/_Game/Scenes/3.Waterlevel.unity.meta
+0
-0
Assets/_Game/Scenes/4.Obstacle Course.unity
Assets/_Game/Scenes/4.Obstacle Course.unity
+0
-0
Assets/_Game/Scenes/4.Obstacle Course.unity.meta
Assets/_Game/Scenes/4.Obstacle Course.unity.meta
+0
-0
Assets/_Game/Scenes/5.The Climb.unity
Assets/_Game/Scenes/5.The Climb.unity
+26
-1
Assets/_Game/Scenes/5.The Climb.unity.meta
Assets/_Game/Scenes/5.The Climb.unity.meta
+0
-0
Assets/_Game/Scenes/6.Hardcore.unity
Assets/_Game/Scenes/6.Hardcore.unity
+15
-0
Assets/_Game/Scenes/6.Hardcore.unity.meta
Assets/_Game/Scenes/6.Hardcore.unity.meta
+0
-0
Assets/_Game/Scripts/Audio/SoundLists.meta
Assets/_Game/Scripts/Audio/SoundLists.meta
+0
-8
Assets/_Game/Scripts/Tutorial/Level1.meta
Assets/_Game/Scripts/Tutorial/Level1.meta
+0
-8
ProjectSettings/EditorBuildSettings.asset
ProjectSettings/EditorBuildSettings.asset
+4
-4
No files found.
Assets/_Game/Scenes/2.
Der Start
.unity
→
Assets/_Game/Scenes/2.
First Steps
.unity
View file @
c8f9a26c
File moved
Assets/_Game/Scenes/2.
Der Start
.unity.meta
→
Assets/_Game/Scenes/2.
First Steps
.unity.meta
View file @
c8f9a26c
File moved
Assets/_Game/Scenes/
6
.Waterlevel.unity
→
Assets/_Game/Scenes/
3
.Waterlevel.unity
View file @
c8f9a26c
...
...
@@ -2134,7 +2134,7 @@ PrefabInstance:
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalPosition.x
value
:
8
value:
5
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
...
...
@@ -2567,6 +2567,79 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 378961545}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &393417089
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1598589478666133515, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_Name
value: Jet (3)
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalPosition.x
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalPosition.y
value: 5.5
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_RootOrder
value: 14
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1343159811, guid: d0f354b571dcc4be9a9df2950385f833, type: 3}
propertyPath: offset
value: 0.1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d0f354b571dcc4be9a9df2950385f833, type: 3}
--- !u!1001 &395874871
PrefabInstance:
m_ObjectHideFlags: 0
...
...
@@ -3827,6 +3900,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: yMinHoehe
...
...
@@ -3847,6 +3925,16 @@ PrefabInstance:
propertyPath: yMaxHoehe
value: 4.5
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[0]
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[1]
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 655c31af15390a04b9e81f860a5652ad, type: 3}
--- !u!1001 &555167718
...
...
@@ -7747,6 +7835,75 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1230181658}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1257726013
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 738331597592026404, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_Name
value: Checkpoint (1)
objectReference: {fileID: 0}
- target: {fileID: 738331597592026401, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_LocalPosition.x
value: 12
objectReference: {fileID: 0}
- target: {fileID: 738331597592026401, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_LocalPosition.y
value: 7
objectReference: {fileID: 0}
- target: {fileID: 738331597592026401, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 738331597592026401, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 738331597592026401, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 738331597592026401, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 738331597592026401, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 738331597592026401, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_RootOrder
value: 16
objectReference: {fileID: 0}
- target: {fileID: 738331597592026401, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 738331597592026401, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 738331597592026401, guid: d1154549aece39143a3574da6ccd039c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d1154549aece39143a3574da6ccd039c, type: 3}
--- !u!1001 &1262630757
PrefabInstance:
m_ObjectHideFlags: 0
...
...
@@ -8347,6 +8504,79 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1423305635}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1424608370
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1598589478666133515, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_Name
value: Jet (4)
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalPosition.x
value: 9
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalPosition.y
value: 5.5
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_RootOrder
value: 15
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1343159811, guid: d0f354b571dcc4be9a9df2950385f833, type: 3}
propertyPath: offset
value: 0.2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d0f354b571dcc4be9a9df2950385f833, type: 3}
--- !u!1001 &1440339677
PrefabInstance:
m_ObjectHideFlags: 0
...
...
@@ -9187,7 +9417,7 @@ PrefabInstance:
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
propertyPath: m_LocalPosition.x
value
:
4
value:
3
objectReference: {fileID: 0}
- target: {fileID: 1598589478666370091, guid: d0f354b571dcc4be9a9df2950385f833,
type: 3}
...
...
@@ -10317,11 +10547,11 @@ Transform:
- {fileID: 616334869}
- {fileID: 555167719}
- {fileID: 93149405}
- {fileID: 1719333764}
- {fileID: 212071324}
- {fileID: 713993539}
-
{
fileID
:
1719333764
}
-
{
fileID
:
418732216
}
- {fileID: 2000236174}
- {fileID: 418732216}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...
...
@@ -10539,20 +10769,20 @@ Transform:
- {fileID: 1499134502}
- {fileID: 61433108}
- {fileID: 960163368}
-
{
fileID
:
1829649293
}
- {fileID: 1641868572}
- {fileID: 738202686}
- {fileID: 395874872}
- {fileID: 418324250}
- {fileID: 773492440}
- {fileID: 1291819742}
- {fileID: 1966893352}
- {fileID: 447009078}
- {fileID: 1829649293}
- {fileID: 145940574}
- {fileID: 1440339678}
-
{
fileID
:
1641868572
}
- {fileID: 248634754}
- {fileID: 1527837561}
- {fileID: 697352989}
-
{
fileID
:
738202686
}
- {fileID: 1173097683}
- {fileID: 1200631472}
- {fileID: 1703933520}
...
...
Assets/_Game/Scenes/
6
.Waterlevel.unity.meta
→
Assets/_Game/Scenes/
3
.Waterlevel.unity.meta
View file @
c8f9a26c
File moved
Assets/_Game/Scenes/
3
.Obstacle Course.unity
→
Assets/_Game/Scenes/
4
.Obstacle Course.unity
View file @
c8f9a26c
File moved
Assets/_Game/Scenes/
3
.Obstacle Course.unity.meta
→
Assets/_Game/Scenes/
4
.Obstacle Course.unity.meta
View file @
c8f9a26c
File moved
Assets/_Game/Scenes/
4
.The Climb.unity
→
Assets/_Game/Scenes/
5
.The Climb.unity
View file @
c8f9a26c
...
...
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028334, g: 0.225713
34, b: 0.3069219
, a: 1}
m_IndirectSpecularColor: {r: 0.18028334, g: 0.225713
28, b: 0.3069217
, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
...
...
@@ -7005,6 +7005,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: LevelTimeLimit
...
...
@@ -7030,6 +7035,26 @@ PrefabInstance:
propertyPath: xMinHoehe
value: -35
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[0]
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[1]
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[2]
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[3]
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 655c31af15390a04b9e81f860a5652ad, type: 3}
--- !u!1001 &995138747
...
...
Assets/_Game/Scenes/
4
.The Climb.unity.meta
→
Assets/_Game/Scenes/
5
.The Climb.unity.meta
View file @
c8f9a26c
File moved
Assets/_Game/Scenes/
5.
.unity
→
Assets/_Game/Scenes/
6.Hardcore
.unity
View file @
c8f9a26c
...
...
@@ -7154,6 +7154,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: LevelTimeLimit
...
...
@@ -7179,6 +7184,16 @@ PrefabInstance:
propertyPath: yMaxHoehe
value: 20.5
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[0]
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[1]
value: 3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 655c31af15390a04b9e81f860a5652ad, type: 3}
--- !u!1001 &675722562
...
...
Assets/_Game/Scenes/
5.
.unity.meta
→
Assets/_Game/Scenes/
6.Hardcore
.unity.meta
View file @
c8f9a26c
File moved
Assets/_Game/Scripts/Audio/SoundLists.meta
deleted
100644 → 0
View file @
98e84283
fileFormatVersion: 2
guid: 22b50696c7e74294187ebd3a1ca35078
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scripts/Tutorial/Level1.meta
deleted
100644 → 0
View file @
98e84283
fileFormatVersion: 2
guid: f0e626d655663b54cace9c8ac40de916
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
ProjectSettings/EditorBuildSettings.asset
View file @
c8f9a26c
...
...
@@ -30,16 +30,16 @@ EditorBuildSettings:
path
:
Assets/_Game/Scenes/1.Tutorial.unity
guid
:
bd53098b8ab7b3840857ef4dc9a30489
-
enabled
:
1
path
:
Assets/_Game/Scenes/2.
Der Start
.unity
path
:
Assets/_Game/Scenes/2.
First Steps
.unity
guid
:
8bcdcf18f27bd764baca43aa08451014
-
enabled
:
1
path
:
Assets/_Game/Scenes/
3
.Obstacle Course.unity
path
:
Assets/_Game/Scenes/
4
.Obstacle Course.unity
guid
:
50e9bcf3dfc573c4597cdb8be547cfb1
-
enabled
:
1
path
:
Assets/_Game/Scenes/
4
.The Climb.unity
path
:
Assets/_Game/Scenes/
5
.The Climb.unity
guid
:
fdd0e49a485154f4c952fc00e1830f27
-
enabled
:
1
path
:
Assets/_Game/Scenes/
5.
.unity
path
:
Assets/_Game/Scenes/
6.Hardcore
.unity
guid
:
2c4fc4b01bf90c943852becbf8464196
-
enabled
:
1
path
:
Assets/_Game/Scenes/0.MainMenu.unity
...
...
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