Commit graph

55 commits

Author SHA1 Message Date
Daniel Buckmaster
014b566014 Merge remote-tracking branch 'gg/development-3.6' into development
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
2015-01-29 21:17:38 +11:00
LuisAntonRebollo
4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
Daniel Buckmaster
ae284a89ec Merge branch 'development' into defineconsolemethod
Conflicts:
	Engine/source/materials/materialDefinition.cpp
2014-12-26 13:22:16 +11:00
Azaezel
5900fa0dde Merge branch 'AFXFIX6_ParticleOrientation' into Jeff_Faust_Fixes 2014-12-22 18:10:21 -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
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
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
830ab77628 Fixed a crash and memory leak on the ribbon code
OpenGL needs to unlock buffers on inverse order to work.
2014-12-02 13:39:57 +01:00
LuisAntonRebollo
1c95ce21d6 Merge pull request #608 from BeamNG/use_gfxdevice_setupgenericshaders
Use GFXDevice::setupGenericShaders for support non Fixed Fuction Pipelines.
2014-11-30 02:20:00 +01:00
LukasPJ
30a8401d14 Add support for rendering particles to the glow buffer 2014-11-28 23:34:26 +01:00
Daniel Buckmaster
11c70262c4 Fix #741
Local variable was used incorrectly. Did not result in any bugs, just a small amount of unnecessary network traffic.
2014-11-26 14:20:11 +11:00
Daniel Buckmaster
3082bb3adc Merge pull request #884 from GarageGames/development-3.6
Version 3.6.2
2014-11-05 20:28:01 +11:00
Vincent Gee
acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster
1554ea6faf Merge pull request #833 from just-bank/fix-derefptr
Fix: Null'ed pointer usage, possible access violation.
2014-10-16 10:38:52 +11:00
Daniel Buckmaster
f5fb2fdf76 Improved code style in ribbon files. 2014-09-24 08:08:42 +10:00
Lukas Joergensen
a8a141e73c RibbonNode class.
Simple RibbonNode class for an implementation similar to that of
ParticleEmitterNodes. Datablock currently has no static fields.
2014-09-19 00:32:17 +02:00
Lukas Joergensen
cb9cfea1c4 Ribbon class implementation.
This class is based on Tim Newell from MaxGaming Technologies code, it's a
Ribbon class which is easy to use from other classes.
2014-09-19 00:31:56 +02:00
LuisAntonRebollo
a3bdaf128f Fix memory corruption on Precipitation::destroySplash. 2014-07-12 02:03:20 +02:00
bank
e442b87c0c Fix: Null'ed pointer usage, possible access violation.
This fixes issue #700
2014-06-18 11:38:29 +04:00
Daniel Buckmaster
feec36731e Merge pull request #594 from LuisAntonRebollo/unit-tests-without-crash
Increased stability Torque3D: unit-tests running without a crash.
2014-06-16 10:57:04 +10:00
LuisAntonRebollo
18ba0646c0 Increased stability Torqu3D: unit-tests running without a crash. See the console.log after ran unitTest_runTests( "", true ). @signmotion 2014-05-25 16:50:19 +02:00
Thomas Fischer
cd978039ac Merge pull request #635 from just-bank/engine-fixes
Various engine fixes
2014-05-23 14:09:00 +02:00
Daniel Buckmaster
47dbce1499 Merge pull request #632 from eightyeight/better-explosion-example
Added a better example of using Explosion in a client/server fashion
2014-05-11 13:22:28 +10:00
bank
a7756b5591 Renamed local variable so it doesn't interfere with the provided argument.
String errorStr should be filled in only when ::preload returns false.
2014-05-06 15:35:52 +04:00
bank
e7fb6a54de Fix: Added missing virtual destructors for classes with virtual functions. 2014-05-06 12:40:46 +04:00
Daniel Buckmaster
46c9122432 Added a better example of using Explosion in a client/server fashion. 2014-04-25 13:04:12 +10:00
LuisAntonRebollo
33742599b3 Use GFXDevice::setupGenericShaders for support non Fixed Fuction Pipelines.
OpenGL and DirectX11 not support FFP, and GFDevice::disableShaders has not the necessary information to decide the shader to be used.

GFDevice::SetupGenericShaders is used instead of GFDevice::disableShaders.

