TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 15:14:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'gg/development-3.6' into development

Browse source 
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
This commit is contained in:
Daniel Buckmaster 2015-01-29 21:17:38 +11:00
commit 014b566014
29 changed files with 252 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/Full/game/art/datablocks/player.cs
View file

@ -482,7 +482,7 @@ datablock DebrisData( PlayerDebris )
datablock PlayerData(DefaultPlayerData)
{
renderFirstPerson = false;
firstPersonShadows = true;
computeCRC = false;
// Third person shape

7
Templates/Full/game/art/datablocks/weapons/Ryder.cs
View file

@ -192,9 +192,9 @@ datablock ShapeBaseImageData(RyderWeaponImage)
lightBrightness = 2;
// Shake camera while firing.
shakeCamera = false;
camShakeFreq = "0 0 0";
camShakeAmp = "0 0 0";
shakeCamera = "1";
camShakeFreq = "10 10 10";
camShakeAmp = "5 5 5";
// Images have a state system which controls how the animations
// are run, which sounds are played, script callbacks, etc. This
@ -361,4 +361,5 @@ datablock ShapeBaseImageData(RyderWeaponImage)
stateSequenceTransitionOut[13] = true;
stateAllowImageChange[13] = false;
stateSequence[13] = "sprint";
camShakeDuration = "0.2";
};

5
Templates/Full/game/scripts/server/aiPlayer.cs
View file

@ -212,7 +212,10 @@ function AIPlayer::singleShot(%this)
// The shooting delay is used to pulse the trigger
%this.setImageTrigger(0, true);
%this.setImageTrigger(0, false);
%this.trigger = %this.schedule(%this.shootingDelay, singleShot);
%delay = %this.getDataBlock().shootingDelay;
if (%delay $= "")
%delay = 1000;
%this.trigger = %this.schedule(%delay, singleShot);
}
//-----------------------------------------------------------------------------