Commit graph

1485 commits

Author SHA1 Message Date
Areloch
df18fda338 Merge pull request #1631 from John3/RapidFiring_setImageTrigger
Fix for rapid firing setImageTrigger(0,1); issue #1630
2016-07-02 15:57:19 -05:00
Areloch
35c4df3066 Merge pull request #1668 from Azaezel/revisedNsightWorkaround
revised torque_nsight_workaround
2016-06-30 20:40:58 -05:00
Areloch
48aed0e0ca Merge pull request #1667 from Azaezel/divnullbadmmmmkay
raycast division safety
2016-06-29 00:30:07 -05:00
Azaezel
47366068c1 revised torque_nsight_workaround 2016-06-27 19:35:40 -05:00
Azaezel
c67ba876d0 raycast division safety - corrects issues with awesomium and the guionobject resources relating to WYSIWYG casts. 2016-06-27 13:48:11 -05:00
Areloch
387e28a1e0 Merge pull request #1660 from Azaezel/knockOffKnotNetleak
suppresses a leak potentially caused by Knot::mType||Knot::mPath entr…
2016-06-27 01:17:28 -05:00
Azaezel
a0dc2adff8 suppresses a leak potentially caused by Knot::mType||Knot::mPath entries. 2016-06-21 20:53:08 -05:00
Areloch
68d44c4c30 Merge pull request #1645 from Areloch/NewObjectPointerCleanup
New object pointer cleanup
2016-06-21 05:11:03 -05:00
Areloch
b7882e7280 Merge pull request #1653 from Areloch/twiLightZone
Corrects culling of point/spot lights
2016-06-21 05:10:53 -05:00
Areloch
963ef1ecdb Merge pull request #1654 from Azaezel/shape_mounting
Shape mounting
2016-06-20 13:15:35 -05:00
Areloch
69244a8577 Readded some missed brackets 2016-06-20 13:14:19 -05:00
Areloch
810ac82eae Adds a missed cleanup for currentNewObj. 2016-06-20 12:34:07 -05:00
OTHGMars
8c2d5ee82c RigidShape Mounting 2016-06-17 10:41:04 -05:00
OTHGMars
a9f77c4ffd TSStatic Mounting 2016-06-17 10:40:22 -05:00
OTHGMars
937b8830e1 Vehicle Mounting 2016-06-17 10:36:37 -05:00
OTHGMars
a27fddc29a Turret Mounting 2016-06-17 10:36:36 -05:00
OTHGMars
037ee82982 Player Mounting
Removes the z axis rotation for consistency with other mounted object types.
2016-06-17 10:36:35 -05:00
OTHGMars
a285b7b07b SpawnSphere Mounting 2016-06-17 10:36:34 -05:00
OTHGMars
3afd5461c6 Camera Mounting 2016-06-17 10:36:33 -05:00
OTHGMars
cd3b080526 Item Mounting 2016-06-17 10:36:32 -05:00
OTHGMars
c39ca2c25e StaticShape Mounting 2016-06-17 10:36:31 -05:00
OTHGMars
b5a957dfdc ShapeBase Mounting
Added mount transforms to ShapeBase
2016-06-17 10:36:30 -05:00
OTHGMars
172e62a8f1 Mount Process Order Fix 2
Added a check to SceneObject::setProcessTick() to prevent objects that have mounts from being removed from the process list so the processAfter chain of the mounted objects is not broken.
2016-06-17 10:36:29 -05:00
OTHGMars
8250e4728d Mount Process Order Fix 1
Added a controlling object check to GameBase::onMount() so mounted objects will process after objects controlling them.
2016-06-17 10:36:28 -05:00
Areloch
dfb8f4f5e5 Makes point and spot lights be correctly culled with zoning like other objects. 2016-06-17 00:47:46 -05:00
John3
66194245ff clean up energyPerDamagePoint 2016-06-15 23:00:13 -05:00
Areloch
ca4e4fe86d Merge pull request #1647 from John3/typo_tomove
typo "tomove" to "to move"
2016-06-13 21:55:23 -05:00
Areloch
0e31368470 Merge pull request #1640 from Azaezel/dynamicCacheNuke
fallback - dynamic shadow cache nuking (static refresh delay preserved)
2016-06-13 21:51:17 -05:00
John3
060649dbad typo "tomove" to "to move" 2016-06-12 14:34:26 -05:00
Areloch
236edb3384 Merge pull request #1639 from Azaezel/StreamOverflow
corrects safety check for Stream::readLongString
2016-06-11 02:09:55 -05:00
Areloch
3cfc6f787c Adds some pointer cleanup in the event we bail out of creating a new object for whatever reason. 2016-06-11 02:06:24 -05:00
Areloch
164dca747a Merge branch 'StreamOverflow' of https://github.com/Azaezel/Torque3D into development 2016-06-09 09:04:28 -05:00
rextimmy
92017332eb Fixed AccuTexFeatHLSL implicit truncation error 2016-06-09 16:23:53 +10:00
rextimmy
ddfa4eaf18 DX11 accumulation shadergen fix. 2016-06-09 15:23:54 +10:00
Azaezel
b6ec969fb3 worst case scenario fallback for if we can't track down why vector lighting seems determined to shift positions periodically based upon some influence by the dynamicrefreshfrequency rate 2016-06-08 19:15:10 -05:00
Azaezel
fc110706a3 corrects safety check for Stream::readLongString 2016-06-08 15:28:40 -05:00
Areloch
27afd2ded1 Resolves the "conflict" with #1598 2016-06-08 09:39:11 -05:00
Areloch
efecbca8fc Merge pull request #1637 from pacomont/Initializing_Move_trigger
Fix for Issue #1415Move::Move() is not properly initializing bool tri…
2016-06-08 09:24:22 -05:00
Areloch
db41a0b30f Merge pull request #1548 from Azaezel/alphamaskedButtons
alpha masking for buttons. original attribution @dottools
2016-06-08 02:04:42 -05:00
John3
6c73968bdc fix redundant movePtr->trigger[ i ] 2016-06-07 19:05:10 -05:00
John3
0990716b1c Merge branch 'development' of https://github.com/GarageGames/Torque3D into RapidFiring_setImageTrigger 2016-06-07 18:32:24 -05:00
Jeff Hutchinson
e43a0ba6e9 Merge branch 'development-gg' into glpboimprovement
Conflicts:
	Engine/source/gfx/gl/gfxGLTextureManager.cpp
