simon
|
4acc2dc273
|
Merge viewer-release
|
2014-02-10 15:42:25 -08:00 |
|
Oz Linden
|
3c2b90514d
|
merge 3.6.10-release
|
2013-11-11 16:19:35 -05:00 |
|
simon
|
b95935ccf3
|
Merge downstream code from viewer-bear
|
2013-10-30 11:25:08 -07:00 |
|
Mnikolenko ProductEngine
|
dfa6822b34
|
MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader).
|
2013-10-30 14:26:11 +02:00 |
|
Dave Parks
|
ff8b002c3b
|
Quite down log spam from loading shaders.
Up bone cap to 64 for rigged meshes.
|
2013-10-10 13:56:06 -05:00 |
|
Dave Parks
|
0e116741a0
|
MAINT-2968 Fix for crash on AMD hardware running current drivers.
|
2013-10-10 18:00:11 -05:00 |
|
Graham Linden
|
badb8a945d
|
NORSPEC-259 revive fix stomped with materials->bear merge
|
2013-09-26 09:23:47 -07:00 |
|
Graham Linden
|
71e986b059
|
NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback
|
2013-09-23 14:49:10 -07:00 |
|
Graham Linden
|
95e34d86b9
|
The unbearable lightness of being norspec
|
2013-09-18 18:24:16 -07:00 |
|
Graham Linden
|
63757692b6
|
NORSPEC-362 Fix leak of deferred color attachments
|
2013-09-11 20:40:11 -07:00 |
|
Graham Linden
|
e8bd9afbe6
|
Merge viewer-release 3.6.5 Cocoa
|
2013-09-09 13:10:45 -07:00 |
|
simon
|
e7ac4695e3
|
Merge viewer-release
|
2013-09-09 12:59:17 -07:00 |
|
Graham Linden
|
8675ed0491
|
Fix merge regressions from missed changes to LoD updates
|
2013-08-19 16:04:28 -07:00 |
|
Oz Linden
|
70cacc4d17
|
merge changes for 3.6.3-release
|
2013-08-19 15:51:40 -04:00 |
|
Graham Linden
|
3f186aab77
|
Merge in viewer-release
|
2013-08-19 12:10:40 -07:00 |
|
Graham Linden
|
80256fdbf5
|
NORSPEC-349 make render targets use original formats when resizing impostors and fix alpha for deferred impostor shader
|
2013-08-15 10:07:41 -07:00 |
|
Graham Linden
|
dc63061714
|
NORSPEC-352 for non-ALM rendering, make lighting shader with alpha masking obey vertex alpha
|
2013-08-15 09:37:54 -07:00 |
|
Graham Linden
|
93b3f1297e
|
MAINT-3338 fix disable of particle glow on false suspicion of lying network data
|
2013-10-21 13:20:34 -07:00 |
|
Dave Parks
|
0ab4e11223
|
Fix for random bad colors in UI on Intel HD 4000
|
2013-10-08 14:43:10 -05:00 |
|
Dave Parks
|
e43058e764
|
MAINT-2968 Fix for crash on AMD hardware running current drivers.
|
2013-10-10 18:00:11 -05:00 |
|
Graham Linden
|
4709ca9697
|
NORSPEC-259 revive fix stomped with materials->bear merge
|
2013-09-26 09:23:47 -07:00 |
|
Graham Linden
|
42ce98e8bf
|
NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehow
|
2013-07-30 13:44:12 -07:00 |
|
Graham Madarasz (Graham Linden)
|
f86a7c04d3
|
NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues
|
2013-07-30 11:33:58 -07:00 |
|
Graham Madarasz (Graham Linden)
|
b44e7303d8
|
NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac
|
2013-07-29 18:59:45 -07:00 |
|
Graham Linden
|
f357269c38
|
NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place
|
2013-07-25 09:36:13 -07:00 |
|
Graham Linden
|
e290dd3fa1
|
NORSPEC-311 make post deferred (alpha objects) respect same gamma ramp as deferred (opaque objects)
|
2013-07-24 04:03:27 -07:00 |
|
Graham Linden
|
fa74313e7d
|
NORSPEC-314 WIP make work-around easier to flip and add 9800M as an evil mac
|
2013-07-23 04:52:59 -07:00 |
|
Graham Linden
|
1587999b03
|
Add info to vert buffer warnings to track down fullbright alpha mask crasher
|
2013-07-16 12:03:42 -07:00 |
|
Geenz
|
3a8ad62d9b
|
Merge with latest viewer-release.
|
2013-07-11 19:46:20 -04:00 |
|
Dave Parks
|
d6d2f74fbb
|
NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, slight cleanup.
|
2013-07-01 16:27:20 -05:00 |
|
Dave Parks
|
d262ca32d3
|
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
|
2013-07-01 10:59:46 -05:00 |
|
callum_linden
|
bd41392b7e
|
Merge with viewer-bear which was just merged with viewer-release
|
2013-06-28 13:36:41 -07:00 |
|
Dave Parks
|
7df863265f
|
NORSPEC-290 Shader optimization WIP -- remove a couple normalizes, pows, and divides from various lighting functions.
|
2013-06-28 13:32:01 -05:00 |
|
callum_linden
|
b6b4b59138
|
Merge with viewer-release
|
2013-06-27 18:03:47 -07:00 |
|
Dave Parks
|
380785e613
|
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
|
2013-06-27 16:16:56 -05:00 |
|
Graham Linden
|
c07f47dee8
|
NORSPEC-259 nerfed copyContentsToFramebuffer handling of non-FBO sources
|
2013-06-24 19:28:02 -07:00 |
|
Dave Parks
|
79029149a4
|
Automated merge with file:///F:%5Cviewer-bear
|
2013-06-21 12:51:29 -05:00 |
|
Dave Parks
|
9ea2d90a0d
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-06-20 12:10:26 -05:00 |
|
Graham Linden
|
e71b415841
|
Merge
|
2013-06-19 12:59:56 -07:00 |
|
Geenz
|
9c83d4b5b8
|
Merge with viewer-release.
|
2013-06-19 15:47:57 -04:00 |
|
Dave Parks
|
45b1466de6
|
Review cleanup
|
2013-06-18 19:51:02 -05:00 |
|
Dave Parks
|
ccd04cd66c
|
Occlusion culling overhaul.
|
2013-06-18 17:24:21 -05:00 |
|
Graham Linden
|
c603eb5ece
|
MAINT-318 prevent crashes from incomplete quads and lines and prevent drivers from crashing to desktop when passed short buffers
|
2013-06-17 08:03:32 -07:00 |
|
Dave Parks
|
c3f14b915c
|
NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric)
|
2013-06-03 12:50:48 -05:00 |
|
Dave Parks
|
743d1a777e
|
NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
Reviewed by Graham
|
2013-05-29 18:48:09 -05:00 |
|
Dave Parks
|
933d4c40f4
|
NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies.
|
2013-05-23 12:47:52 -05:00 |
|
simon
|
473474b949
|
Revert changes for MAINT-2616 due to licensing issues, need a full patch
submitted to be acceptable
|
2013-05-22 16:51:42 -07:00 |
|
simon
|
abdbf45aaa
|
MAINT-2616 : Updated my Intel driver and now have orange in buttons and
Inventory pull down bar causing blinks to screen. Pulled in FS code,
Reviewed by Kelly
|
2013-05-20 11:18:12 -07:00 |
|
simon
|
f111b5b113
|
Fix EOL characters
|
2013-05-14 09:24:58 -07:00 |
|
Geenz
|
3779e51bfc
|
Merged with https://bitbucket.org/lindenlab/viewer-beta
|
2013-05-13 22:22:51 -04:00 |