diff --git a/SierraUp.cfg b/SierraUp.cfg index 1a36350..227153b 100644 --- a/SierraUp.cfg +++ b/SierraUp.cfg @@ -1,7 +1,7 @@ ProductName "Tribes2" DisplayName "Tribes 2" PatchFolder .\patch -CurrentVersion 0.22047.0.0 +CurrentVersion 0.22075.0.0 AutoStart MonitorPatch LaunchExe "tribes2.exe" diff --git a/base/input.log b/base/input.log index 629f3b1..08c18af 100644 --- a/base/input.log +++ b/base/input.log @@ -1,4 +1,4 @@ -Input log opened at Mon Apr 2 10:53:48 2001 +Input log opened at Tue Apr 3 10:28:59 2001 Operating System: WinNT version 5.0 diff --git a/base/scripts/OptionsDlg.cs b/base/scripts/OptionsDlg.cs index 7bb4874..9579944 100644 --- a/base/scripts/OptionsDlg.cs +++ b/base/scripts/OptionsDlg.cs @@ -1520,7 +1520,10 @@ $ObsRemapCount++; $ObsRemapName[$ObsRemapCount] = "Toggle Observer Mode"; $ObsRemapCmd[$ObsRemapCount] = "jump"; $ObsRemapCount++; -$ObsRemapName[$ObsRemapCount] = "Cycle Camera"; +$ObsRemapName[$ObsRemapCount] = "Spawn/Previous"; +$ObsRemapCmd[$ObsRemapCount] = "mouseFire"; +$ObsRemapCount++; +$ObsRemapName[$ObsRemapCount] = "Cycle Camera/Next"; $ObsRemapCmd[$ObsRemapCount] = "mouseJet"; $ObsRemapCount++; @@ -2208,6 +2211,7 @@ function DeadZoneText::update( %this ) //------------------------------------------------------------------------------ function bindJoystickAxis( %axisIndex, %cmdIndex ) { + %cmd = $JoyRemapCmd[%cmdIndex]; %axis = $JoyAxisTab[%axisIndex].type; if ( %cmdIndex > $JoyRemapCount ) { @@ -2222,16 +2226,16 @@ function bindJoystickAxis( %axisIndex, %cmdIndex ) { %deadZone = "-" @ %delta SPC %delta; if ( InvertJoyAxisTgl.getValue() ) - moveMap.bind( "joystick", %axis, "SDI", %deadZone, %sens, $JoyRemapCmd[%cmdIndex] ); + moveMap.bind( "joystick", %axis, "SDI", %deadZone, %sens, %cmd ); else - moveMap.bind( "joystick", %axis, "SD", %deadZone, %sens, $JoyRemapCmd[%cmdIndex] ); + moveMap.bind( "joystick", %axis, "SD", %deadZone, %sens, %cmd ); } else { if ( InvertJoyAxisTgl.getValue() ) - moveMap.bind( "joystick", %axis, "SI", %sens, $JoyRemapCmd[%cmdIndex] ); + moveMap.bind( "joystick", %axis, "SI", %sens, %cmd ); else - moveMap.bind( "joystick", %axis, "S", %sens, $JoyRemapCmd[%cmdIndex] ); + moveMap.bind( "joystick", %axis, "S", %sens, %cmd ); } } @@ -2323,6 +2327,6 @@ function OP_LaunchScreenMenu::init( %this ) //------------------------------------------------------------------------------ function toggleImmersion() { - MessageBoxOK( "Force Feedback", "This will take effect next time you start Tribes 2." ); + MessageBoxOK( "Force Feedback", "This will take effect the next time you start Tribes 2." ); } diff --git a/base/scripts/controlDefaults.cs b/base/scripts/controlDefaults.cs index 0f3d579..8aaaf10 100644 --- a/base/scripts/controlDefaults.cs +++ b/base/scripts/controlDefaults.cs @@ -1022,6 +1022,7 @@ new ActionMap( observerMap ); observerMap.bind( keyboard, t, moveup ); observerMap.bind( keyboard, b, movedown ); observerMap.bind( keyboard, space, jump ); +observerMap.bind( mouse, button0, mouseFire ); observerMap.bind( mouse, button1, mouseJet ); /////////////////////// diff --git a/base/scripts/defaultGame.cs b/base/scripts/defaultGame.cs index 5fc0885..14bb2fe 100644 --- a/base/scripts/defaultGame.cs +++ b/base/scripts/defaultGame.cs @@ -1477,6 +1477,10 @@ function DefaultGame::clientMissionDropReady(%game, %client) %client.setControlObject( %client.camera ); } + //make sure the objective HUD indicates your team on top and in green... + if (%client.team > 0) + messageClient(%client, 'MsgCheckTeamLines', "", %client.team); + // were ready to go. %client.matchStartReady = true; echo("Client" SPC %client SPC "is ready."); diff --git a/base/scripts/hud.cs b/base/scripts/hud.cs index 5834358..da860eb 100644 --- a/base/scripts/hud.cs +++ b/base/scripts/hud.cs @@ -966,12 +966,15 @@ function updateActionMaps() // Create an action map just to block unwanted parts of the move map: new ActionMap( observerBlockMap ); observerBlockMap.blockBind( moveMap, jump ); + observerBlockMap.blockBind( moveMap, mouseFire ); observerBlockMap.blockBind( moveMap, mouseJet ); observerBlockMap.blockBind( moveMap, toggleZoom ); observerBlockMap.blockBind( moveMap, setZoomFOV ); observerBlockMap.push(); observerMap.push(); - //flyingCameraMove.push(); + // Make sure that "Spawn" is bound: + if ( observerMap.getBinding( mouseFire ) $= "" ) + observerMap.copyBind( moveMap, mouseFire ); case "PickTeam": // no mapping diff --git a/base/scripts/server.cs b/base/scripts/server.cs index d4a595a..363c962 100644 --- a/base/scripts/server.cs +++ b/base/scripts/server.cs @@ -865,7 +865,7 @@ function serverSetClientTeamState( %client ) } else // let this player join the team he was on last game { - if(Game.numTeams > 1 && $LastGameTeamCount > 1) + if(Game.numTeams > 1) { Game.clientJoinTeam( %client, %client.lastTeam, false ); } diff --git a/base/scripts/turrets/indoorDeployableBarrel.cs b/base/scripts/turrets/indoorDeployableBarrel.cs index 0c11760..16861b1 100644 --- a/base/scripts/turrets/indoorDeployableBarrel.cs +++ b/base/scripts/turrets/indoorDeployableBarrel.cs @@ -190,7 +190,7 @@ datablock LinearFlareProjectileData(IndoorTurretBolt) kickBackStrength = 0.0; dryVelocity = 120.0; - wetVelocity = 100.0; + wetVelocity = 40.0; velInheritFactor = 0.5; fizzleTimeMS = 2000; lifetimeMS = 3000; diff --git a/base/scripts/turrets/outdoorDeployableBarrel.cs b/base/scripts/turrets/outdoorDeployableBarrel.cs index 890d762..1103615 100644 --- a/base/scripts/turrets/outdoorDeployableBarrel.cs +++ b/base/scripts/turrets/outdoorDeployableBarrel.cs @@ -40,7 +40,7 @@ datablock TracerProjectileData(FusionBolt) explosion = PlasmaBoltExplosion; dryVelocity = 60.0; - wetVelocity = -1; + wetVelocity = 40.0; velInheritFactor = 1.0; fizzleTimeMS = 4000; lifetimeMS = 6000; diff --git a/base/scripts/weblinks.cs b/base/scripts/weblinks.cs index f10486c..9a4ec5d 100644 --- a/base/scripts/weblinks.cs +++ b/base/scripts/weblinks.cs @@ -1,7 +1,9 @@ addWebLink( "Tribes 2 Home Page", "www.tribes2.com" ); +addWebLink( "T2 Technical Information", "sierrastudios.com/games/tribes2/support" ); addWebLink( "5 Assed Monkey", "www.5assedmonkey.com" ); +addWebLink( "BarrysWorld", "www.barrysworld.com" ); addWebLink( "Clan Happytyme", "www.happytyme.com" ); -//addWebLink( "ClanBase", "www.clanbase.com" ); +addWebLink( "ClanBase", "www.clanbase.com" ); addWebLink( "Dopplegangers", "www.dopplegangers.com" ); addWebLink( "Dutchbat Homeworld", "www.dutchbat-homeworld.com" ); addWebLink( "Euro Tribesplayers", "www.euro-tribesplayers.com" ); @@ -16,5 +18,5 @@ addWebLink( "Telepresence Heavy Assault Team", "www.that.co.nz" ); addWebLink( "TribalWar", "www.tribalwar.com" ); addWebLink( "TribesMaps", "www.tribesmaps.com" ); addWebLink( "Tribes-Universe", "www.tribes-universe.com" ); -//addWebLink( "WirePlay", "www.wireplay.com.au" ); +addWebLink( "WirePlay", "www.wireplay.com.au" ); //addWebLink( "Z Free", "games13.clear.net.nz" ); \ No newline at end of file diff --git a/base/version.cs b/base/version.cs index dd87d36..de63d52 100644 --- a/base/version.cs +++ b/base/version.cs @@ -1 +1 @@ -buildVersion.setValue( "APR 2, 2001, 10:46 AM (dmoore)" ); +buildVersion.setValue( "APR 3, 2001, 10:22 AM (dmoore)" ); diff --git a/console_start.cs b/console_start.cs index bbeae30..8dceaba 100644 --- a/console_start.cs +++ b/console_start.cs @@ -504,10 +504,9 @@ function StartupGui::checkLoginDone( %this, %editAcct,%emailCheck ) switch$(%codeText) { case "WS_DBProxyServ_InvalidUserName": - if(%emailCheck) - %msg = "Email Password Failed - Invalid login name. Please check the login name and try again."; - else - %msg = "Account Creation Failed - Invalid login name. Login names may only contain letters, numbers and underlines, and must be from 3 to 16 characters in length."; + %msg = "Account Creation Failed - Invalid login name. Login names may only contain letters, numbers and underlines, and must be from 3 to 16 characters in length."; + case "WS_DBProxyServ_UserDoesNotExist": + %msg = "Email Password Failed - No such login name. Please check the login name and try again."; case "WS_AuthServ_BadCDKey": case "WS_DBProxyServ_InvalidCDKey": %msg = "Account Creation Failed - Invalid CD Key. Please check the CD key for errors.";