mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-01-19 16:14:44 +00:00
Merge branch 'Dev' into Stable
This commit is contained in:
commit
1a403be66a
|
|
@ -45,10 +45,10 @@ function loadMissionStage2()
|
|||
//Tournament Mode specifics
|
||||
if($Host::TournamentMode)
|
||||
{
|
||||
if(!$CurrentMissionType $= "LCTF")
|
||||
if($CurrentMissionType $= "LCTF") //TimeLimit Always 20 minutes in LCTF Tourney Mode
|
||||
$Host::TimeLimit = 20;
|
||||
else
|
||||
$Host::TimeLimit = 30; //TimeLimit Always 30 minutes in Tourney Mode
|
||||
else //LCTF 20 Minutes
|
||||
$Host::TimeLimit = 20; //TimeLimit Always 20 minutes in LCTF Tourney Mode
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ $flagBoxSize = "0.796666 0.139717 2.46029";
|
|||
//1 = new OBB method uses perfect box intersection
|
||||
//2 = AABB method but uses boundbox can make the player larger then it is given there direction
|
||||
//3 = AABB fixed sizes uses $playerSizeBox and $flagBoxSize to do the box checking
|
||||
$boxCollision = 1;// off is the old AABB method aka the old method
|
||||
$boxCollision = 0; // off is the old AABB method aka the old method
|
||||
|
||||
package flagFix{
|
||||
function ShapeBase::throwObject(%this,%obj){
|
||||
|
|
|
|||
Loading…
Reference in a new issue