Merge pull request #37 from yxue5/DevelopNew

Updated
yxue5 · Mar 28, 2018 · f05a48f · f05a48f
2 parents 17d033d + b819339
commit f05a48f
Show file tree

Hide file tree

Showing 42 changed files with 1 addition and 1 deletion.
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/Gear1.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/Gear1.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/Gear2.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/Gear2.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/GearBoard.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/GearBoard.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/Ocean.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/Ocean.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/PassibleGearBoard.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/PassibleGearBoard.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/PassibleGearBoard2.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/PassibleGearBoard2.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/PassibleLowerBoard.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/PassibleLowerBoard.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/PassiblePlatformTop3.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/PassiblePlatformTop3.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/PassiblePlatformUpperBoard.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/PassiblePlatformUpperBoard.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/PassibleTop1.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/PassibleTop1.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/PassibleTop2.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/PassibleTop2.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/ShipBody.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/ShipBody.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/ShipParts1.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/ShipParts1.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/ShipParts2.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/ShipParts2.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Blueprint/ShipParts3.uasset b/ProjectEroica/Content/Map_Assets/Blueprint/ShipParts3.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Materials/MF_OceanDepth_UVs.uasset b/ProjectEroica/Content/Map_Assets/Materials/MF_OceanDepth_UVs.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Materials/MF_OceanWave_Motion.uasset b/ProjectEroica/Content/Map_Assets/Materials/MF_OceanWave_Motion.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Materials/MF_OceanWavesWPO.uasset b/ProjectEroica/Content/Map_Assets/Materials/MF_OceanWavesWPO.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Materials/M_Board.uasset b/ProjectEroica/Content/Map_Assets/Materials/M_Board.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Materials/M_Gear.uasset b/ProjectEroica/Content/Map_Assets/Materials/M_Gear.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Materials/M_Ocean.uasset b/ProjectEroica/Content/Map_Assets/Materials/M_Ocean.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Materials/M_ShipBody.uasset b/ProjectEroica/Content/Map_Assets/Materials/M_ShipBody.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Materials/M_Stand.uasset b/ProjectEroica/Content/Map_Assets/Materials/M_Stand.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Materials/M_Top.uasset b/ProjectEroica/Content/Map_Assets/Materials/M_Top.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/GearBoard.uasset b/ProjectEroica/Content/Map_Assets/Mesh/GearBoard.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/LowerBoard.uasset b/ProjectEroica/Content/Map_Assets/Mesh/LowerBoard.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/SM_Water_Plane.uasset b/ProjectEroica/Content/Map_Assets/Mesh/SM_Water_Plane.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/Ship_Circle.uasset b/ProjectEroica/Content/Map_Assets/Mesh/Ship_Circle.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/Ship_Circle_002.uasset b/ProjectEroica/Content/Map_Assets/Mesh/Ship_Circle_002.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_003.uasset b/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_003.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_006.uasset b/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_006.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_013.uasset b/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_013.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_014.uasset b/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_014.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_015.uasset b/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_015.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_019.uasset b/ProjectEroica/Content/Map_Assets/Mesh/Ship_Cube_019.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/Top1.uasset b/ProjectEroica/Content/Map_Assets/Mesh/Top1.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/Top2.uasset b/ProjectEroica/Content/Map_Assets/Mesh/Top2.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/Top3.uasset b/ProjectEroica/Content/Map_Assets/Mesh/Top3.uasset
diff --git a/ProjectEroica/Content/Map_Assets/Mesh/UpperBoard.uasset b/ProjectEroica/Content/Map_Assets/Mesh/UpperBoard.uasset
diff --git a/ProjectEroica/Content/Map_Assets/ShipMap.umap b/ProjectEroica/Content/Map_Assets/ShipMap.umap
diff --git a/ProjectEroica/Content/Map_Assets/ShipMap_BuiltData.uasset b/ProjectEroica/Content/Map_Assets/ShipMap_BuiltData.uasset
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ AI Activation:
 The enemy AI is turned off by default. However, if you wish to fight the AI, press I to turn him on. Don't go up too high though or he won't be able to see you anymore!
 
 Youtube Link:
-https://www.youtube.com/watch?v=SqbcTZX1K7I&feature=youtu.be
+https://www.youtube.com/watch?v=QKP8xhoARwE&app=desktop
 
 Gitter:
 Private Community: