7f2ad72fe6
merge changes for DRTVWR-326 3.6.1-beta1
2013-06-24 14:41:16 -04:00
4841eaddb9
MATBUG-194 WIP investigate if light func sampling precision is causing whirly's wierdness
2013-06-24 10:18:37 -07:00
559173f711
NORSPEC-280 include fix to downsampleDepthRect shader making GL 3.3. drivers cry
2013-06-24 06:44:14 -07:00
8817ecc1e3
NORSPEC-280 Fix for shader compilation error on OpenGL 3.3
2013-06-21 15:57:59 -05:00
3a8cdb5d46
NORSPEC-277 WIP backout old-school normal permutation
2013-06-20 15:27:22 -07:00
65f0972a64
NORSPEC-262 make drag and drop aware of editing context so that editing normal/spec textures causes application to the correct tex channel
2013-06-20 12:41:46 -07:00
42a4659555
NORSPEC-278 fix misuse of legacy bumps when rendering objects with TE bumpmap setting of 18 aka BUMPY_TEXTURE
2013-06-20 09:34:30 -07:00
5a661a4d82
merge changes for DRTVWR-326
2013-06-19 19:23:26 -04:00
504b834000
Merge
2013-06-19 15:13:19 -07:00
a29a18eb97
NORSPEC-272 make sure the tex filtering fix stays put
2013-06-19 13:04:26 -07:00
e71b415841
Merge
2013-06-19 12:59:56 -07:00
d79a4f5ccf
Automated merge with http://hg.secondlife.com/viewer-release
2013-06-19 12:36:40 -04:00
6c061ae4fd
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-19 11:31:44 -05:00
b495946625
Point light color (de)correction.
2013-06-19 11:30:32 -05:00
edbacfa108
Merge vwr-dev-mat release tags and version change
2013-06-19 07:02:17 -07:00
2655c7a17a
merge increment of version number
2013-06-19 09:00:45 -04:00
dd574045c4
correct 3.6.0-release for last minute fix
2013-06-19 09:00:00 -04:00
519d95cee2
commit inital tag for 3.6.0-release
2013-06-19 08:59:10 -04:00
45b1466de6
Review cleanup
2013-06-18 19:51:02 -05:00
ccd04cd66c
Occlusion culling overhaul.
2013-06-18 17:24:21 -05:00
0094cfabf0
Merge vwr-dev-mat
2013-06-18 10:54:16 -07:00
1eb20a8522
correct banding issue
2013-06-18 13:21:27 -04:00
cb5289e02a
remove files incorrectly brought back from the past by merges
2013-06-18 12:31:54 -04:00
0dbe156e23
NORSPEC-246 make 32F light LUT apply to all OS X machines as several non-nV cards were also failing
2013-06-18 09:10:13 -07:00
c1b7c8cacb
NORSPEC-246 Force light func to use GL_R32F format for more precision on older nV mobile cards with single FP hardware
2013-06-17 12:56:08 -07:00
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
d75667560c
Silence spurious asserts when pool is cleared at exactly it's limit
2013-06-15 07:19:23 -07:00
f782e01920
NORSPEC-267 fix UI feedback for materials edits not appearing for observers when obj was selected by them
2013-06-15 05:18:50 -07:00
1e41b017e1
increment viewer version to 3.6.1
2013-06-14 18:49:52 -04:00
9b17747706
Added tag 3.6.0-release for changeset 69429d81ae4d
2013-06-14 18:49:18 -04:00
0a61606b79
NORSPEC-251 fix issues with binding unloaded standard bumpmaps
2013-06-14 14:39:18 -07:00
f04e9363b9
NORSPEC-266 fix issues with observer feedback on edits of material map parameters
2013-06-14 09:41:33 -07:00
fec6ab591e
Disable asserts in CalculateTangentArray (discussed with davep) to avoid debugging interruptions from bad assets
2013-06-14 09:32:23 -07:00
8d67ad3d86
NORSPEC-261 No more magic numbers, parity between forward and deferred rendering WRT to windlight and legacy shininess.
...
Reviewed by Graham (a little bit).
2013-06-13 18:13:30 -05:00
8d35d9ee2f
NORSPEC-250 speculative stab in the dark
2013-06-13 15:58:20 -07:00
9261d069ef
MAINT-2787: Expand viewer_manifest.py's "Release" recognition
...
viewer_manifest.py currently detects specifically the channel name "Second
Life Release" as a release viewer (affecting the icon and other things). The
Amazon viewer uses channel name "Second Life Release - Amazon", which is
currently not recognized at all, therefore uses a developer-build icon with
the caution tape and the word "TEST" stamped onto it. Detect any channel name
*starting* with "Second Life Release" as a release viewer.
2013-06-13 15:40:59 -04:00
7b28a9a541
Remove some now useless assertions.
2013-06-13 14:38:51 -05:00
dc6ec6ee15
NORSPEC-261 Put back directional ambient.
2013-06-13 14:37:51 -05:00
c7479098f5
NORSPEC-261 Better blending of environment map.
2013-06-13 14:33:59 -05:00
e88910e9de
NORSPEC-261 Fix for bad legacy shiny values.
2013-06-13 14:16:41 -05:00
8c41ff72ac
Fix ternary use found illegit in the eyes of GCC
2013-06-13 10:52:30 -07:00
6583bfe262
Merge vwr-dev-mat
2013-06-13 08:59:42 -07:00
1f2125cc12
correct DOS line endings
2013-06-13 11:45:54 -04:00
98d2a434db
NORSPEC-263 replaced dropped deg to rad conversion between UI and material update
2013-06-13 08:23:40 -07:00
ac018153cb
MAINT-2632 speculative guards in display_startup based on prevalence of crashes ending there (no repro, unfortunately)
2013-06-13 07:57:22 -07:00
8ad2c0b8fb
NORSPEC-260 fix issues with OK after pressing none being intepreted as add a null normal map
2013-06-12 15:01:23 -07:00
b60ea52902
NORSPEC-251 fixed and 258 not regressed
2013-06-12 14:08:16 -07:00
3eb460f772
Remove NaN guards from vopartgroup and volume code
2013-06-12 12:25:30 -07:00
88553c9eb1
Cleanup rollback and try point MIPs experiment to see if that's what is hosing the Mac on 10.6.8
2013-06-12 12:19:48 -07:00
b070bb1c22
Merge
2013-06-12 10:28:14 -07:00
Oz Linden