Merge branch 'master' of github.com:teamMadScientist/celerity

Conflicts: Content/Maps/Level_1.umap
2015-05-28 18:20:39 +09:00 · 2015-05-28 18:20:39 +09:00 · cc6eeb3db4
commit cc6eeb3db4
parent c0adbfc6ac 27a353721a
10 changed files with 0 additions and 0 deletions
--- a/Content/Blueprints/HUD/OptionsHUD.uasset
+++ b/Content/Blueprints/HUD/OptionsHUD.uasset
--- a/Content/Blueprints/MyCharacter.uasset
+++ b/Content/Blueprints/MyCharacter.uasset
--- a/Content/Maps/NewTuto.umap
+++ b/Content/Maps/NewTuto.umap
--- a/Fx/Dash.wav
+++ b/Fx/Dash.wav
--- a/Fx/Jump_End.wav
+++ b/Fx/Jump_End.wav
--- a/Fx/Jump_Loop.wav
+++ b/Fx/Jump_Loop.wav
--- a/Fx/Jump_Start.wav
+++ b/Fx/Jump_Start.wav
--- a/Awakening.wav
+++ b/Awakening.wav
--- a/Beyond.wav
+++ b/Beyond.wav
--- a/Celerity.wav
+++ b/Celerity.wav