Commit graph

2253 commits

Author SHA1 Message Date
Areloch
419fe3a343 Merge pull request #1591 from Areloch/PhysicsShapeDamageFix
Re-enable destruction of PhysicsShapes.
2016-05-05 01:22:51 -05:00
Jeff Hutchinson
cc4d35d563 Merge pull request #5 from rextimmy/epoxy_sdl_fix
Fix for Epoxy to work with SDL and VS 2015
2016-05-04 09:47:52 -04:00
rextimmy
f1c8286c2f Fix for Epoxy to work with SDL and VS 2015 2016-05-04 10:05:34 +10:00
Areloch
b3bc199975 Adds a TypeSimObjectPtr type for easy reference to other objects as a field. 2016-04-30 23:38:35 -05:00
Areloch
de0fe06bc8 Makes netObjects inherit off simGroup as opposed to simObject so that just about any object can function as a parent with children. 2016-04-30 23:34:54 -05:00
Areloch
86dd8a8cf7 Adds a onPostAdd callback to simObject so we can do handling AFTER the object and it's children have been added successfully. 2016-04-30 23:32:10 -05:00
Areloch
5231012980 Merge pull request #1593 from Areloch/NFD_PR
Native File Dialogs
2016-04-30 17:18:33 -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
Areloch
c645475e56 Adds in some missing script functions that let projectiles damage and destroy physics shapes. 2016-04-26 11:30:24 -05:00
Azaezel
3d6803865c missing samplerstate configurations 2016-04-25 11:36:23 -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
25d2fd877b Makes the profiler pop-up act on a toggle, and also adds an entry into the World Editor's Tool menu to easily activate it. 2016-04-20 01:06:31 -05:00
Areloch
587ab6a39e Adds 2 fields to expose the net simulation functionality more readily to the NetGraph GUI.
Also added a Tools option to the World Editor menubar, with the NetGraph as the first option to make it easier to activate the NetGraph in the editor.
2016-04-20 00:46:41 -05:00
Areloch
bab55d46a9 Merge pull request #1555 from Azaezel/CausticCaustics
fix for broken caustics reference
2016-04-19 22:04:00 -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
88356ae37f subsurface followup: cleanups and corrections for vectorlightP, fillins for spot, point, and opengl equivalents 2016-04-15 16:06:10 -05: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
e2228200ef Merge pull request #1578 from Areloch/GLCoreExtensionFormatFix
Fix up GL formats to comply with core profile.
2016-04-10 21:28:36 -05:00
Areloch
60ffb8e902 Merge pull request #1568 from Azaezel/soSensitive9001
case sensitivity typofix
2016-04-10 09:28:47 -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
21f5273098 Merge pull request #1571 from rextimmy/ScreenShotD3D11_delete_fix
ScreenShotD3D11 delete fix.
2016-04-08 00:42:04 -05:00
Areloch
b63ef177f4 Updates SDL to version 2.0.4, which makes it compatible with VS2015. 2016-04-07 00:40:06 -05:00
Areloch
7b52fed504 Merge pull request #1575 from Areloch/CMakeSDLOption
CMake SDL Option
2016-04-06 21:23:12 -05:00
Areloch
131090f1b7 Made the cmake SDL flag a regular, non-advanced option so that it's not hidden from the base setup on Windows. 2016-04-06 21:21:55 -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
2cc08c6664 Merge pull request #1570 from Areloch/SimPathTempRollback
Roll back the changes to simPath temporarily in order to merge in DX11
2016-03-29 00:09:13 -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
Areloch
b9b11047bf Merge pull request #1569 from Areloch/SimPathDX11Fix
Fix for SimPath to make DX11 compatible.
2016-03-28 22:48:24 -05:00
Areloch
b9d8df5a4a Includes a formatting fix for the SimPath change to make it compatible with DX11. 2016-03-28 22:47:22 -05:00
rextimmy
12621f876b Added GFXFormatR8G8B8A8_SRGB format. 2016-03-28 10:05:16 +10:00
Jeff Hutchinson
3bb4fda47a SDL epoxy stuff. 2016-03-25 21:11:42 -04:00
Jeff Hutchinson
7317848080 epoxy GLX extension interface 2016-03-25 21:03:01 -04:00
Azaezel
df3cb6cb44 case sensitivity typofix 2016-03-25 18:46:25 -05:00
Jeff Hutchinson
4cf6a30e05 cleanup 2016-03-25 13:44:22 -04:00
Jeff Hutchinson
6e692ea9cf torque windows integration of epoxy 2016-03-25 13:41:38 -04:00
Jeff Hutchinson
b89d2a116e cmake for epoxy and rip glew 2016-03-25 13:38:40 -04:00
Jeff Hutchinson
7b35ce3212 move gl_generated_dispatch.c 2016-03-25 13:38:14 -04:00
Areloch
1db77b728f Merge pull request #1566 from JeffProgrammer/vs2015dxfix
Looks good.
2016-03-25 09:05:54 -05:00
Jeff Hutchinson
6683fc0f24 remove glew 2016-03-25 02:19:48 -04:00
Jeff Hutchinson
1ceed22049 add epoxy for glew replacement 2016-03-25 02:16:38 -04:00
Jeff Hutchinson
e9efc05ebb fix release build compile with MSVC 2015 (finally) 2016-03-24 14:22:45 -04:00
Anis
25e8cf4711 Merge pull request #1554 from Azaezel/MagicalSkyBox
from @rextimmy automatically adds a sky feature to  skies. (render so…
2016-03-22 12:59:09 +01:00
Anis
935bddca35 Merge pull request #1556 from Azaezel/splineSpelunking
Path editor display augmentations.
2016-03-22 12:57:49 +01:00