GFDevice::disableShaders will be deprecated on T3D 4.0
2014-04-13 17:57:40 +02:00
Daniel Buckmaster
87d9e245b7 Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
2014-04-04 13:43:25 +11:00
DavidWyand-GG
3be3cc6589 Fix GroundCover banking with camera
Fix for issue https://github.com/GarageGames/Torque3D/issues/527
2013-11-11 15:03:45 -05:00
DavidWyand-GG
91e542b8ec SceneCullingState with culling and camera frustum
- Fix for issue https://github.com/GarageGames/Torque3D/issues/525  This
fix takes into account the skewed view into the world when you have a
projection offset and the ability to see further into the scene at the
edges opposite to the offset.
- SceneCullingState now has two frustum rather than one: a culling
frustum and camera frustum.
- The camera frustum should be referenced when you need the projection
matrix or don't want a skewed frustum.
- The culling frustum should be referenced during any scene culling or
when determining what dynamic geometry to render.  It currently skews
itself to take into account any projection offset (automatically
calculated in SceneCullingState constructor).
- When there is no projection offset, the camera frustum and culling
frustum are the same.  This usually means any time when not using the
Oculus Rift.
2013-11-07 15:07:16 -05:00
SilentMike
8d2fcf2456 Merge pull request #384 from eightyeight/dont-stress-clientmissioncleanup
Don't require ClientMissionCleanup to exist
2013-10-15 11:32:12 -07:00
thecelloman
278b4c9977 Fixes a mismatched variable name introduced in pr#460 2013-09-04 14:28:55 -04:00
SilentMike
f6efe41728 Merge pull request #460 from Azaezel/Particles
Particles
2013-08-19 08:22:04 -07:00
SilentMike
77bd934167 Merge pull request #424 from tdev/lock-checking
Added checks for valid pointers after locking
2013-08-11 22:14:16 -07:00
Brian Roberts
0c88a12b83 adds an ejectionOffsetVariance entry to particle emitters, which adds a buffer zone to ejectionOffsets (IE: let's us make rings, and the like.) 2013-08-06 13:36:17 -05:00
cpusci
7a8f46b19f Update for float, double and unsigned char, unsigned short, short, etc. char was left alone: read why here http://msdn.microsoft.com/en-us/library/cc953fe1.aspx 2013-08-04 16:58:59 -05:00
cpusci
4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
Thomas Fischer
53abbe066d added checks for valid pointers after locking 2013-06-30 17:51:38 +02:00
Daniel Buckmaster
8bc72ad9f9 Fixed GroundCover placement on rotated TerrainBlocks. 2013-06-13 10:15:48 +10:00
Daniel Buckmaster
36da869187 No longer require ClientMissionCleanup to be present to add particle emitters. 2013-05-14 21:01:52 +10:00
David Wyand
2dcc7f0247 Merge pull request #310 from thecelloman/goodbyeDIF
Remove Interior Object format (DIF)
2013-04-20 13:44:11 -07:00
SilentMike
57d92d522e Merge pull request #332 from tdev/beamng
some small patches
2013-04-17 16:48:10 -07:00
SilentMike
6300fa611f Merge pull request #144 from eightyeight/ground-cover-lod
GroundCover fading when zoomed in
2013-04-17 15:03:49 -07:00
Thomas Fischer
aece85f02a added missing initialization and set pointer to NULL after deletion 2013-04-15 18:54:34 +02:00
thecelloman
b4ea1123dc Remove Interior Object format (DIF) 2013-04-05 12:39:26 -04:00
David Wyand
965336d54d Merge pull request #211 from just-bank/particledata-bitstream-fixes
Fix for issue #210 and #154 for ParticleData sends out-of-range data via BitStream
2013-02-05 11:06:48 -08:00
bank
82de08b57a Fix memory leak (ParticleData and ParticleEmitterData) on using TypeValidator class.
This fixes issue #154
2013-02-01 21:22:03 +04:00
Dmitry
a31e6a755c Fixed crash in Con::warnf function. Issue #82 2013-01-30 15:21:22 -05:00
bank
9b2caeed6a Fix for issue #210 for ParticleData sends out-of-range data via BitStream
1. When addProtectedField used with custom setters, we need to return false, or it will set the value via regular routine after the method exists (change ParticleData::protectedSetTimes() to return false instead of true).

2. The ParticleData::sizes[] needs a custom setter, so the value is clamped in a range of 0.f and MaxParticleSize.

3. The spinRadnomMin and spinRandomMax ParticleData fields need a FRangeValidator, so it auto-clamped in a range of -1000 to 1000, as we are writing data trying to fit the values in 11 bits (as UInt upto 2048 max).
   * The description for those fields needs to be updated to use 1000 instead of 10000.
   * ParticleData::onAdd() should check for values to be in a correct range too.
2013-01-18 15:07:27 +04:00