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
B
Best Enemies Forever
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
GameDevWeek
S
Sommersemester 2019
Unity
Best Enemies Forever
Commits
4bed95c8
Commit
4bed95c8
authored
Sep 22, 2019
by
Games@thm
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
195138eb
261e6574
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
18 deletions
+11
-18
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/Explosion.wav.meta
...e/Audio/VoiceOver/WAV/FirstLevelDialog/Explosion.wav.meta
+1
-1
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/OhNo.wav.meta
.../_Game/Audio/VoiceOver/WAV/FirstLevelDialog/OhNo.wav.meta
+1
-1
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/Scream1.wav.meta
...ame/Audio/VoiceOver/WAV/FirstLevelDialog/Scream1.wav.meta
+1
-1
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/Scream2.wav.meta
...ame/Audio/VoiceOver/WAV/FirstLevelDialog/Scream2.wav.meta
+1
-1
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/Talk1.wav.meta
..._Game/Audio/VoiceOver/WAV/FirstLevelDialog/Talk1.wav.meta
+1
-1
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/Talk2.wav.meta
..._Game/Audio/VoiceOver/WAV/FirstLevelDialog/Talk2.wav.meta
+1
-1
Assets/_Game/Data/Actions.meta
Assets/_Game/Data/Actions.meta
+0
-8
Assets/_Game/Scenes/IngameUI/NextLevel.unity
Assets/_Game/Scenes/IngameUI/NextLevel.unity
+2
-1
Assets/_Game/Scenes/MainMenu_Tests/MainMenu.unity
Assets/_Game/Scenes/MainMenu_Tests/MainMenu.unity
+3
-3
No files found.
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/Explosion.wav.meta
View file @
4bed95c8
...
...
@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono:
0
forceToMono:
1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
...
...
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/OhNo.wav.meta
View file @
4bed95c8
...
...
@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono:
0
forceToMono:
1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
...
...
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/Scream1.wav.meta
View file @
4bed95c8
...
...
@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono:
0
forceToMono:
1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
...
...
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/Scream2.wav.meta
View file @
4bed95c8
...
...
@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono:
0
forceToMono:
1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
...
...
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/Talk1.wav.meta
View file @
4bed95c8
...
...
@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono:
0
forceToMono:
1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
...
...
Assets/_Game/Audio/VoiceOver/WAV/FirstLevelDialog/Talk2.wav.meta
View file @
4bed95c8
...
...
@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono:
0
forceToMono:
1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
...
...
Assets/_Game/Data/Actions.meta
deleted
100644 → 0
View file @
195138eb
fileFormatVersion: 2
guid: c29aa0de4bb26a945ae50fd6de53f7ec
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scenes/IngameUI/NextLevel.unity
View file @
4bed95c8
...
...
@@ -1330,7 +1330,8 @@ PrefabInstance:
propertyPath
:
m_Enabled
value
:
1
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_RemovedComponents
:
-
{
fileID
:
4926732215222524554
,
guid
:
d63942dcf5d1a734cb4ac67d3646d06b
,
type
:
3
}
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
d63942dcf5d1a734cb4ac67d3646d06b
,
type
:
3
}
---
!u!1001
&5967889755714688867
PrefabInstance
:
...
...
Assets/_Game/Scenes/MainMenu_Tests/MainMenu.unity
View file @
4bed95c8
...
...
@@ -3870,7 +3870,7 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID:
62794613
}
objectReference: {fileID:
1998148216
}
- target: {fileID: 7092809741772888733, guid: d0445366486e480439baceb3cc515510,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
...
...
@@ -6648,7 +6648,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 870970992}
m_Enabled:
0
m_Enabled:
1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3}
m_Name:
...
...
@@ -13067,7 +13067,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive:
0
m_IsActive:
1
--- !u!4 &1667099356
Transform:
m_ObjectHideFlags: 0
...
...
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