Merge remote-tracking branch 'upstream/master'

This commit is contained in:
icomrade
2014-02-09 13:07:13 -05:00
24 changed files with 152 additions and 155 deletions

View File

@@ -1353,7 +1353,7 @@ class FSM
priority = 2.000000;
to="ERROR__No_Player_1";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.4"") || (_myEpoch != ""1.0.4"") || (_myEpochB != ""1.0.4.1"") || (_myEpochSfx != ""1.0.4"")"/*%FSM</CONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.4"") || (_myEpoch != ""1.0.4"") || (_myEpochB != ""1.0.4.1"") || (_myEpochSfx != ""1.0.4.1"")"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/