TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-18 14:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3499 commits 5 branches 33 tags 958 MiB
Commit graph

3499 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
0b178ec579 Merge branch 'development' of https://github.com/GarageGames/Torque3D into development 2016-06-10 22:51:23 -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
Azaezel
2b57bed899 level-wide accumulation assignment - overidden if an object's origin is in an accumulationVolume. 
** do note changing the value does require nudging a mesh and/or a level reload to kick in at time of writing for visual feedback.
 2016-06-09 12:51:43 -05:00
Areloch
164dca747a Merge branch 'StreamOverflow' of https://github.com/Azaezel/Torque3D into development 2016-06-09 09:04:28 -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
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
Azaezel
702e63cb0c puts forward-lit #targetname assignment of faux diffuse maps back 2016-06-07 13:54:30 -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
6419ba1e33 localization augmentations via rlranft RE: http://forums.torque3d.org/viewtopic.php?f=12&t=642&hilit=localization 2016-06-06 09:42: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
d2161e5c59 Merge pull request #1629 from Areloch/Veheekel_Feezeeks2 
Makes vehicles work with the physics plugins.
 2016-06-04 19:45:53 -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
Areloch
5122360552 Merge pull request #1587 from Areloch/ProfilerMenuTool 
Profiler toggle and World Editor menu entry.
 2016-05-31 23:32:31 -05:00
Areloch
823fc41abc Merge pull request #1620 from John3/spaceFolderSceneTree2 
Bug space folder in scene tree 2
 2016-05-31 23:28:45 -05:00
Areloch
f427439457 Merge pull request #1573 from Azaezel/navmeshtweaks 
allows navmeshes to generate for most scene objects,
 2016-05-31 23:28:31 -05:00
Areloch
7ea3c19017 Merge pull request #1558 from OTHGMars/Px3Crouch 
Spacial update for Px3 character controller
 2016-05-31 23:15:56 -05:00
Areloch
7327c2a415 Merge pull request #1625 from Areloch/WalkingBullet 
Fixes some bullet physics issues with the player class
 2016-05-31 23:09:38 -05:00