Skip to content

Commit

Permalink
Merge pull request #70 from StanGraafmans/release/release
Browse files Browse the repository at this point in the history
Merge release into develop
  • Loading branch information
squiig authored May 7, 2019
2 parents bfcf0c1 + 2e5485c commit d7a40a9
Show file tree
Hide file tree
Showing 711 changed files with 114,826 additions and 13,957 deletions.
28 changes: 28 additions & 0 deletions TowerDefense_Unity/Assets/Audio/AudioAssets/AMB_Fountain.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2588a25b0087bc84caa0325c7f36f85c, type: 3}
m_Name: AMB_Fountain
m_EditorClassIdentifier:
_AudioMixerGroup: {fileID: 24300002, guid: 47651c0ceac484e4dab88eaa6e49b7dd, type: 2}
_AudioClips:
- {fileID: 8300000, guid: fdf73d7096c14224c85342798eb09062, type: 3}
_Volume: 1
_Pan: 0
_Doppler: 0
_SpatialBlend: 1
_Looped: 1
_RandomStartPosition: 1
_MaxDistance: 500
_MinDistance: 500
_PitchMin: 1
_PitchMax: 1
_AvoidRepetition: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions TowerDefense_Unity/Assets/Audio/AudioAssets/BMG.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2588a25b0087bc84caa0325c7f36f85c, type: 3}
m_Name: BMG
m_EditorClassIdentifier:
_AudioMixerGroup: {fileID: 24300002, guid: 47651c0ceac484e4dab88eaa6e49b7dd, type: 2}
_AudioClips:
- {fileID: 8300000, guid: 04c69678b200b524db9aaf2dbe400ae3, type: 3}
_Volume: 0.4
_Pan: 0
_Doppler: 0
_SpatialBlend: 0
_Looped: 0
_RandomStartPosition: 0
_MaxDistance: 500
_MinDistance: 1
_PitchMin: 1
_PitchMax: 1
_AvoidRepetition: 1
8 changes: 8 additions & 0 deletions TowerDefense_Unity/Assets/Audio/AudioAssets/BMG.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2588a25b0087bc84caa0325c7f36f85c, type: 3}
m_Name: SFX_Menu_Transition
m_EditorClassIdentifier:
_AudioMixerGroup: {fileID: 24300002, guid: 47651c0ceac484e4dab88eaa6e49b7dd, type: 2}
_AudioClips:
- {fileID: 8300000, guid: 84e0385bff8112447b286566e4a0bca8, type: 3}
_Volume: 0.4
_Pan: 0
_Doppler: 0
_SpatialBlend: 0
_Looped: 0
_RandomStartPosition: 0
_MaxDistance: 500
_MinDistance: 1
_PitchMin: 1
_PitchMax: 1
_AvoidRepetition: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2588a25b0087bc84caa0325c7f36f85c, type: 3}
m_Name: SFX_Minion_Attack
m_EditorClassIdentifier:
_AudioMixerGroup: {fileID: 24300002, guid: 47651c0ceac484e4dab88eaa6e49b7dd, type: 2}
_AudioClips:
- {fileID: 8300000, guid: b7af0c48a459e2849bae7f44ba057255, type: 3}
_Volume: 1
_Pan: 0
_Doppler: 0
_SpatialBlend: 1
_Looped: 0
_RandomStartPosition: 0
_MaxDistance: 500
_MinDistance: 1
_PitchMin: 1
_PitchMax: 1
_AvoidRepetition: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions TowerDefense_Unity/Assets/Audio/AudioAssets/SFX_Minion_Death.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2588a25b0087bc84caa0325c7f36f85c, type: 3}
m_Name: SFX_Minion_Death
m_EditorClassIdentifier:
_AudioMixerGroup: {fileID: 24300002, guid: 47651c0ceac484e4dab88eaa6e49b7dd, type: 2}
_AudioClips:
- {fileID: 8300000, guid: 194a0741c3c5dd844899e235398bc81d, type: 3}
_Volume: 1
_Pan: 0
_Doppler: 0
_SpatialBlend: 1
_Looped: 0
_RandomStartPosition: 0
_MaxDistance: 500
_MinDistance: 3
_PitchMin: 0.39558047
_PitchMax: 0.6872934
_AvoidRepetition: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions TowerDefense_Unity/Assets/Audio/AudioAssets/SFX_Minion_Hit.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2588a25b0087bc84caa0325c7f36f85c, type: 3}
m_Name: SFX_Minion_Hit
m_EditorClassIdentifier:
_AudioMixerGroup: {fileID: 24300002, guid: 47651c0ceac484e4dab88eaa6e49b7dd, type: 2}
_AudioClips:
- {fileID: 8300000, guid: 7e7ba79c2481603469935425df29e0dd, type: 3}
_Volume: 1
_Pan: 0
_Doppler: 0
_SpatialBlend: 1
_Looped: 0
_RandomStartPosition: 0
_MaxDistance: 500
_MinDistance: 3
_PitchMin: 0.6724566
_PitchMax: 1.1488831
_AvoidRepetition: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions TowerDefense_Unity/Assets/Audio/AudioAssets/SFX_StartWave.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2588a25b0087bc84caa0325c7f36f85c, type: 3}
m_Name: SFX_StartWave
m_EditorClassIdentifier:
_AudioMixerGroup: {fileID: 24300002, guid: 47651c0ceac484e4dab88eaa6e49b7dd, type: 2}
_AudioClips:
- {fileID: 8300000, guid: 5b2bb17ddac9fed4da3d73c315ec302b, type: 3}
_Volume: 1
_Pan: 0
_Doppler: 0
_SpatialBlend: 1
_Looped: 0
_RandomStartPosition: 0
_MaxDistance: 500
_MinDistance: 1
_PitchMin: 1
_PitchMax: 1
_AvoidRepetition: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions TowerDefense_Unity/Assets/Audio/AudioAssets/minion_growl.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2588a25b0087bc84caa0325c7f36f85c, type: 3}
m_Name: minion_growl
m_EditorClassIdentifier:
_AudioMixerGroup: {fileID: 24300002, guid: 47651c0ceac484e4dab88eaa6e49b7dd, type: 2}
_AudioClips:
- {fileID: 8300000, guid: a843f1a86e0632643883469c198f60fb, type: 3}
- {fileID: 8300000, guid: af011b94cd50b7443ad1413d238ce55c, type: 3}
- {fileID: 8300000, guid: 7543e424db0ff254ebabc737167d962d, type: 3}
_Volume: 1
_Pan: 0
_Doppler: 0
_SpatialBlend: 1
_Looped: 0
_RandomStartPosition: 0
_MaxDistance: 500
_MinDistance: 3
_PitchMin: 0.8908098
_PitchMax: 1.4476798
_AvoidRepetition: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions TowerDefense_Unity/Assets/Audio/AudioAssets/minion_walk.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2588a25b0087bc84caa0325c7f36f85c, type: 3}
m_Name: minion_walk
m_EditorClassIdentifier:
_AudioMixerGroup: {fileID: 24300002, guid: 47651c0ceac484e4dab88eaa6e49b7dd, type: 2}
_AudioClips:
- {fileID: 8300000, guid: 73d67b7cc42fa024bb57a071916c2569, type: 3}
- {fileID: 8300000, guid: 53988c3338a1cff4fa570c9bcf269d6e, type: 3}
- {fileID: 8300000, guid: b9ef7a1580001a64cb5273688e7c28ef, type: 3}
- {fileID: 8300000, guid: 343691b8a83fec04e8bb361bbfb0b174, type: 3}
- {fileID: 8300000, guid: f188fc189c47fe94d8744c7fb7287711, type: 3}
- {fileID: 8300000, guid: c50bf3aab5790794e924038b28937a6e, type: 3}
- {fileID: 8300000, guid: 3c0c28f4a33e1bc4f9dc915fae0108c6, type: 3}
_Volume: 1
_Pan: 0
_Doppler: 0
_SpatialBlend: 1
_Looped: 0
_RandomStartPosition: 0
_MaxDistance: 500
_MinDistance: 1
_PitchMin: 1
_PitchMax: 1
_AvoidRepetition: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions TowerDefense_Unity/Assets/Audio/AudioAssets/tower_build.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2588a25b0087bc84caa0325c7f36f85c, type: 3}
m_Name: tower_build
m_EditorClassIdentifier:
_AudioMixerGroup: {fileID: 24300002, guid: 47651c0ceac484e4dab88eaa6e49b7dd, type: 2}
_AudioClips:
- {fileID: 8300000, guid: c84998fa00a5b4b45ba5cf0fae29b8da, type: 3}
_Volume: 1
_Pan: 0
_Doppler: 0
_SpatialBlend: 1
_Looped: 0
_RandomStartPosition: 0
_MaxDistance: 500
_MinDistance: 8
_PitchMin: 0.45691505
_PitchMax: 0.7986058
_AvoidRepetition: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d7a40a9

Please sign in to comment.