Commit graph

2253 commits

Author SHA1 Message Date
John3
0966037211 added $appName 2016-06-20 20:07:03 -05:00
John3
afcbe83a26 Corrected "Pref::Server::ConnectionError" description. 2016-06-20 19:30:54 -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
88f0318baa Merge pull request #1644 from Bradan/development
Fixed compile errors on linux (obvious programming faults).
2016-06-19 21:38:27 -05:00
Areloch
80dcf3eba5 Merge pull request #1643 from Azaezel/TriggerTrouble
corrects https://github.com/GarageGames/Torque3D/issues/1273
2016-06-18 11:54:41 -05:00
Areloch
f94c59e918 Merge pull request #1652 from John3/cleanup_unused
Cleanup unused functions
2016-06-18 11:29:42 -05:00
Azaezel
e9039b2261 Revert "Mounting demo script"
This reverts commit fb1fb5b7f39e4acb5a474789443cbe66b00cc414.
2016-06-17 10:41:38 -05:00
Azaezel
161cdcb02d Revert "Updated demo script"
This reverts commit b288411d1f16d499f59ac89a5070dc88889ed043.
2016-06-17 10:41:06 -05:00
OTHGMars
b8565b2b80 Updated demo script 2016-06-17 10:41:05 -05:00
OTHGMars
8c2d5ee82c RigidShape Mounting 2016-06-17 10:41:04 -05:00
OTHGMars
16c547306f Mounting demo script 2016-06-17 10:41:03 -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
John3
c7917e566c cleanup observeParameters 2016-06-15 23:17:00 -05:00
John3
072e7ad563 clean up observeParameters 2016-06-15 23:02:42 -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
Daniel Brall
afcb731d18 Fixed compile errors on linux (obvious programming faults). 2016-06-10 10:34:00 +02:00
Azaezel
b4dfb9ad08 corrects https://github.com/GarageGames/Torque3D/issues/1273 with suggested resolution 2016-06-09 13:23:37 -05:00
Areloch
c77e20a9a9 Merge pull request #1641 from rextimmy/dx11_accumulation_fix
DX11 accumulation shadergen fix.
2016-06-09 09:03:31 -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
b1b235a4c3 Merge pull request #1596 from Azaezel/FrameMallocMallet
removes FrameAllocatorMarker usage from GL side _fastTextureLoad
2016-06-08 09:40:32 -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
Areloch
39961500f4 Merge pull request #1598 from JeffProgrammer/glpboimprovement
replaces GL_PIXEL_UNPACK_BUFFER_ARB with GL_PIXEL_UNPACK_BUFFER
2016-06-08 02:04:21 -05:00
Areloch
b5d4eb9845 Merge pull request #1634 from dakk/patch-1
Fix for "Crash on 'add a new mesh' Forest Editor action" #1633
2016-06-07 22:19:19 -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
bacf0cde2a Merge pull request #1615 from Areloch/ECPR
Entity/Component implementation
2016-06-07 01:25:59 -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
Davide Gessa
d111484f89 Fix coding style 2016-06-06 20:19:33 +02:00
Davide Gessa
a525b3bd09 Remove assertion and handle error cases
Fix #1633
2016-06-06 20:17:29 +02: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