Azaezel
98048fd974
Merge branch 'GlowingParticles' of https://github.com/lukaspj/Torque3D into glowParticles
...
Conflicts:
Engine/source/renderInstance/renderParticleMgr.cpp
2014-12-16 18:48:28 -06:00
Anis
ca04726ad6
glGenerateMipmap on uncompressed cubemap
2014-12-16 15:14:30 +01:00
LuisAntonRebollo
cf195152d6
Workaround for OpenGL terrain blend on Intel drivers.
2014-12-16 00:30:50 +01:00
Anis
0cf36a8906
mipmap support on DDS for openGL cubemap
2014-12-15 18:59:42 +01:00
LuisAntonRebollo
5d5303cf6d
Merge pull request #1055 from BeamNG/fix_cubemap
...
Fix ShaderGen cubemap feature.
2014-12-15 18:49:53 +01:00
LuisAntonRebollo
15c8922028
Fix ShaderGen cubemap feature.
2014-12-15 18:28:17 +01:00
LuisAntonRebollo
ef2a843dcd
Merge pull request #1029 from Lopuska/patch-3
...
Intel graphics bugfix
2014-12-14 23:45:47 +01:00
LuisAntonRebollo
fe9c30b5bb
Lowercase TSStatic fied names.
2014-12-12 22:41:08 +01:00
LuisAntonRebollo
4e936c2101
Merge pull request #1040 from BeamNG/fix_spaces_in_field
...
Fix spaces in TSStatic fied names.
2014-12-12 22:37:05 +01:00
LuisAntonRebollo
8f4c0ed95d
Fix spaces in TSStatic fied names.
2014-12-12 22:36:08 +01:00
Bruno Gonzalez
046f4e4e2d
Fix off-by-one error in cursor hiding/showing function
...
Incorrect API use according to msdn.
Source: http://msdn.microsoft.com/en-us/library/windows/desktop/ms648396%28v=vs.85%29.aspx
"cursor is displayed only if the display count is greater than or equal to 0"
2014-12-12 16:53:07 +01:00
Daniel Buckmaster
4210c002bb
Merge pull request #991 from Winterleaf/BitAlign-ServerQuery.cpp
...
Bit Alignment of variables in serverQuery.cpp
2014-12-12 21:47:40 +11:00
LuisAntonRebollo
0718875ac3
OpenGL Intel - Fix a error on DOF_DownSample_P.glsl.
2014-12-11 22:58:02 +01:00
LuisAntonRebollo
d000a1e7c5
OpenGL Intel - Workaround for warning spam or even crash with actual framebuffer code, remove when implemented TGL layer.
2014-12-11 01:20:39 +01:00
Anis
de82fbe0f9
Intel graphics bugfix
...
Explicit calls to hide and show menu bar on editing.
That fix the bug on Intel video card in OpenGL mode.
2014-12-10 15:30:36 +01:00
James Urquhart
bfca94da5c
Initialize mResetLocked too
2014-12-10 11:37:50 +00:00
Daniel Buckmaster
7004ec627e
Use find instead of [] and call StringTable->insert less.
2014-12-10 14:04:26 +11:00
James Urquhart
82fd1794e6
Fix issue where console stack values were getting overwritten inside a C++ function
2014-12-10 00:42:06 +00:00
LuisAntonRebollo
d87994ec37
Merge pull request #1011 from BeamNG/fix_opengl_circular_buffer
...
Fix GLCircularVolatileBuffer incorrect binding.
2014-12-10 00:09:00 +01:00
LuisAntonRebollo
5e4a0fbaa1
Merge pull request #1005 from BeamNG/revert_terrain_opengl
...
Revert terrain opengl
2014-12-10 00:08:35 +01:00
LuisAntonRebollo
d97bccb798
Fix AMD render problem with missed meshes.
2014-12-09 17:34:16 -05:00
Daniel Buckmaster
116276a105
Tweaks so I'm happy with it.
...
* Change #define usage
* Fix tabs
2014-12-08 10:20:38 +11:00
Daniel Buckmaster
a928d142f7
Made some tweaks so I'm happy with it.
...
* Removed #defines
* Fall back to using visible distance if ghost distance is not used
* Removed ghost distance from level files as it will default
* Renamed mConnectionVisibleDistance for consistency
2014-12-07 19:14:06 +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
LuisAntonRebollo
d49018df63
Fix GLCircularVolatileBuffer incorrect binding.
2014-12-05 22:56:22 +01:00
Anis A. Hireche
d16a236937
ribbon_opengl
2014-12-03 22:19:02 +01:00
LuisAntonRebollo
f3e737e001
3 textures blending fix for OpenGL.
2014-12-03 21:59:53 +01:00
LuisAntonRebollo
7962eef7dd
Revert - Merge pull request #962 Fix OpenGL new terrain blend
...
from BeamNG/fix_opengl_new_terrain_blend (reverted from commit a0d5dc25cd )
2014-12-03 21:54:57 +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
8e0ae15f74
Tabs...
2014-11-30 21:49:41 -05: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
rextimmy
880642060e
Fixed issue where physx3 cpu dispatcher was created multiple times
2014-12-01 12:39:46 +10:00
Vincent Gee
5dfc293191
type fix
2014-11-30 21:11:32 -05:00
Vincent Gee
ff7f48be6f
Added support for AMD Chips
2014-11-30 20:43:04 -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
Vincent Gee
16765aceca
Bit Alignment of variables in serverQuery.cpp
2014-11-30 19:06:27 -05: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