Commit graph

2360 commits

Author SHA1 Message Date
Daniel Buckmaster
ae284a89ec Merge branch 'development' into defineconsolemethod
Conflicts:
	Engine/source/materials/materialDefinition.cpp
2014-12-26 13:22:16 +11:00
Daniel Buckmaster
7d376386d1 Merge pull request #1074 from Azaezel/AccuVolumes_2
Accumulation volumes
2014-12-26 13:18:00 +11:00
Daniel Buckmaster
cd42424d61 Use a strong reference instead of more manual reference counting. 2014-12-26 11:41:19 +11:00
Daniel Buckmaster
f9cd778b3b Fixed tricky overloaded sfx* functions. 2014-12-24 10:04:44 +11:00
Daniel Buckmaster
c85ac03c16 Merge pull request #1020 from eightyeight/simdictionary-improvement
SimDictionary improvement
2014-12-24 09:54:54 +11:00
Daniel Buckmaster
859514a792 Guard against null pointers and remove unnecessary include. 2014-12-24 08:34:30 +11:00
LuisAntonRebollo
7453610563 Fix persistent underwater effect. 2014-12-23 22:32:21 +01:00
Daniel Buckmaster
3ab048c5b0 Fixes after feedback from Luis.
* Made use of dStrIsEmpty in more locations (and fixed it :P)
 * Removed commented-out code
 * Corrected default params
 * Fixed some console warning formats
 * Removed tabs
 * Corrected setExtent API
2014-12-23 18:48:02 +11:00
Azaezel
ee808bb848 Merge branch 'AFXFIX7_PlayerDivNULL' into Jeff_Faust_Fixes 2014-12-22 18:10:37 -06:00
Azaezel
5900fa0dde Merge branch 'AFXFIX6_ParticleOrientation' into Jeff_Faust_Fixes 2014-12-22 18:10:21 -06:00
Azaezel
ce52e0171e Merge branch 'AFXFIX5_ParticleProtection' into Jeff_Faust_Fixes 2014-12-22 18:09:51 -06:00
Azaezel
566a6e9fe6 Merge branch 'AFXFIX4_RefcountCatch' into Jeff_Faust_Fixes 2014-12-22 18:09:32 -06:00
Azaezel
0d19b14fbe Merge branch 'AFXFIX3_FogFix' into Jeff_Faust_Fixes 2014-12-22 18:08:53 -06:00
Azaezel
0b0a68c2ac Merge branch 'AFXFIX2_VertFormatCheck' into Jeff_Faust_Fixes 2014-12-22 18:08:45 -06:00
Azaezel
dbd8c6b37b Player Networking DIVNULL error correction
With Permission from Jeff Faust.

   // AFX CODE BLOCK (bug-fix) <<
   // avoids a divide-by-zero when maxEnergy is set to zero.
2014-12-22 18:08:05 -06:00
Azaezel
8c979a6d7b Oriented Particles UV Correction
With Permission from Jeff Faust.

   // AFX CODE BLOCK (bug-fix) <<
   // this fix re-orders the UV coords to produce a consistent orientation
   // with oriented particles in TGE.
2014-12-22 18:05:43 -06:00
Azaezel
c76b44bb91 Ref Count Catch
With Permission from Jeff Faust.

         // AFX CODE BLOCK (bug-fix) <<
(no text, self evident)
2014-12-22 18:03:52 -06:00
Azaezel
dbf9275037 Ref Count Catch
With Permission from Jeff Faust.

         // AFX CODE BLOCK (bug-fix) <<
         // for events that are not GuaranteedOrdered we can get here w/o ever
         // incrementing ref-count on the event.
2014-12-22 18:01:18 -06:00
Azaezel
b2a4f3fd44 depth correction
With Permission from Jeff Faust.

   // AFX CODE BLOCK (bug-fix) <<
   // This fix prevents some bad rendering artifacts that occur at the edge of the visibleDistance.
   // The artifacts are most obvious when there is fog present.
2014-12-22 17:58:12 -06:00
Azaezel
a4adf28ef5 mVertexFormat validation fix
With Permission from Jeff Faust.

   // AFX CODE BLOCK (bug-fix) <<
(no text, self evident)
2014-12-22 17:55:10 -06:00
Azaezel
a3fab3d4c4 Projected Shadow fix
With Permission from Jeff Faust.

   // AFX CODE BLOCK (bug-fix) <<
   // For ShapeBase objects this causes the shader to fade along with the
   // object and also prevents a rectangular shadow artifact from occuring
   // once the visibility is zero.
