Fixed Merge Conflicts

Velorexe · Nov 1, 2020 · 606c4b0 · 606c4b0
2 parents 8165579 + 87069ca
commit 606c4b0
Show file tree

Hide file tree

Showing 203 changed files with 10,214 additions and 148 deletions.
diff --git a/Project/Assets/Editor/UVNF/GUISkins.meta b/Project/Assets/Editor/UVNF/GUISkins.meta
diff --git a/Project/Assets/ExampleResources.meta → Project/Assets/UVNF - ExampleResources.meta b/Project/Assets/ExampleResources.meta → Project/Assets/UVNF - ExampleResources.meta
diff --git a/Project/Assets/ExampleResources/Audio.meta → ...Assets/UVNF - ExampleResources/Audio.meta b/Project/Assets/ExampleResources/Audio.meta → ...Assets/UVNF - ExampleResources/Audio.meta
diff --git a/...ct/Assets/ExampleResources/Audio/Boop.wav → ...ts/UVNF - ExampleResources/Audio/Boop.wav b/...ct/Assets/ExampleResources/Audio/Boop.wav → ...ts/UVNF - ExampleResources/Audio/Boop.wav
diff --git a/...sets/ExampleResources/Audio/Boop.wav.meta → ...NF - ExampleResources/Audio/Boop.wav.meta b/...sets/ExampleResources/Audio/Boop.wav.meta → ...NF - ExampleResources/Audio/Boop.wav.meta
diff --git a/...urces/Audio/Velorexe - Calming Worlds.mp3 → ...urces/Audio/Velorexe - Calming Worlds.mp3 b/...urces/Audio/Velorexe - Calming Worlds.mp3 → ...urces/Audio/Velorexe - Calming Worlds.mp3
diff --git a/.../Audio/Velorexe - Calming Worlds.mp3.meta → .../Audio/Velorexe - Calming Worlds.mp3.meta b/.../Audio/Velorexe - Calming Worlds.mp3.meta → .../Audio/Velorexe - Calming Worlds.mp3.meta
diff --git a/...sources/Audio/Velorexe - Piano Chords.mp3 → ...sources/Audio/Velorexe - Piano Chords.mp3 b/...sources/Audio/Velorexe - Piano Chords.mp3 → ...sources/Audio/Velorexe - Piano Chords.mp3
diff --git a/...es/Audio/Velorexe - Piano Chords.mp3.meta → ...es/Audio/Velorexe - Piano Chords.mp3.meta b/...es/Audio/Velorexe - Piano Chords.mp3.meta → ...es/Audio/Velorexe - Piano Chords.mp3.meta
diff --git a/.../Assets/ExampleResources/Backgrounds.meta → .../UVNF - ExampleResources/Backgrounds.meta b/.../Assets/ExampleResources/Backgrounds.meta → .../UVNF - ExampleResources/Backgrounds.meta
diff --git a/...mpleResources/Backgrounds/Busy_Street.png → ...mpleResources/Backgrounds/Busy_Street.png b/...mpleResources/Backgrounds/Busy_Street.png → ...mpleResources/Backgrounds/Busy_Street.png
diff --git a/...esources/Backgrounds/Busy_Street.png.meta → ...esources/Backgrounds/Busy_Street.png.meta b/...esources/Backgrounds/Busy_Street.png.meta → ...esources/Backgrounds/Busy_Street.png.meta
diff --git a/...ts/ExampleResources/Backgrounds/Field.png → ... - ExampleResources/Backgrounds/Field.png b/...ts/ExampleResources/Backgrounds/Field.png → ... - ExampleResources/Backgrounds/Field.png
diff --git a/...ampleResources/Backgrounds/Field.png.meta → ...ampleResources/Backgrounds/Field.png.meta b/...ampleResources/Backgrounds/Field.png.meta → ...ampleResources/Backgrounds/Field.png.meta
diff --git a/...ct/Assets/ExampleResources/Character.meta → ...ts/UVNF - ExampleResources/Character.meta b/...ct/Assets/ExampleResources/Character.meta → ...ts/UVNF - ExampleResources/Character.meta
diff --git a/...ources/Character/CharacterImporter.preset → ...ources/Character/CharacterImporter.preset b/...ources/Character/CharacterImporter.preset → ...ources/Character/CharacterImporter.preset
diff --git a/...s/Character/CharacterImporter.preset.meta → ...s/Character/CharacterImporter.preset.meta b/...s/Character/CharacterImporter.preset.meta → ...s/Character/CharacterImporter.preset.meta
diff --git a/...ets/ExampleResources/Character/Novle.meta → ...F - ExampleResources/Character/Novle.meta b/...ets/ExampleResources/Character/Novle.meta → ...F - ExampleResources/Character/Novle.meta
diff --git a/...ources/Character/Novle/Novle_Disagree.png → ...ources/Character/Novle/Novle_Disagree.png b/...ources/Character/Novle/Novle_Disagree.png → ...ources/Character/Novle/Novle_Disagree.png
diff --git a/...s/Character/Novle/Novle_Disagree.png.meta → ...s/Character/Novle/Novle_Disagree.png.meta b/...s/Character/Novle/Novle_Disagree.png.meta → ...s/Character/Novle/Novle_Disagree.png.meta
diff --git a/...s/Character/Novle/Novle_Disagree_Talk.png → ...s/Character/Novle/Novle_Disagree_Talk.png b/...s/Character/Novle/Novle_Disagree_Talk.png → ...s/Character/Novle/Novle_Disagree_Talk.png
diff --git a/...racter/Novle/Novle_Disagree_Talk.png.meta → ...racter/Novle/Novle_Disagree_Talk.png.meta b/...racter/Novle/Novle_Disagree_Talk.png.meta → ...racter/Novle/Novle_Disagree_Talk.png.meta
diff --git a/...sources/Character/Novle/Novle_Excited.png → ...sources/Character/Novle/Novle_Excited.png b/...sources/Character/Novle/Novle_Excited.png → ...sources/Character/Novle/Novle_Excited.png
diff --git a/...es/Character/Novle/Novle_Excited.png.meta → ...es/Character/Novle/Novle_Excited.png.meta b/...es/Character/Novle/Novle_Excited.png.meta → ...es/Character/Novle/Novle_Excited.png.meta
diff --git a/...acter/Novle/Novle_Excited_Eyes_Closed.png → ...acter/Novle/Novle_Excited_Eyes_Closed.png b/...acter/Novle/Novle_Excited_Eyes_Closed.png → ...acter/Novle/Novle_Excited_Eyes_Closed.png
diff --git a/.../Novle/Novle_Excited_Eyes_Closed.png.meta → .../Novle/Novle_Excited_Eyes_Closed.png.meta b/.../Novle/Novle_Excited_Eyes_Closed.png.meta → .../Novle/Novle_Excited_Eyes_Closed.png.meta
diff --git a/...rces/Character/Novle/Novle_Explaining.png → ...rces/Character/Novle/Novle_Explaining.png b/...rces/Character/Novle/Novle_Explaining.png → ...rces/Character/Novle/Novle_Explaining.png
diff --git a/...Character/Novle/Novle_Explaining.png.meta → ...Character/Novle/Novle_Explaining.png.meta b/...Character/Novle/Novle_Explaining.png.meta → ...Character/Novle/Novle_Explaining.png.meta
diff --git a/...acter/Novle/Novle_Explaining_Confused.png → ...acter/Novle/Novle_Explaining_Confused.png b/...acter/Novle/Novle_Explaining_Confused.png → ...acter/Novle/Novle_Explaining_Confused.png
diff --git a/.../Novle/Novle_Explaining_Confused.png.meta → .../Novle/Novle_Explaining_Confused.png.meta b/.../Novle/Novle_Explaining_Confused.png.meta → .../Novle/Novle_Explaining_Confused.png.meta
diff --git a/...sources/Character/Novle/Novle_Judging.png → ...sources/Character/Novle/Novle_Judging.png b/...sources/Character/Novle/Novle_Judging.png → ...sources/Character/Novle/Novle_Judging.png
diff --git a/...es/Character/Novle/Novle_Judging.png.meta → ...es/Character/Novle/Novle_Judging.png.meta b/...es/Character/Novle/Novle_Judging.png.meta → ...es/Character/Novle/Novle_Judging.png.meta
diff --git a/...acter/Novle/Novle_Judging_Eyes_Closed.png → ...acter/Novle/Novle_Judging_Eyes_Closed.png b/...acter/Novle/Novle_Judging_Eyes_Closed.png → ...acter/Novle/Novle_Judging_Eyes_Closed.png
diff --git a/.../Novle/Novle_Judging_Eyes_Closed.png.meta → .../Novle/Novle_Judging_Eyes_Closed.png.meta b/.../Novle/Novle_Judging_Eyes_Closed.png.meta → .../Novle/Novle_Judging_Eyes_Closed.png.meta
diff --git a/...r/Novle/Novle_Slight_Talk_Eyes_Closed.png → ...r/Novle/Novle_Slight_Talk_Eyes_Closed.png b/...r/Novle/Novle_Slight_Talk_Eyes_Closed.png → ...r/Novle/Novle_Slight_Talk_Eyes_Closed.png
diff --git a/...le/Novle_Slight_Talk_Eyes_Closed.png.meta → ...le/Novle_Slight_Talk_Eyes_Closed.png.meta b/...le/Novle_Slight_Talk_Eyes_Closed.png.meta → ...le/Novle_Slight_Talk_Eyes_Closed.png.meta
diff --git a/...leResources/Character/Novle/Novle_Sly.png → ...leResources/Character/Novle/Novle_Sly.png b/...leResources/Character/Novle/Novle_Sly.png → ...leResources/Character/Novle/Novle_Sly.png
diff --git a/...ources/Character/Novle/Novle_Sly.png.meta → ...ources/Character/Novle/Novle_Sly.png.meta b/...ources/Character/Novle/Novle_Sly.png.meta → ...ources/Character/Novle/Novle_Sly.png.meta
diff --git a/...ources/Character/Novle/Novle_Sly_Talk.png → ...ources/Character/Novle/Novle_Sly_Talk.png b/...ources/Character/Novle/Novle_Sly_Talk.png → ...ources/Character/Novle/Novle_Sly_Talk.png
diff --git a/...s/Character/Novle/Novle_Sly_Talk.png.meta → ...s/Character/Novle/Novle_Sly_Talk.png.meta b/...s/Character/Novle/Novle_Sly_Talk.png.meta → ...s/Character/Novle/Novle_Sly_Talk.png.meta
diff --git a/...Resources/Character/Novle/Novle_Smile.png → ...Resources/Character/Novle/Novle_Smile.png b/...Resources/Character/Novle/Novle_Smile.png → ...Resources/Character/Novle/Novle_Smile.png
diff --git a/...rces/Character/Novle/Novle_Smile.png.meta → ...rces/Character/Novle/Novle_Smile.png.meta b/...rces/Character/Novle/Novle_Smile.png.meta → ...rces/Character/Novle/Novle_Smile.png.meta
diff --git a/...aracter/Novle/Novle_Smile_Eyes_Closed.png → ...aracter/Novle/Novle_Smile_Eyes_Closed.png b/...aracter/Novle/Novle_Smile_Eyes_Closed.png → ...aracter/Novle/Novle_Smile_Eyes_Closed.png
diff --git a/...er/Novle/Novle_Smile_Eyes_Closed.png.meta → ...er/Novle/Novle_Smile_Eyes_Closed.png.meta b/...er/Novle/Novle_Smile_Eyes_Closed.png.meta → ...er/Novle/Novle_Smile_Eyes_Closed.png.meta
diff --git a/...rces/Character/Novle/Novle_Smile_Talk.png → ...rces/Character/Novle/Novle_Smile_Talk.png b/...rces/Character/Novle/Novle_Smile_Talk.png → ...rces/Character/Novle/Novle_Smile_Talk.png
diff --git a/...Character/Novle/Novle_Smile_Talk.png.meta → ...Character/Novle/Novle_Smile_Talk.png.meta b/...Character/Novle/Novle_Smile_Talk.png.meta → ...Character/Novle/Novle_Smile_Talk.png.meta
diff --git a/...er/Novle/Novle_Smile_Talk_Eyes_Closed.png → ...er/Novle/Novle_Smile_Talk_Eyes_Closed.png b/...er/Novle/Novle_Smile_Talk_Eyes_Closed.png → ...er/Novle/Novle_Smile_Talk_Eyes_Closed.png
diff --git a/...vle/Novle_Smile_Talk_Eyes_Closed.png.meta → ...vle/Novle_Smile_Talk_Eyes_Closed.png.meta b/...vle/Novle_Smile_Talk_Eyes_Closed.png.meta → ...vle/Novle_Smile_Talk_Eyes_Closed.png.meta
diff --git a/Project/Assets/UVNF - ExampleResources/Character/Novle/Novle_Stand_Explaining.png b/Project/Assets/UVNF - ExampleResources/Character/Novle/Novle_Stand_Explaining.png
diff --git a/Project/Assets/UVNF - ExampleResources/Character/Novle/Novle_Stand_Explaining.png.meta b/Project/Assets/UVNF - ExampleResources/Character/Novle/Novle_Stand_Explaining.png.meta
diff --git a/...s/UVNF - ExampleResources/Character/Novle/Novle_Stand_Explaining_Interested.png b/...s/UVNF - ExampleResources/Character/Novle/Novle_Stand_Explaining_Interested.png
diff --git a/...Assets/UVNF - ExampleResources/Character/Novle/Novle_Stand_Explaining_Interested.png.meta b/...Assets/UVNF - ExampleResources/Character/Novle/Novle_Stand_Explaining_Interested.png.meta
diff --git a/Project/Assets/UVNF - ExampleResources/Character/Novle/Novle_Stand_Interested.png b/Project/Assets/UVNF - ExampleResources/Character/Novle/Novle_Stand_Interested.png