Daniel Buckmaster
3ab048c5b0
Fixes after feedback from Luis.
...
* Made use of dStrIsEmpty in more locations (and fixed it :P)
* Removed commented-out code
* Corrected default params
* Fixed some console warning formats
* Removed tabs
* Corrected setExtent API
2014-12-23 18:48:02 +11:00
Daniel Buckmaster
04ff04a95f
Removed some unneccessary changes and made file name consistent.
2014-12-21 21:25:27 +11:00
Daniel Buckmaster
03f71a78c0
Added dStrIsEmpty and replaced some incorrect string comparisons.
2014-12-21 21:25:19 +11:00
Daniel Buckmaster
9396ae7176
Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod
...
Conflicts:
Engine/source/T3D/missionMarker.cpp
2014-12-21 21:23: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
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
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
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
4409a12af6
Fix GLSL out fragment shader color.
2014-11-30 05:32:40 +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
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
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
50fab23cb0
Merge pull request #938 from BeamNG/remove_old_opengl
...
Remove old/unused OpenGL files.
2014-11-30 02:23:29 +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
LuisAntonRebollo
98926b1ae1
Merge pull request #928 from BeamNG/renderparticlemanager_sampler_names
...
Change RenderParticleMgr for use sampler names
2014-11-30 02:22:19 +01:00
LuisAntonRebollo
07b0ea9ca6
Merge pull request #927 from BeamNG/setupgenericshader
...
Add GFXDevice::setupGenericShader for fix render on non FFP.
2014-11-30 02:22:13 +01:00
LuisAntonRebollo
60f4d4f282
Merge pull request #926 from BeamNG/primbuild_for_non_ffp
...
Fix PrimBuild with non Fixed Function Pipeline.
2014-11-30 02:21:36 +01:00
LuisAntonRebollo
03ffa1ddd3
Merge pull request #925 from BeamNG/shaderdata_samplernames
...
Add sampler names to ShaderData
2014-11-30 02:21:30 +01:00
LuisAntonRebollo
3e7c7b3e49
Merge pull request #622 from BeamNG/texel_pixel_offset
...
Handle texel-pixel offset with diferents graphics APIs.
2014-11-30 02:20:45 +01:00
LuisAntonRebollo
8af6a16e3a
Merge pull request #618 from BeamNG/clouds_shader_sampler_reg
...
Use shader data for get sampler register in CloudLayer and BasicClouds.
2014-11-30 02:20:31 +01:00
LuisAntonRebollo
1c95ce21d6
Merge pull request #608 from BeamNG/use_gfxdevice_setupgenericshaders
...
Use GFXDevice::setupGenericShaders for support non Fixed Fuction Pipelines.
2014-11-30 02:20:00 +01:00
LuisAntonRebollo
fab2bb46c5
Changes for get necesary sampler names for OpenGL shaders.
2014-11-30 02:18:28 +01:00
Daniel Buckmaster
a0e1fca057
Merge pull request #685 from rextimmy/physx3_basic
...
Physx3 Physics Plugin
2014-11-29 20:05:08 +11:00
Daniel Buckmaster
e47b95ee5d
Merge pull request #971 from Azaezel/revert-794-euler_to_quat_revert
...
turret tracking correction, again
2014-11-29 14:00:04 +11:00
Anis A. Hireche
a954daa43f
terrain_blending_opengl_port_from_lukas_code
2014-11-27 20:56:23 +01:00
Anis
2582670925
Update shaderFeatureGLSL.cpp
...
fix compile shader
2014-11-27 20:31:58 +01:00
Anis
72c06401c0
black screen bug fix
2014-11-27 20:26:50 +01:00
Anis
7a8719dfbc
Update win32Window.cpp
2014-11-27 20:26:49 +01:00
Anis
3495bd56ca
Update win32Window.cpp
2014-11-27 20:26:48 +01:00