Skip to content

Commit 8aa4776

Browse files
lkrelllkrell
authored
Merge branch 'release/v0.1.0-experimental' into mttdoc120-changelog
2 parents 6b63eea + 7030d05 commit 8aa4776

File tree

78 files changed

+2570
-474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2570
-474
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
*.pict filter=lfs diff=lfs merge=lfs -text
4646
*.png filter=lfs diff=lfs merge=lfs -text
4747
*.psd filter=lfs diff=lfs merge=lfs -text
48-
*.tga filter=lfs diff=lfs merge=lfs -text
48+
*.[tT][gG][aA] filter=lfs diff=lfs merge=lfs -text
4949
*.tif filter=lfs diff=lfs merge=lfs -text
5050
*.tiff filter=lfs diff=lfs merge=lfs -text
5151

5252
# Unity
5353
*.unity filter=lfs diff=lfs merge=lfs text
5454
*.prefab binary
5555
*.asset filter=lfs diff=lfs merge=lfs -text
56-
*.anim filter=lfs diff=lfs merge=lfs -text
56+
*.anim filter=lfs diff=lfs merge=lfs -text

‎.github/CODEOWNERS‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
# Lines starting with '#' are comments.
3+
# Each line is a file pattern followed by one or more owners.
4+
5+
# More details are here: https://help.github.com/articles/about-codeowners/
6+
7+
# The '*' pattern is global owners.
8+
9+
# Order is important. The last matching pattern has the most precedence.
10+
# The folders are ordered as follows:
11+
12+
# In each subsection folders are ordered first by depth, then alphabetically.
13+
# This should make it easy to add new rules without breaking existing ones.
14+
15+
# Global rule:
16+
* @SamuelBellomo

‎Assets/BossRoom/Prefabs/CharGFX/BossGraphics.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,7 +2056,7 @@ AudioSource:
20562056
m_GameObject: {fileID: 6839301660383890230}
20572057
m_Enabled: 1
20582058
serializedVersion: 4
2059-
OutputAudioMixerGroup: {fileID: 0}
2059+
OutputAudioMixerGroup: {fileID: -6199682581367681880, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
20602060
m_audioClip: {fileID: 0}
20612061
m_PlayOnAwake: 0
20622062
m_Volume: 1
@@ -2179,7 +2179,7 @@ AudioSource:
21792179
m_GameObject: {fileID: 6839301660383890230}
21802180
m_Enabled: 1
21812181
serializedVersion: 4
2182-
OutputAudioMixerGroup: {fileID: 0}
2182+
OutputAudioMixerGroup: {fileID: -6199682581367681880, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
21832183
m_audioClip: {fileID: 0}
21842184
m_PlayOnAwake: 0
21852185
m_Volume: 1
@@ -2324,7 +2324,7 @@ AudioSource:
23242324
m_GameObject: {fileID: 6839301660383890230}
23252325
m_Enabled: 1
23262326
serializedVersion: 4
2327-
OutputAudioMixerGroup: {fileID: 0}
2327+
OutputAudioMixerGroup: {fileID: -4341177700643628062, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
23282328
m_audioClip: {fileID: 0}
23292329
m_PlayOnAwake: 0
23302330
m_Volume: 1

‎Assets/BossRoom/Prefabs/CharGFX/ImpGraphics.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ AudioSource:
11721172
m_GameObject: {fileID: 6839301660383890230}
11731173
m_Enabled: 1
11741174
serializedVersion: 4
1175-
OutputAudioMixerGroup: {fileID: 0}
1175+
OutputAudioMixerGroup: {fileID: -6199682581367681880, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
11761176
m_audioClip: {fileID: 0}
11771177
m_PlayOnAwake: 0
11781178
m_Volume: 1
@@ -1295,7 +1295,7 @@ AudioSource:
12951295
m_GameObject: {fileID: 6839301660383890230}
12961296
m_Enabled: 1
12971297
serializedVersion: 4
1298-
OutputAudioMixerGroup: {fileID: 0}
1298+
OutputAudioMixerGroup: {fileID: -6199682581367681880, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
12991299
m_audioClip: {fileID: 0}
13001300
m_PlayOnAwake: 0
13011301
m_Volume: 1
@@ -1440,7 +1440,7 @@ AudioSource:
14401440
m_GameObject: {fileID: 6839301660383890230}
14411441
m_Enabled: 1
14421442
serializedVersion: 4
1443-
OutputAudioMixerGroup: {fileID: 0}
1443+
OutputAudioMixerGroup: {fileID: -4341177700643628062, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
14441444
m_audioClip: {fileID: 0}
14451445
m_PlayOnAwake: 0
14461446
m_Volume: 1

‎Assets/BossRoom/Prefabs/CharGFX/PlayerGraphics.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,7 @@ AudioSource:
15071507
m_GameObject: {fileID: 3736552308919084700}
15081508
m_Enabled: 1
15091509
serializedVersion: 4
1510-
OutputAudioMixerGroup: {fileID: 0}
1510+
OutputAudioMixerGroup: {fileID: -6199682581367681880, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
15111511
m_audioClip: {fileID: 0}
15121512
m_PlayOnAwake: 0
15131513
m_Volume: 1
@@ -1630,7 +1630,7 @@ AudioSource:
16301630
m_GameObject: {fileID: 3736552308919084700}
16311631
m_Enabled: 1
16321632
serializedVersion: 4
1633-
OutputAudioMixerGroup: {fileID: 0}
1633+
OutputAudioMixerGroup: {fileID: -6199682581367681880, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
16341634
m_audioClip: {fileID: 0}
16351635
m_PlayOnAwake: 0
16361636
m_Volume: 1
@@ -1775,7 +1775,7 @@ AudioSource:
17751775
m_GameObject: {fileID: 3736552308919084700}
17761776
m_Enabled: 1
17771777
serializedVersion: 4
1778-
OutputAudioMixerGroup: {fileID: 0}
1778+
OutputAudioMixerGroup: {fileID: -4341177700643628062, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
17791779
m_audioClip: {fileID: 0}
17801780
m_PlayOnAwake: 0
17811781
m_Volume: 1

0 commit comments

Comments
 (0)