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

2015-05-18 16:59:07 +09:00 · 2015-05-18 16:59:07 +09:00 · 35c3ea2c8d
commit 35c3ea2c8d
parent e7e300ee98 8fb00d7f7d
43 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+.DS_Store
--- a/Config/DefaultGame.ini
+++ b/Config/DefaultGame.ini
--- a/Content/Blueprints/HUD/ComingSoonHUD.uasset
+++ b/Content/Blueprints/HUD/ComingSoonHUD.uasset
--- a/Content/Blueprints/HUD/Credits.umap
+++ b/Content/Blueprints/HUD/Credits.umap
--- a/Content/Blueprints/HUD/CreditsHUD.uasset
+++ b/Content/Blueprints/HUD/CreditsHUD.uasset
--- a/Content/Blueprints/HUD/EndHUD.uasset
+++ b/Content/Blueprints/HUD/EndHUD.uasset
--- a/Content/Blueprints/HUD/HUDLibrary.uasset
+++ b/Content/Blueprints/HUD/HUDLibrary.uasset
--- a/Content/Blueprints/HUD/Menu.umap
+++ b/Content/Blueprints/HUD/Menu.umap
--- a/Content/Blueprints/HUD/MenuHUD.uasset
+++ b/Content/Blueprints/HUD/MenuHUD.uasset
--- a/Content/Blueprints/HUD/OptionsHUD.uasset
+++ b/Content/Blueprints/HUD/OptionsHUD.uasset
--- a/Content/Blueprints/HUD/PauseHUD.uasset
+++ b/Content/Blueprints/HUD/PauseHUD.uasset
--- a/Content/FXStar/Materials/MAT_StarCorona.uasset
+++ b/Content/FXStar/Materials/MAT_StarCorona.uasset
--- a/Content/Maps/Level_1.umap
+++ b/Content/Maps/Level_1.umap
--- a/Content/Movies/CelerityIntro.mp4
+++ b/Content/Movies/CelerityIntro.mp4
--- a/Content/Splash/credits.uasset
+++ b/Content/Splash/credits.uasset
--- a/OriginalContent/Asphalt/._AsphaltNormal.png
+++ b/OriginalContent/Asphalt/._AsphaltNormal.png
--- a/OriginalContent/Asphalt/._BlackAsphalt.png
+++ b/OriginalContent/Asphalt/._BlackAsphalt.png
--- a/OriginalContent/Asphalt/._Line.png
+++ b/OriginalContent/Asphalt/._Line.png
--- a/OriginalContent/Asphalt/._WhiteAsphalt.png
+++ b/OriginalContent/Asphalt/._WhiteAsphalt.png
--- a/OriginalContent/Asphalt/AsphaltNormal.png
+++ b/OriginalContent/Asphalt/AsphaltNormal.png
--- a/OriginalContent/Asphalt/BlackAsphalt.png
+++ b/OriginalContent/Asphalt/BlackAsphalt.png
--- a/OriginalContent/Asphalt/Line.png
+++ b/OriginalContent/Asphalt/Line.png
--- a/OriginalContent/Asphalt/WhiteAsphalt.png
+++ b/OriginalContent/Asphalt/WhiteAsphalt.png
--- a/OriginalContent/IMG_1279.JPG
+++ b/OriginalContent/IMG_1279.JPG
--- a/OriginalContent/Textures/Ads/DuckDptStoreHorizontal.psd
+++ b/OriginalContent/Textures/Ads/DuckDptStoreHorizontal.psd
--- a/OriginalContent/Textures/Ads/DuckDptStoreVertical.psd
+++ b/OriginalContent/Textures/Ads/DuckDptStoreVertical.psd
--- a/OriginalContent/Textures/Ads/FusionCapacitorHorizontal.psd
+++ b/OriginalContent/Textures/Ads/FusionCapacitorHorizontal.psd
--- a/OriginalContent/Textures/Ads/FusionCapacitorVertical.psd
+++ b/OriginalContent/Textures/Ads/FusionCapacitorVertical.psd
--- a/OriginalContent/Textures/Ads/HandsomeClothesHorizontal.psd
+++ b/OriginalContent/Textures/Ads/HandsomeClothesHorizontal.psd
--- a/OriginalContent/Textures/Ads/HexagonalIndustriesHorizontal.psd
+++ b/OriginalContent/Textures/Ads/HexagonalIndustriesHorizontal.psd
--- a/OriginalContent/Textures/Ads/InfiniteLibrary.psd
+++ b/OriginalContent/Textures/Ads/InfiniteLibrary.psd
--- a/OriginalContent/Textures/Ads/NehanCorpHorizontal.psd
+++ b/OriginalContent/Textures/Ads/NehanCorpHorizontal.psd
--- a/OriginalContent/Textures/Ads/NehanCorpVertical.psd
+++ b/OriginalContent/Textures/Ads/NehanCorpVertical.psd
--- a/OriginalContent/Textures/Ads/SpaceSodaHorizontal.psd
+++ b/OriginalContent/Textures/Ads/SpaceSodaHorizontal.psd
--- a/OriginalContent/Textures/Ads/SpaceSodaVertical.psd
+++ b/OriginalContent/Textures/Ads/SpaceSodaVertical.psd
--- a/OriginalContent/Textures/Asphalt.psd
+++ b/OriginalContent/Textures/Asphalt.psd
--- a/OriginalContent/Textures/PSButtonTop.psd
+++ b/OriginalContent/Textures/PSButtonTop.psd
--- a/OriginalContent/Textures/PSbutton.psd
+++ b/OriginalContent/Textures/PSbutton.psd
--- a/OriginalContent/Textures/Window.psd
+++ b/OriginalContent/Textures/Window.psd
--- a/OriginalContent/Textures/credits.psd
+++ b/OriginalContent/Textures/credits.psd
--- a/OriginalContent/Window.png
+++ b/OriginalContent/Window.png
--- a/OriginalContent/WindowN.png
+++ b/OriginalContent/WindowN.png
--- a/OriginalContent/four-new.png
+++ b/OriginalContent/four-new.png