Commit graph

4926 commits

Author SHA1 Message Date
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
30f0a9c5f9 replaces GL_PIXEL_UNPACK_BUFFER_ARB with GL_PIXEL_UNPACK_BUFFER 2016-05-06 22:05:32 -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
6caafc9844 Merge pull request #1594 from Areloch/NFD_NON_SDL_Fix
Fixes the cmake blacklist filter it not using SDL
2016-05-05 23:10:09 -05:00
Areloch
a63a636d03 Fixes the blacklist filter in the event we aren't using SDL to avoid including an unwanted file dialog codefile. 2016-05-05 22:59:17 -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
Jeff Hutchinson
e69f9b924b Merge pull request #6 from rextimmy/epoxy_sdl_fix
GL fix for Epoxy and creating a 3.2 core context with win32 api.
2016-05-05 10:37:13 -04: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
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
Areloch
255fec1a9d Make exec() and getDSOPath() proper Con namespace functions.
Moves the console function exec()'s body into an actual function in the Con namespace as the function executeFile() to align with the other execute and eval functions.
Also moved the getDSOPath function(as exec/executeFile requires it) from being local in consoleFunctions.cpp to a Con namespace function as well, furthering the consistency.
2016-04-19 01:35:52 -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