Dave Parks
c32cc3ecfc
merge
2011-11-17 11:54:39 -06:00
Dave Parks
e4b3198504
merge
2011-11-17 11:54:06 -06:00
Dave Parks
c902ff338b
SH-2670 Fix for terrain being wrong detail.
2011-11-17 11:53:48 -06:00
Dave Parks
33ea66feed
merge
2011-11-16 22:04:51 -06:00
Leslie Linden
9d1228b538
Merge with latest
2011-11-16 17:14:41 -08:00
Leslie Linden
c79c4f1477
SH-1618 FIX
...
SH-1619 FIX
SH-1620 FIX
SH-2621 FIX
* Got lighting, shadows, and ambient occlusion working on ATI macs.
* Re-enabled ambient occlusion on ATI macs.
* Re-enabled depth of field on ATI macs.
Reviewed by Runitai Linden.
2011-11-16 17:14:28 -08:00
Dave Parks
e822ecc803
SH-2675 Fix for shadow appearing on terrain at midday when terrain is totally flat and there are no prims visible
2011-11-16 18:56:25 -06:00
Dave Parks
7dba0b9a46
merge
2011-11-16 17:39:24 -06:00
Dave Parks
b2824aa21d
SH-2690 Add comments per Vir's review feedback
2011-11-16 15:25:09 -06:00
Dave Parks
986dccbeaf
SH-2690 Fix for spammy triangle death on GeForce 7800 Go when selecting flexi attachments.
2011-11-16 15:08:17 -06:00
Dave Parks
38853ffdda
merge
2011-11-16 12:41:15 -06:00
Dave Parks
dbef1616dc
SH-2240 Make alpha mask cutoff even less aggressive (fix for eyes on Curious Ringtail avatar)
2011-11-16 12:40:51 -06:00
Leslie Linden
6343c769ce
SH-1865 FIX -- removed some old non-deferred rendering code that was preventing anti-aliasing from working when GL_ARB_texture_multisample is unsupported
2011-11-16 10:00:41 -08:00
Leslie Linden
d71736f3d9
SH-1865 PROGRESS -- Disable the anti-aliasing control on hardware our code doesn't support for anti-aliasing
2011-11-15 17:32:09 -08:00
Leslie Linden
ad9e08b8a1
SH-2563 FIX -- Added diffuse map to the avatar rigid pass to properly set up the eyeball texture for Mac OS Lion
2011-11-15 15:52:29 -08:00
Dave Parks
ce0c00331d
merge
2011-11-15 17:05:20 -06:00
Dave Parks
cfb666e9d9
merge
2011-11-15 17:04:37 -06:00
Dave Parks
b493b8cca4
SH-2652 Fix for linux compile error
2011-11-15 13:56:00 -06:00
Dave Parks
bbac7e9aec
SH-2681 Fix for shader compiler error on GLSL 1.30 and later
2011-11-15 13:01:23 -06:00
Dave Parks
ab7a85602f
merge
2011-11-15 12:24:47 -06:00
Dave Parks
961ce1c4e7
SH-2591 WIP -- fix for UI disappearing, introduces some artifacts in rotation ring, committing to debug elsewhere
2011-11-15 12:24:31 -06:00
Dave Parks
73d70b5d45
SH-2240 Make alpha mask cutoff a little less aggressive (err on the side of not creating an alpha mask)
2011-11-15 12:19:05 -06:00
Dave Parks
ae17efe702
merge
2011-11-14 12:33:30 -06:00
Dave Parks
98e067cad4
SH-2650 Fix for avatar eyeballs protruding from lower eyelids
2011-11-14 12:33:00 -06:00
Leslie Linden
e7daefeb4d
SH-2620 -- Enabled FXAA on OSX, which fixes the issue with latest code and some assorted shader cleanup from changeset e156c46db1b2
2011-11-11 16:36:00 -08:00
Leslie Linden
3b2c8a1da0
Merge with latest
2011-11-11 16:27:27 -08:00
Leslie Linden
84ab08d2a5
Assorted shader cleanup to remove a few warnings and errors for OS X.
2011-11-11 16:27:08 -08:00
Dave Parks
fabbae5e6e
SH-2666 Fix for pixel doubling failsafe on out out of memory.
2011-11-11 16:20:55 -06:00
Dave Parks
547818249c
merge
2011-11-11 12:45:45 -06:00
Dave Parks
e2e154d94e
SH-2659 Fix for basic shaders having no affect when gl version < 2.0
2011-11-10 16:33:34 -06:00
Dave Parks
d30ffba39e
merge
2011-11-10 16:21:44 -06:00
Dave Parks
df546bfba9
SH-2666 Tweak depth of field optimizations based on resident feedback.
2011-11-10 16:12:50 -06:00
Dave Parks
76bd8cee11
SH-2644 Fix debug display that shows selection triangle count and streaming cost
2011-11-10 14:48:48 -06:00
Dave Parks
41d3bade4e
merge
2011-11-10 11:40:00 -06:00
Dave Parks
c8f558f677
SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter.
2011-11-10 11:39:08 -06:00
Dave Parks
84878c156d
merge
2011-11-10 10:05:42 -06:00
Dave Parks
aa8f3d3070
SH-2644 WIP -- remove debug displays pertaining to upload/download queues
2011-11-10 10:04:44 -06:00
Dave Parks
ecadf5131a
SH-2240 Fix for red moon.
2011-11-10 10:03:44 -06:00
Dave Parks
ec2dfa9681
SH-24114 Remove unused variables
2011-11-09 12:18:17 -06:00
Dave Parks
db7924681d
SH-24114 Remove unused vectorization code (outdated/unused with SSE2 requirement and llvetor4a et al)
2011-11-08 17:46:43 -06:00
Dave Parks
2ee9e35530
merge
2011-11-08 15:29:06 -06:00
Dave Parks
0d568ce9f0
merge
2011-11-08 15:28:13 -06:00
Dave Parks
ef8bdb5d95
SH-2507 Fix for crash when rendering axes (develop->render->show axes)
2011-11-08 15:15:58 -06:00
Dave Parks
da092a06cf
SH-2608 Fix for debug beacons not rendering properly.
2011-11-08 14:37:50 -06:00
Dave Parks
428b74f14b
SH-2652 Fix for black bands in high-res normal maps (break normal map generation up into tiles to handle the case where a normal map is higher resolution than the current window)
2011-11-08 13:11:29 -06:00
Oz Linden
28c26cb491
merge changes for vmrg-177
2011-11-08 10:26:12 -05:00
Oz Linden
9b9829a97e
merge changes for vmrg-178
2011-11-08 10:25:27 -05:00
Dave Parks
1bd09e2e42
SH-2634 Fix for land overlay not showing colors
2011-11-07 16:46:58 -06:00
Dave Parks
92909dae80
SH-2652 For for screen going white when enabling anti-aliasing.
2011-11-07 15:39:32 -06:00
Dave Parks
8c8edbbaeb
SH-2546 Fix for black water under terrain (use vec3 instead of float for vary_AtmosAttenuation
2011-11-07 13:04:30 -06:00