Merge branch 'master' of https://github.com/audio-game-crew/legend-of…

…-iris Conflicts: Assets/Iris.unity
audio-game-crew · Jan 17, 2015 · 05b52a3 · 05b52a3
2 parents 3746fad + ca41c79
commit 05b52a3
Show file tree

Hide file tree

Showing 49 changed files with 4,341 additions and 1,587 deletions.
diff --git a/Assets/AstoundSound/AstoundSoundLogo.png b/Assets/AstoundSound/AstoundSoundLogo.png
diff --git a/Assets/AstoundSound/AstoundSoundLogo.png.meta b/Assets/AstoundSound/AstoundSoundLogo.png.meta
diff --git a/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 1.wav b/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 1.wav
diff --git a/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 1.wav.meta b/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 1.wav.meta
diff --git a/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 3.wav b/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 3.wav
diff --git a/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 3.wav.meta b/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 3.wav.meta
diff --git a/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 5.wav b/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 5.wav
diff --git a/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 6.wav b/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 6.wav
diff --git a/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 6.wav.meta b/Assets/Audio/Resources/Iris/177253__josephsardin__cow-moos 6.wav.meta
diff --git a/Assets/Audio/Resources/Iris/Iris - T10.1_1.wav b/Assets/Audio/Resources/Iris/Iris - T10.1_1.wav
diff --git a/...177253__josephsardin__cow-moos 5.wav.meta → ...io/Resources/Iris/Iris - T10.1_1.wav.meta b/...177253__josephsardin__cow-moos 5.wav.meta → ...io/Resources/Iris/Iris - T10.1_1.wav.meta