2016-06-07 15:48:21 -04:00
Areloch
fdbf183382 Merge pull request #1623 from blackwc/GuiTheoraCtrl-loop
add loop playback to GuiTheoraCtrl
2016-06-07 13:56:22 -05:00
Areloch
0ec9438429 The default configuration is for the asset database to automatically unload an asset when it's no longer referenced. This causes problems when we would delete objects and then go to make more instances that reference the same asset while the same mission is going.
So autounload is disabled to prevent excessive unloading of assets before the level is concluded.
2016-06-06 21:20:00 -05:00
John3
14834bde58 Fix for rapid firing setImageTrigger(0,1); issue #1630 2016-06-06 08:14:49 -05:00
Azaezel
75fa06dec2 Merge branch 'development' of https://github.com/GarageGames/Torque3D into FrameMallocMallet
Conflicts:
	Engine/source/gfx/gl/gfxGLTextureManager.cpp
2016-06-06 01:20:23 -05:00
Areloch
3a73344abb Resolves merging-order conflicts for the vehicle physics PR, as well as correcting cmake not blacklisting the componentGroup files if TORQUE_EXPERIMENTAL_EC was flipped off. 2016-06-05 19:17:34 -05:00
Areloch
37e030f8f4 Makes vehicles work with the physics plugins.
Makes vehicles create a basic physics body when using one of the physics plugins so that they can collide with other physics-enabled objects.

Based on @rextimmy 's work.
2016-06-04 16:47:03 -05:00
Areloch
6ec899620d Tweak to the Component Fields to properly refresh the group. 2016-06-02 23:57:46 -05:00
Areloch
89672ea0ab Hooks the component fields back into the inspector so they are registered as proper fields of their types, as opposed to the regular string-only dynamic fields. 2016-06-02 22:40:29 -05:00