Commit graph

1442 commits

Author SHA1 Message Date
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
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
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
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
Areloch
ee6d9961e3 Merge pull request #1582 from Azaezel/SubSurf
Reimplements a form of subsurface scattering
2016-05-25 13:35:44 -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
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
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
Areloch
65f51a89d8 Merge pull request #1595 from Areloch/EpoxyProjectMatrixFix
Rolls back OGL Projection correction.
2016-05-20 00:23:45 -05:00
Azaezel
d79b9a2988 removes w=z trick (was causing fisheye, effectively) 2016-05-18 06:38:13 -05:00
Areloch
3262c004a5 Merge pull request #1605 from Azaezel/fileFilterFix2
corrects native file dialogue return values
2016-05-17 12:49:14 -05:00
Areloch
c0a96c908f Adds handling for if the user cancels out of the file dialog, and adds support for proper multi-filters. 2016-05-17 12:46:39 -05:00
Areloch
c1f02c05e1 Adds some console methods to the non-class namespace Rotation for some convenient utility functions for dealing with rotations. 2016-05-16 16:03:24 -05:00
Areloch
8568ed19be Merge branch 'RotationFPR_Cleaned' of https://github.com/Areloch/Torque3D into development 2016-05-16 15:49:54 -05:00
James Urquhart
49a735e051 Fix axis check in Box3F::extend method 2016-05-13 12:09:40 +01:00
Areloch
1b47bdd972 Git apparently forgot to commit ALL the changes. 2016-05-12 23:49:06 -05:00
Areloch
383d27f2ec The class is designed as a general-purpose rotation/orientation class to make it easy to work with rotations and swap between math types as easily as possible. 2016-05-12 00:45:16 -05:00
Areloch
a2e0b1a163 Merge pull request #1604 from Azaezel/lightAnimCleanup
alternate to https://github.com/GarageGames/Torque3D/pull/1602
2016-05-10 11:47:25 -05:00
Areloch
8d195f9236 Makes the tab/spaces consistent for the entire console method function rather than mix-n-matching the formatting. 2016-05-10 10:58:03 -05:00
Areloch
27bb7a712a Corrects tabs. 2016-05-09 13:47:29 -05:00
Areloch
3a99541541 Select camera when in material editor crashfix.
When attempting to select a camera Object(so going into the editor, going into the freefloating camera and then back to the player camera and selecting the freefloating one) while the material editor was open, it would crash because it attempts to access the shapebase object's shapeInstance - but cameras don't have a shape.

This fixes it so it makes sure there's a shapeinstance before trying to get the material data.
2016-05-09 13:43:06 -05:00
Azaezel
5958e86e9a corrects native file dialogue return values 2016-05-09 06:43:47 -05:00
Azaezel
ad613f2e82 alternate to https://github.com/GarageGames/Torque3D/pull/1602 2016-05-08 21:52:00 -05:00
Jeff Hutchinson
909109713d redefined the copyToBMP 2016-05-06 23:45:48 -04:00
Jeff Hutchinson
db6d91925d Added profile blocks for GL. 2016-05-06 23:44:41 -04:00
Jeff Hutchinson
a50600afaa tabs->spaces for TRON :) 2016-05-06 22:57:35 -04:00
Jeff Hutchinson
f9b2aa397f cache OpenGL extensions that are not part of the 3.3 core profile, and that run more than initialization setup. 2016-05-06 21:50:11 -04:00
Jeff Hutchinson
a216b4515b remove old legacy extensions that aren't being used. 2016-05-06 21:24:52 -04:00
Azaezel
5a27313e14 removes FrameAllocatorMarker usage from GL side _fastTextureLoad
Repeatedly caused issues with 4096^2 atlases
2016-05-06 19:35:40 -05:00
Areloch
bc9033da2e Rolls back OGL Projection correction.
Epoxy looks to handle the projection depth range so it behaves more like D3D, so this change was doubling up and causing problems.
2016-05-06 16:45:18 -05:00
Areloch
e8bc70e514 Merge pull request #1567 from JeffProgrammer/epoxy
Added Epoxy in favor of GLEW
2016-05-05 19:40:59 -05:00
rextimmy
8056a4bfa9 GL fix for Epoxy and creating a 3.2 core context with win32 api. 2016-05-05 22:25:34 +10:00
Areloch
fb3401a5d7 Merge pull request #1589 from Azaezel/GFXDynamicTextureProfile
GFXDynamicTextureProfile
2016-05-05 01:35:26 -05:00
Areloch
ec6f9c05a6 Integrates the nativeFileDialog library to enable native file dialogs on the major platforms. It is activated with SDL. 2016-04-30 15:48:33 -05:00
Azaezel
4b1895cba5 Certain plugins were not playing nice on the directx end with updating rendertargets. Provides a profile for targets intended to be continuously updated. 2016-04-24 11:36:28 -05:00
Areloch
ae9cb0533a Merge pull request #1574 from Azaezel/naughtyNearPlane
corrects projection matricies for opengl
2016-04-19 02:17:48 -05:00
Areloch
e8c96d7df1 Merge pull request #1577 from rextimmy/dx11_gl_drawutil_border_fix
DX11/GL border offset fix for GFXDrawUtil::drawRect
2016-04-19 01:47:38 -05:00
Jeff Hutchinson
fddc00b39b Merge branch 'development-gg' into epoxy 2016-04-17 23:59:42 -04:00
Azaezel
00cc949011 reimplements a form of subsurface scattering 2016-04-15 00:20:55 -05:00
Areloch
b4547da50b Merge pull request #1576 from Areloch/SDLUpdate
Updates SDL to version 2.0.4, which makes it compatible with VS2015.
2016-04-10 21:32:30 -05:00
Areloch
b23ac9fb6a Removes some unnecessary extension checks for GL, as those formats are part of 3.2 core. SDL is having some conflicts with extension detection with GL. 2016-04-08 15:34:02 -05:00
rextimmy
5a4bb6b36d DX11/GL border offset fix for GFXDrawUtil::drawRect 2016-04-08 18:58:53 +10:00
Areloch
b63ef177f4 Updates SDL to version 2.0.4, which makes it compatible with VS2015. 2016-04-07 00:40:06 -05:00
Azaezel
223e9a8264 corrects projection matricies for opengl 2016-04-05 20:36:13 -05:00
Azaezel
bac14875f4 allows navmeshes to generate for most scene objects, and adds a NavMeshIgnore method for object-instances to filter them out. 2016-04-04 09:38:24 -05:00
rextimmy
2073a94a7a ScreenShotD3D11 delete fix. 2016-04-02 22:30:56 +10:00
Areloch
6a40b8bb84 Merge pull request #1559 from rextimmy/dx11_clean
Direct3D11 Support
2016-03-29 00:51:23 -05:00
Areloch
4d190b1982 Roll back the changes to simPath temporarily in order to merge in DX11 2016-03-29 00:08:18 -05:00