TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-27 08:09:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2037 from Areloch/BaseGameToDate

Browse source 
Base game to date
This commit is contained in:
Areloch 2017-07-09 03:44:56 -05:00 • committed by GitHub
commit ea6a04e478
47 changed files with 94 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Templates/Modules/FPSGameplay/scripts/datablocks/managedDecalData.cs
View file

@ -39,8 +39,8 @@ datablock DecalData(ScorchRXDecal)
texRows = "2";
texCols = "2";
clippingAngle = "80";
screenStartRadius = "200";
screenEndRadius = "100";
fadeStartPixelSize = "200";
fadeEndPixelSize = "100";
};
datablock DecalData(bulletHoleDecal)
@ -51,7 +51,7 @@ datablock DecalData(bulletHoleDecal)
randomize = "1";
texRows = "2";
texCols = "2";
screenStartRadius = "20";
screenEndRadius = "5";
fadeStartPixelSize = "20";
fadeEndPixelSize = "5";
clippingAngle = "180";
};

32
Templates/Modules/FPSGameplay/scripts/datablocks/weapons/grenadefx.cs
View file

@ -55,7 +55,7 @@ datablock LightDescription(GrenadeLauncherLightDesc)
datablock ParticleData(GrenadeDebrisFireParticle)
{
textureName = "data/FPSGameplay/art/particles/impact";
dragCoefficient = 0;
dragCoeffiecient = 0;
gravityCoefficient = -1.00366;
inheritedVelFactor = 0.0;
constantAcceleration = 0.0;
@ -127,7 +127,7 @@ datablock DebrisData(GrenadeDebris)
datablock ParticleData(GrenadeSplashMist)
{
dragCoefficient = 1.0;
dragCoeffiecient = 1.0;
windCoefficient = 2.0;
gravityCoefficient = 0.3;
inheritedVelFactor = 0.0;
@ -172,7 +172,7 @@ datablock ParticleEmitterData(GrenadeSplashMistEmitter)
datablock ParticleData(GrenadeSplashParticle)
{
dragCoefficient = 1;
dragCoeffiecient = 1;
windCoefficient = 0.9;
gravityCoefficient = 0.3;
inheritedVelFactor = 0.2;
@ -215,7 +215,7 @@ datablock ParticleEmitterData(GrenadeSplashEmitter)
datablock ParticleData(GrenadeSplashRingParticle)
{
textureName = "data/FPSGameplay/art/particles/wake";
dragCoefficient = 0.0;
dragCoeffiecient = 0.0;
gravityCoefficient = 0.0;
inheritedVelFactor = 0.0;
lifetimeMS = 2500;
@ -298,7 +298,7 @@ datablock SplashData(GrenadeSplash)
datablock ParticleData(GrenadeExpFire)
{
textureName = "data/FPSGameplay/art/particles/fireball.png";
dragCoefficient = 0;
dragCoeffiecient = 0;
windCoeffiecient = 0.5;
gravityCoefficient = -1;
inheritedVelFactor = 0;
@ -320,7 +320,7 @@ datablock ParticleData(GrenadeExpFire)
times[2] = 0.5;
animTexName = "data/FPSGameplay/art/particles/fireball.png";
times[3] = "1";
dragCoefficient = "1.99902";
dragCoeffiecient = "1.99902";
sizes[3] = "10";
colors[3] = "0 0 0 0";
};
@ -341,7 +341,7 @@ datablock ParticleEmitterData(GrenadeExpFireEmitter)
datablock ParticleData(GrenadeExpDust)
{
textureName = "data/FPSGameplay/art/particles/smoke.png";
dragCoefficient = 0.498534;
dragCoeffiecient = 0.498534;
gravityCoefficient = 0;
inheritedVelFactor = 1;
constantAcceleration = 0.0;
@ -385,7 +385,7 @@ datablock ParticleEmitterData(GrenadeExpDustEmitter)
datablock ParticleData(GrenadeExpSpark)
{
textureName = "data/FPSGameplay/art/particles/Sparkparticle";
dragCoefficient = 1;
dragCoeffiecient = 1;
gravityCoefficient = 0.0;
inheritedVelFactor = 0.2;
constantAcceleration = 0.0;
@ -422,7 +422,7 @@ datablock ParticleEmitterData(GrenadeExpSparkEmitter)
datablock ParticleData(GrenadeExpSparks)
{
textureName = "data/FPSGameplay/art/particles/droplet";
dragCoefficient = 1;
dragCoeffiecient = 1;
gravityCoefficient = 0.0;
inheritedVelFactor = 0.2;
constantAcceleration = 0.0;
@ -462,7 +462,7 @@ datablock ParticleEmitterData(GrenadeExpSparksEmitter)
datablock ParticleData(GrenadeExpSmoke)
{
textureName = "data/FPSGameplay/art/particles/smoke";
dragCoefficient = 0;
dragCoeffiecient = 0;
gravityCoefficient = -0.40293;
inheritedVelFactor = 0.0;
constantAcceleration = 0.0;
@ -550,7 +550,7 @@ datablock ExplosionData(GrenadeExplosion)
datablock ParticleData(GLWaterExpDust)
{
textureName = "data/FPSGameplay/art/particles/steam";
dragCoefficient = 1.0;
dragCoeffiecient = 1.0;
gravityCoefficient = -0.01;
inheritedVelFactor = 0.0;
constantAcceleration = 0.0;
@ -590,7 +590,7 @@ datablock ParticleEmitterData(GLWaterExpDustEmitter)
datablock ParticleData(GLWaterExpSparks)
{
textureName = "data/FPSGameplay/art/particles/spark_wet";
dragCoefficient = 1;
dragCoeffiecient = 1;
gravityCoefficient = 0.0;
inheritedVelFactor = 0.2;
constantAcceleration = 0.0;
@ -630,7 +630,7 @@ datablock ParticleEmitterData(GLWaterExpSparkEmitter)
datablock ParticleData(GLWaterExpSmoke)
{
textureName = "data/FPSGameplay/art/particles/smoke";
dragCoefficient = 0.4;
dragCoeffiecient = 0.4;
gravityCoefficient = -0.25;
inheritedVelFactor = 0.025;
constantAcceleration = -1.1;
@ -669,7 +669,7 @@ datablock ParticleEmitterData(GLWaterExpSmokeEmitter)
datablock ParticleData(GLWaterExpBubbles)
{
textureName = "data/FPSGameplay/art/particles/millsplash01";
dragCoefficient = 0.0;
dragCoeffiecient = 0.0;
gravityCoefficient = -0.05;
inheritedVelFactor = 0.0;
constantAcceleration = 0.0;
@ -799,7 +799,7 @@ datablock ExplosionData(GrenadeLauncherExplosion)
datablock ParticleData(GrenadeTrailWaterParticle)
{
textureName = "data/FPSGameplay/art/particles/bubble";
dragCoefficient = 0.0;
dragCoeffiecient = 0.0;
gravityCoefficient = 0.1;
inheritedVelFactor = 0.0;
constantAcceleration = 0.0;
@ -845,7 +845,7 @@ datablock ParticleEmitterData(GrenadeTrailWaterEmitter)
datablock ParticleData(GrenadeProjSmokeTrail)
{
textureName = "data/FPSGameplay/art/particles/smoke";
dragCoefficient = 0.0;
dragCoeffiecient = 0.0;
gravityCoefficient = -0.2;
inheritedVelFactor = 0.0;
constantAcceleration = 0.0;

8
Templates/Modules/FPSGameplay/scripts/datablocks/weapons/rocketfx.cs
View file

@ -28,7 +28,7 @@ datablock SFXProfile(RocketLauncherExplosionSound)
datablock ParticleData(RocketDebrisTrailParticle)
{
textureName = "data/FPSGameplay/art/particles/impact";
dragCoefficient = 0;
dragCoeffiecient = 0;
inheritedVelFactor = 0.0;
constantAcceleration = 0.0;
lifetimeMS = 1200;//1000;
@ -96,7 +96,7 @@ datablock DebrisData(RocketDebris)
datablock ParticleData(RocketSplashMist)
{
dragCoefficient = 1.0;
dragCoeffiecient = 1.0;
windCoefficient = 2.0;
gravityCoefficient = 0.3;
inheritedVelFactor = 0.0;
@ -137,7 +137,7 @@ datablock ParticleEmitterData(RocketSplashMistEmitter)
datablock ParticleData(RocketSplashParticle)
{
dragCoefficient = 1;
dragCoeffiecient = 1;
windCoefficient = 0.9;
gravityCoefficient = 0.3;
inheritedVelFactor = 0.2;
@ -177,7 +177,7 @@ datablock ParticleEmitterData(RocketSplashEmitter)
datablock ParticleData(RocketSplashRingParticle)
{
textureName = "data/FPSGameplay/art/particles/wake";
dragCoefficient = 0.0;
dragCoeffiecient = 0.0;
gravityCoefficient = 0.0;
inheritedVelFactor = 0.0;
lifetimeMS = 2500;