TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1108 commits 5 branches 33 tags 958 MiB
Commit graph

1108 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Buckmaster 33ff180593 Merge branch 'development' into style-cleanup 
Conflicts:
	Engine/source/console/astNodes.cpp
	Engine/source/console/codeBlock.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/collada/colladaAppMesh.cpp
	Engine/source/ts/tsShape.cpp
	Engine/source/ts/tsShapeConstruct.cpp
 2014-12-15 12:15:55 +11:00
Daniel Buckmaster e0436efc21 Merge pull request #910 from Winterleaf/StaticShapeAlphaLod 
Added distance fading to TSStatic objects.
 2014-12-07 18:15:13 +11:00
Daniel Buckmaster ca287f3308 Merge pull request #997 from Winterleaf/Fix-PostEffects 
This just adds some console spam if the PostEffect Texture isn't found. ...
 2014-12-07 17:10:31 +11:00
LuisAntonRebollo 4976e253e4 Merge pull request #1013 from BeamNG/fix_testimg_ppm 
Fix testimg ppm
 2014-12-06 18:52:11 +01:00
LuisAntonRebollo 4b487efa11 Fix testimg.ppm EOL 2014-12-06 01:21:10 +01:00
LuisAntonRebollo 06b138d6d1 Update gitattributes with some text files for avoid EOF problems with Git. 2014-12-06 01:18:41 +01:00
LuisAntonRebollo 3281dc1e06 Merge pull request #1004 from Lopuska/patch-1 
Fixed a crash and memory leak on the ribbon code
 2014-12-05 22:59:52 +01:00
LuisAntonRebollo c20f29c672 Merge pull request #1003 from Lopuska/ribbon_opengl 
Ribbon port for opengl
 2014-12-05 22:58:38 +01:00
Anis A. Hireche d16a236937 ribbon_opengl 2014-12-03 22:19:02 +01:00
Areloch 7097ce6466 Merge pull request #995 from Winterleaf/Fix-threadPool.cpp 
Looks good.
 2014-12-02 13:50:52 -06:00
Anis 830ab77628 Fixed a crash and memory leak on the ribbon code 
OpenGL needs to unlock buffers on inverse order to work.
 2014-12-02 13:39:57 +01:00
Vincent Gee 9bd6d2e614 This just adds some console spam if the PostEffect Texture isn't found. I had a problem back where it was that I mistyped the texture and it took hours to find it. This way you know right away. 2014-11-30 21:47:45 -05:00
Vincent Gee 48ba106667 Just cleaned up some code 2014-11-30 20:28:40 -05:00
LuisAntonRebollo 5e74a465a9 Merge pull request #988 from BeamNG/clean_opengl_fragment_out 
Clean GLSL fragment shader out.
 2014-12-01 01:28:05 +01:00
LuisAntonRebollo 7bf99e38ec Merge pull request #989 from BeamNG/fix_opengl_formating 
Fix OpenGL changes formating.
 2014-11-30 23:57:18 +01:00
LuisAntonRebollo 3500ff3bb3 Merge pull request #990 from BeamNG/fix_opengl_ci 
Fix CI server.
 2014-11-30 23:42:06 +01:00
LuisAntonRebollo a5d2455e2e Fix CI server. 2014-11-30 23:34:33 +01:00
LuisAntonRebollo 1d3f3fdfe4 Fix OpenGL changes formating. 2014-11-30 23:09:11 +01:00
LuisAntonRebollo ed0febea39 Clean GLSL fragment shader out. 2014-11-30 23:00:18 +01:00
LuisAntonRebollo 87f34e3c4f Merge pull request #986 from BeamNG/fix_color_mrt 
Fix GLSL out fragment shader color.
 2014-11-30 05:44:25 +01:00
LuisAntonRebollo 4409a12af6 Fix GLSL out fragment shader color. 2014-11-30 05:32:40 +01:00
LuisAntonRebollo 80482753e1 Merge pull request #985 from BeamNG/fix_member_decl 
Clean PlaneReflector member variables declaration.
 2014-11-30 05:28:33 +01:00
LuisAntonRebollo adc7c72caa clean PlaneReflector member variables declaration. 2014-11-30 05:16:56 +01:00
LuisAntonRebollo a0d5dc25cd Merge pull request #962 from BeamNG/fix_opengl_new_terrain_blend 
Fix OpenGL new terrain blend
 2014-11-30 05:12:06 +01:00
LuisAntonRebollo fb08fafc9c Fix terrFeatureGLSL.cpp for GCC. 2014-11-30 05:03:30 +01:00
LuisAntonRebollo 32e8725931 Merge pull request #983 from Azaezel/stray_mSamplerNames 
DeferredMinnaert feautre was missing samplernames
 2014-11-30 04:59:24 +01:00
