rextimmy
ddfa4eaf18
DX11 accumulation shadergen fix.
2016-06-09 15:23:54 +10: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
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
Areloch
2464b620ba
Fixes several minor initialization issues that were causing problems with deletion/management of components and entities.
...
Also makes the ThirdPersonPlayer game object editor selectable again by removing an erroneously set field.
2016-05-31 12:51:23 -05:00
Areloch
bbf7865a77
Makes sure if you don't spawn a game object into MissionGroup, it spawns it into MissionCleanup.
2016-05-30 21:30:02 -05:00
Areloch
553cf260f1
Some converts of usage of Shapebase for Gamebase to make camera/control object swapping easier.
2016-05-30 03:13:19 -05:00
Areloch
74a2005d15
Fixes mistake where GuiInspectorEntityGroup's onAdd doesn't explicitly return true, which can cause problems in some compilers.
2016-05-30 02:29:20 -05:00
Areloch
18184747e3
Fixes an issue where script-based components listed in the scene tree would not have a name on their tree item.
2016-05-29 11:54:50 -05:00
Areloch
e48ee1a03a
Fixes the recursive directory dump in the Linux platform code so that module/asset parsing works as expected.
2016-05-29 00:58:39 -05:00
Areloch
510b726f6f
Final Linux compliance changes(renames, tweaks for gcc compliance, etc)
2016-05-29 00:58:02 -05:00
Areloch
86f9c6f2e7
When using bullet physics, it ensures the player does not move when the world sim is paused, as well as correcting the surface check when walking to test against the max run angle.
2016-05-27 14:32:36 -05:00
blackwc
fd715f3ef3
add loop playback to GuiTheoraCtrl
2016-05-27 02:22:39 -04:00
Areloch
f5e86a83b5
Other renames to ensure linux case-sensitivity compliance and casing format consistency.
2016-05-26 13:56:19 -05:00
Areloch
93e767f0c5
Additional casing fixes.
2016-05-26 01:39:06 -05:00
Areloch
ec8882c3c8
Ensuring all names are the correct casing for Linux
2016-05-26 01:37:14 -05:00
Areloch
fb7e4f92ef
Adds in a GameObjects folder that lists all available game objects to the Scripted objects tab in the creator panel in the editor.
2016-05-25 22:16:24 -05:00
Areloch
ee6d9961e3
Merge pull request #1582 from Azaezel/SubSurf
...
Reimplements a form of subsurface scattering
2016-05-25 13:35:44 -05:00
Areloch
358bbdb740
Removed script calls to some fields that no longer exist, which was causing console errors.
2016-05-25 13:32:20 -05:00
Areloch
3d4b10476c
Merge pull request #1622 from Azaezel/VertColorCorrection
...
Fixes vertcolor code insertion order, and
2016-05-25 13:04:36 -05:00
Azaezel
942235d114
Fixes vertcolor code insertion order, and applies it adaptively based on defered or forward lit context
2016-05-25 03:08:28 -05:00
Areloch
9d47830a8b
Merge branch 'development' of https://github.com/GarageGames/Torque3D into development
2016-05-24 20:09:53 -05:00
Areloch
cfd15d47e4
Correction to interpolation/warp issue caused by using the wrong variable.
2016-05-24 20:09:24 -05:00
Areloch
f66a14c6e1
Merge pull request #1599 from JeffProgrammer/glprofiling
...
Added missing OpenGL profiling blocks.
2016-05-24 01:26:39 -05:00
Areloch
5ee1fb3917
Merge pull request #1597 from JeffProgrammer/glextlookup
...
OpenGL Extension Caching
2016-05-24 01:03:01 -05:00
Areloch
2fe9a8f2aa
Merge pull request #1621 from Areloch/PolyhedronRenderFix
...
Fixes the drawUtil rendering of polyhedrons
2016-05-23 00:04:27 -05:00
Areloch
8a7159c00e
Fixes the drawUtil rendering of polyhedrons by correcting the index ordering to work with triangleStrip as opposed to Fan.
2016-05-22 23:51:58 -05:00
John3
4bb63f277e
change pipe to underscore and fix prefabs assets
2016-05-21 15:10:35 -05:00
Areloch
04adb9f240
Added a small sanity check so we don't pointlessly throw an error when expanding an Entity's component stack in the scene tree.
2016-05-21 14:44:24 -05:00
Areloch
6517b86491
Editor integration for creation of entities and GameObjects.
2016-05-21 11:47:10 -05:00