Merge branch 'Dev' into Stable

This commit is contained in:
ChocoTaco 2025-05-05 13:35:37 -04:00
commit 1a403be66a
2 changed files with 4 additions and 4 deletions

View file

@ -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
{

View file

@ -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){