LuisAntonRebollo c916e7de7c Merge pull request #984 from Azaezel/mBitsPerChannel_match_DX_OGL 
const U64 maxValPerChannel = (U64)1 << mBitsPerChannel;
 2014-11-30 04:58:33 +01:00
Azaezel bea3563c3d const U64 maxValPerChannel = (U64)1 << mBitsPerChannel; 2014-11-29 21:50:02 -06:00
LuisAntonRebollo ff83e8c209 Merge remote-tracking branch 'GG-Github/development' into fix_opengl_new_terrain_blend 2014-11-30 04:47:38 +01:00
Azaezel 2e112802e5 DeferredMinnaert feautre was missing samplernames 2014-11-29 21:44:05 -06:00
LuisAntonRebollo a6054fea85 Merge pull request #982 from BeamNG/fix_php_project_generator_opengl 
Fix PHP ProjectGenerator for OpenGL.
 2014-11-30 04:38:13 +01:00
LuisAntonRebollo 0a31af06f5 Fix PHP ProjectGenerator for OpenGL. 2014-11-30 04:37:10 +01:00
LuisAntonRebollo 8b25a5e90e Merge pull request #981 from BeamNG/fix_opengl_x64 
Fix x64 builds.
 2014-11-30 04:02:24 +01:00
LuisAntonRebollo a4bf61f07b Fix x64 builds. 2014-11-30 04:00:58 +01:00
LuisAntonRebollo 98e3651db5 Merge pull request #940 from BeamNG/add_opengl_support 
Add/Activate OpenGL render.
 2014-11-30 02:48:13 +01:00
LuisAntonRebollo 3067c3f0b2 Merge pull request #924 from BeamNG/remove_disableshader 
Remove GFXDevice::disableShader
 2014-11-30 02:47:46 +01:00
LuisAntonRebollo 0747a0efe9 Remove GFXDevice::disableShader becouse we are going to remove Fixed Function Pipeline and we need a shader for render. 2014-11-30 02:36:21 +01:00
LuisAntonRebollo 7184e36928 Merge pull request #961 from BeamNG/fix_opengl_fullscreen 
Fix OpenGL fullscreen on win32
 2014-11-30 02:24:19 +01:00
LuisAntonRebollo f1aff86510 Merge pull request #965 from eightyeight/opengl-project-manager 
Added OpenGL module with some additions to the project generator
 2014-11-30 02:24:04 +01:00
LuisAntonRebollo 04d069daa0 Merge pull request #939 from BeamNG/templates_opengl 
Templates changes for OpenGL shaders.
 2014-11-30 02:23:37 +01:00
LuisAntonRebollo 50fab23cb0 Merge pull request #938 from BeamNG/remove_old_opengl 
Remove old/unused OpenGL files.
 2014-11-30 02:23:29 +01:00
LuisAntonRebollo ad5ecee46d Merge pull request #937 from BeamNG/increase_frame_buffer_size 
Increase FrameBuffer size for use on OpenGL.
 2014-11-30 02:23:23 +01:00
LuisAntonRebollo 29e2a481bb Merge pull request #936 from BeamNG/glew 
GLEW library for OpenGL.
 2014-11-30 02:23:16 +01:00
LuisAntonRebollo 70a63dd9d2 Merge pull request #935 from BeamNG/fix_imposter_capture 
Fix imposter capture on OpenGL.
 2014-11-30 02:23:07 +01:00
LuisAntonRebollo a4c8e1d881 Merge pull request #934 from BeamNG/postfx_opengl 
Changes on PostFX for OpenGL.
 2014-11-30 02:23:02 +01:00
LuisAntonRebollo 82315a9960 Merge pull request #933 from BeamNG/shadergen_glsl 
Changes on ShaderGen for generate GLSL shaders.
 2014-11-30 02:22:58 +01:00
LuisAntonRebollo b731f3cbe5 Merge pull request #932 from BeamNG/reduce_RT_changes 
Reduce innecesary changes on Render Target textures.
 2014-11-30 02:22:52 +01:00
LuisAntonRebollo 9c66aa0681 Merge pull request #931 from BeamNG/terrain_layer_format 
Set correct terrain layer texture format.
 2014-11-30 02:22:39 +01:00
LuisAntonRebollo b632d06c97 Merge pull request #930 from BeamNG/separate_opengl_from_os 
Separate OpenGL code from Linux or Mac.
 2014-11-30 02:22:28 +01:00
LuisAntonRebollo 2f8d18c0c0 Merge pull request #929 from BeamNG/remove_old_opengl_code 
Remove unnecesary code for handle OpenGL.
 2014-11-30 02:22:24 +01:00