Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

# Conflicts: # 2.5DHero/2.5DHeroContent/Content.mgcb
2016-12-04 05:00:31 +08:00 · 2016-12-04 05:00:31 +08:00 · 7c27c6c3af
parent 5286e8dc11 ae4438ae0c
commit 7c27c6c3af
2 changed files with 5 additions and 0 deletions
--- a/2.5DHero/2.5DHeroContent/Scripts/underwatercave/SparkleAnimationSpeed.txt
+++ b/2.5DHero/2.5DHeroContent/Scripts/underwatercave/SparkleAnimationSpeed.txt
@ -0,0 +1,5 @@
+version=2
+	:if:<Npc.exists(0)>=true
+		@npc.setspeed(0,0.5)
+	:endif
+:end
--- a/2.5DHero/2.5DHeroContent/maps/underwatercave/volcano.dat
+++ b/2.5DHero/2.5DHeroContent/maps/underwatercave/volcano.dat