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

2015-04-29 04:08:54 +09:00
parent 6d8ed96eb5 6f52ce90a5
commit 0028d36171
18 changed files with 2 additions and 2 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@ -42,14 +42,14 @@ DefaultGraphicsPerformance=Maximum
 AppliedDefaultGraphicsPerformance=Maximum

 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/Maps/Tutorial
+EditorStartupMap=/Game/Maps/NewTuto
 LocalMapOptions=
 TransitionMap=
 bUseSplitscreen=False
 TwoPlayerSplitscreenLayout=Horizontal
 ThreePlayerSplitscreenLayout=FavorTop
 GameInstanceClass=/Script/Engine.GameInstance
-GameDefaultMap=/Game/Maps/Tutorial
+GameDefaultMap=/Game/Maps/Menu
 ServerDefaultMap=/Engine/Maps/Entry
 GlobalDefaultGameMode=/Game/Blueprints/MyGame.MyGame_C
 GlobalDefaultServerGameMode=None
--- a/Content/Blueprints/CameraTrigger.uasset
+++ b/Content/Blueprints/CameraTrigger.uasset
--- a/Content/Blueprints/HUD/MainHUD.uasset
+++ b/Content/Blueprints/HUD/MainHUD.uasset
--- a/Content/Blueprints/HUD/MenuHUD.uasset
+++ b/Content/Blueprints/HUD/MenuHUD.uasset
--- a/Content/Blueprints/HUD/TutorialHUD.uasset
+++ b/Content/Blueprints/HUD/TutorialHUD.uasset
--- a/Content/Blueprints/MainHUD.uasset
+++ b/Content/Blueprints/MainHUD.uasset
--- a/Content/Blueprints/MyCharacter.uasset
+++ b/Content/Blueprints/MyCharacter.uasset
--- a/Content/Blueprints/MyGame.uasset
+++ b/Content/Blueprints/MyGame.uasset
--- a/Content/Blueprints/tutorialHud.uasset
+++ b/Content/Blueprints/tutorialHud.uasset
--- a/Content/FXStarStarterKit/MICs/MIC_Large_StarCoronaHotV3.uasset
+++ b/Content/FXStarStarterKit/MICs/MIC_Large_StarCoronaHotV3.uasset
--- a/Content/FXStarStarterKit/MICs/MIC_StarSurfaceCM02.uasset
+++ b/Content/FXStarStarterKit/MICs/MIC_StarSurfaceCM02.uasset
--- a/Content/FXStarStarterKit/Materials/MAT_StarCorona.uasset
+++ b/Content/FXStarStarterKit/Materials/MAT_StarCorona.uasset
--- a/Content/FXStarStarterKit/Materials/MAT_StarSurface.uasset
+++ b/Content/FXStarStarterKit/Materials/MAT_StarSurface.uasset
--- a/Content/FXStarStarterKit/Meshes/StarHR.uasset
+++ b/Content/FXStarStarterKit/Meshes/StarHR.uasset
--- a/Content/Maps/Menu.umap
+++ b/Content/Maps/Menu.umap
--- a/Content/Maps/Test.umap
+++ b/Content/Maps/Test.umap
--- a/Content/Textures/CelerityScreen.uasset
+++ b/Content/Textures/CelerityScreen.uasset
--- a/Content/font/Raleway-Regular.uasset
+++ b/Content/font/Raleway-Regular.uasset