2014-12-22 17:52:02 -06:00
LuisAntonRebollo
cd993e0607 Merge pull request #970 from Lopuska/patch-5
clamp value fix on vorbis decoding
2014-12-22 23:20:44 +01:00
LuisAntonRebollo
e58beba4a5 Merge pull request #1025 from bpay/fix-amd-mesh-render
Fix AMD render problem with missed meshes.
2014-12-22 23:10:43 +01:00
Azaezel
793d7bf856 feedback for *which* namespace is already linked. should probably look into enhancing assertwarn to be able to take a formatted string at some point... 2014-12-22 11:05:00 -06:00
Daniel Buckmaster
84430a46a8 Merge pull request #1046 from Areloch/Issue_945
Fixes #945
2014-12-22 14:53:27 +11:00
Azaezel
c6cdfafe4e cleaned up variant of https://github.com/GarageGames/Torque3D/pull/768 alterations: opengl support, in-shader bug-reporting, direction vector fit to material slider-bar. 2014-12-21 14:07:42 -06:00
Daniel Buckmaster
949251b988 Merge pull request #1065 from rextimmy/windows_date_fix
winTime month fix
2014-12-21 21:49:30 +11:00
Daniel Buckmaster
04ff04a95f Removed some unneccessary changes and made file name consistent. 2014-12-21 21:25:27 +11:00
Daniel Buckmaster
03f71a78c0 Added dStrIsEmpty and replaced some incorrect string comparisons. 2014-12-21 21:25:19 +11:00
Daniel Buckmaster
9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod
Conflicts:
	Engine/source/T3D/missionMarker.cpp
2014-12-21 21:23:55 +11:00
Daniel Buckmaster
5af91bf07a Merge pull request #921 from lukaspj/Mixed-Particle-Rendering-Warning-Fix
Remove warning
2014-12-21 19:06:57 +11:00
Daniel Buckmaster
183fe7dbeb Merge pull request #996 from Winterleaf/Add-new-cpus-AMD-Types
Added support for AMD Chips
2014-12-21 19:04:26 +11:00
Daniel Buckmaster
8a104a5222 Merge pull request #1018 from eightyeight/ghost-scoping
Add the option to limit ghost scoping range
2014-12-21 19:03:02 +11:00
Daniel Buckmaster
7916ff369b Merge pull request #1026 from jamesu/fix_console_stack
Fix issue where console stack values were getting overwritten
2014-12-21 19:02:20 +11:00
LuisAntonRebollo
e5cd80ac87 Merge pull request #1024 from eightyeight/scattersky-flare-fix
Fix ScatterSky flare occlusion
2014-12-19 13:35:48 +01:00
Anis
5c72035e01 virtual processVert also on directx 2014-12-19 12:25:56 +01:00
Anis
30815cb641 fixed also on DirectX 2014-12-19 12:25:18 +01:00
Anis
4bf5aade6e make override processVert on SpecularMap feature 2014-12-19 12:24:03 +01:00
Anis
1751e60734 bugfix #1066
texcoord connector on the vertexshader to avoid link time error
2014-12-19 12:22:36 +01:00
rextimmy
97e7e07607 winTime month fix 2014-12-18 14:25:45 +10:00
Daniel Buckmaster
63b35581c4 Merge pull request #1036 from Areloch/Issue_748
PR for issue #748
2014-12-17 21:02:20 +11:00
Azaezel
98048fd974 Merge branch 'GlowingParticles' of https://github.com/lukaspj/Torque3D into glowParticles
Conflicts:
	Engine/source/renderInstance/renderParticleMgr.cpp
2014-12-16 18:48:28 -06:00
Anis
ca04726ad6 glGenerateMipmap on uncompressed cubemap 2014-12-16 15:14:30 +01:00
Anis
0cf36a8906 mipmap support on DDS for openGL cubemap 2014-12-15 18:59:42 +01:00
LuisAntonRebollo
15c8922028 Fix ShaderGen cubemap feature. 2014-12-15 18:28:17 +01:00
Daniel Buckmaster
33ff180593 Merge branch 'development' into style-cleanup
Conflicts:
	Engine/source/console/astNodes.cpp
	Engine/source/console/codeBlock.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/collada/colladaAppMesh.cpp
	Engine/source/ts/tsShape.cpp
	Engine/source/ts/tsShapeConstruct.cpp
2014-12-15 12:15:55 +11:00
LuisAntonRebollo
ef2a843dcd Merge pull request #1029 from Lopuska/patch-3
Intel graphics bugfix
2014-12-14 23:45:47 +01:00
Ben Payne
8d4679b2b7 Fix potential buffer overflows 2014-12-13 16:12:02 -05:00
Ben Payne
cadc390895 Fix leaked member var 2014-12-13 16:08:48 -05:00
Ben Payne
de7101dec2 Fix mismatched free
Memory was allocated with new on line 304
2014-12-13 16:08:47 -05:00