Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

# Conflicts:
#	Engine/source/console/test/ScriptTest.cpp
#	Engine/source/console/test/consoleTest.cpp
This commit is contained in:
Jeff Hutchinson 2021-05-06 21:08:53 -04:00
commit 69d7a2f4a1
12 changed files with 90 additions and 12 deletions

View file

@ -5,6 +5,8 @@ $pref::Player::zoomSpeed = 0;
$pref::Net::LagThreshold = 400;
$pref::Net::Port = 28000;
$pref::Master[0] = "2:master.torque3d.org:5664";
$pref::HudMessageLogSize = 40;
$pref::ChatHudLength = 1;