Merge branch 'release_1' of https://github.com/ThatZeoMan/HeavenStudio into release_1
This commit is contained in:
commit
653006c542
|
|
@ -81,9 +81,7 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
highKickSwing = highKicks[i]["swing"];
|
highKickSwing = 0.5f;
|
||||||
if (highKickSwing == 0f)
|
|
||||||
highKickSwing = 0.5f;
|
|
||||||
|
|
||||||
if (highKicks[i].beat + GetAnimLength(State.HighKicked) > currentBeat)
|
if (highKicks[i].beat + GetAnimLength(State.HighKicked) > currentBeat)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -253,9 +253,7 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
|
||||||
|
|
||||||
if (ball)
|
if (ball)
|
||||||
{
|
{
|
||||||
ball.highKickSwing = highKicks[i]["swing"];
|
ball.highKickSwing = 0.5f;
|
||||||
if (ball.highKickSwing == 0f)
|
|
||||||
ball.highKickSwing = 0.5f;
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,10 +33,6 @@ namespace HeavenStudio.Games.Loaders
|
||||||
new GameAction("high kick-toe!", "High Kick-Toe!")
|
new GameAction("high kick-toe!", "High Kick-Toe!")
|
||||||
{
|
{
|
||||||
defaultLength = 3f,
|
defaultLength = 3f,
|
||||||
parameters = new List<Param>()
|
|
||||||
{
|
|
||||||
new Param("swing", new EntityTypes.Float(0, 1, 0.5f), "Swing", "Set the amount of swing for the cue. MINENICE REMOVE THIS >:((((((")
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
new GameAction("npc kickers enter or exit", "NPC Kickers")
|
new GameAction("npc kickers enter or exit", "NPC Kickers")
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue