livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,351 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

27351 Commits (70d50028aecbce90a48b77ea3f1ff2bdae266742)

Author SHA1 Message Date
Dave Parks 70d50028ae Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-18 01:33:54 -05:00
Dave Parks fc965b3c89 NORSPEC-135 Fix for environment map not showing up if glossiness is zero. 2013-04-18 00:15:18 -05:00
Dave Parks 35ede26097 NORSPEC-128 Edit glossiness and environment as U8's from [0,255], as they are stored 2013-04-17 16:46:32 -05:00
Graham Madarasz c7b9b9e02c NORSPEC-133 More NULL shader pointer crash suppression 2013-04-17 09:19:08 -07:00
Graham Madarasz e40bcc4e16 NORSPEC-59 and NORSPEC-133 work-around crash with RenderDebugGL on and fix breakage in shaders from Mac changes 2013-04-17 09:05:40 -07:00
Graham Madarasz 119c0a35f1 NORSPEC-59 fix? for mac crasher 2013-04-16 18:07:25 -07:00
Graham Madarasz 70dbb7a59c NORSPEC-127 work-around crasher by forcing simple faces into simple pass 2013-04-16 17:24:51 -07:00
Graham Madarasz (Graham Linden) d8d889802b Merge viewer-dev-materials 2013-04-16 13:43:10 -07:00
Graham Madarasz a9f3e6d95c See if we can run with no ifdefs in alpha shaders on all platforms 2013-04-16 12:50:45 -07:00
Oz Linden 4b2d6062ba merge rollback from graham 2013-04-16 14:52:18 -04:00
graham linden a054dff522 Merged lindenlab/viewer-development-materials into default 2013-04-16 08:28:38 -07:00
Graham Madarasz 0b4d76ce78 NORSPEC-123 et al...roll back NSPEC 91 fix to avoid knock-on and set correct default env intensity 2013-04-16 08:27:30 -07:00
Graham Madarasz c4413f493e NORSPEC-123 et al...roll back NSPEC 91 fix to avoid knock-on and set correct default env intensity 2013-04-16 08:27:30 -07:00
Oz Linden b7d4ba1f08 merge changes for alpha fixes from geenz 2013-04-16 09:00:39 -04:00
Dave Parks d1f713f30b Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-16 03:02:00 -05:00
Geenz c72c3691ec Merged Graham's stuff amongst others. 2013-04-15 19:40:12 -04:00
Dave Parks f964e51fc9 Fix for mac build 2013-04-15 15:31:57 -05:00
Dave Parks 7ed3d61ded Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-15 14:13:15 -05:00
Dave Parks 359b6cad5b NORSPEC-117 Fix distance attenuation to not use pow(lit, 0.7) function so distance falloff is still soft 2013-04-15 14:12:16 -05:00
Dave Parks 8025b8b2bc NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available 2013-04-15 13:16:14 -05:00
Geenz 39544a3b06 Hooked up normal and specular texture coordinates. 2013-04-15 02:29:03 -04:00
Geenz 6257a8394c Normal mapped alpha support. Specular and environment map support needs a bit of extra work (in progress). 2013-04-15 01:35:21 -04:00
g fafa21315f Fix issue with alphaNonIndexedNoColorF shader and static init fail on default spec color (real source of NORSPEC-94, I think) 2013-04-12 15:21:35 -07:00
g f4becc0e1b NORSPEC-91 default to alpha blend when a material is present and a diff tex with alpha is applied 2013-04-12 13:42:52 -07:00
Graham Madarasz 7bf67f7866 NORSPEC-111 probable fix for IntelHD advanced lighting crasher 2013-04-12 08:14:46 -07:00
graham linden 85e16a373f Merged lindenlab/viewer-development-materials into default 2013-04-11 20:21:56 -07:00
Graham Madarasz (Graham Linden) 7d623abfc3 NORSPEC-98 redux...hopefully fix mac AND linux at the same time 2013-04-11 20:16:11 -07:00
Oz Linden d8f2ecd5b3 merge NORSPEC-94 2013-04-11 20:53:45 -04:00
Dave Parks 66b4900e70 Pass binormal masks in on particles and in lldrawpoolalpha 2013-04-11 15:17:55 -05:00
Graham Madarasz (Graham Linden) 19430bfce0 NORSPEC-98 fix? for mac shader compiler crasher 2013-04-11 11:57:50 -07:00
Geenz cfc3757778 First pass on alpha blended materials 2013-04-11 14:57:11 -04:00
Graham Madarasz (Graham Linden) 35400fb415 NORSPEC-96 less insane repeats per meter behavior in planar mode for norm/spec maps 2013-04-11 10:24:27 -07:00
Tonya Souther 81781bf0d8 NORSPEC-94: Set default specular color to white. 2013-04-11 10:21:33 -05:00
graham linden 4d7f2df106 Merged lindenlab/viewer-development-materials into default 2013-04-11 07:02:58 -07:00
Oz Linden a280ff382c merge per pixel improvement from geenz 2013-04-10 17:40:38 -04:00
Graham Madarasz (Graham Linden) 250175a0fa NORSPEC-56 slight tweak to log formatting to correct material count 2013-04-10 13:12:15 -07:00
Graham Madarasz (Graham Linden) afb846756f Remove temp patch file 2013-04-10 10:42:17 -07:00
graham linden 5c507f9648 Merged lindenlab/viewer-development-materials into default 2013-04-10 10:37:48 -07:00
Graham Madarasz 9e9e0f3ea6 NORSPEC-98 side-step nV compiler fail-o-rama 2013-04-10 10:31:51 -07:00
Graham Madarasz (Graham Linden) 72f6017dc2 Merge 2013-04-10 10:23:54 -07:00
Graham Madarasz (Graham Linden) 6a417acd63 NORSPEC-92 More UI fixes 2013-04-10 10:23:03 -07:00
Dave Parks 41097e74ec NORSPEC-75 Fix bug introduced by previous change where objects with an emissive mask appear fullbright. 2013-04-10 01:24:26 -05:00
Dave Parks f86fd87437 Fix for mac build? 2013-04-10 01:12:18 -05:00
Dave Parks aaad46c18b Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-10 00:28:03 -05:00
Dave Parks 78d23e6642 NORSPEC-75 Add appropriate draw calls to underwater render passes so objects with material data don't disappear in water. 2013-04-10 00:27:32 -05:00
Oz Linden 8f84d75ae4 merge fixes from graham 2013-04-09 17:09:52 -04:00
Geenz 84475635b9 More per-pixel lighting fanciness. 2013-04-09 16:35:10 -04:00
Oz Linden 0229b65a4d merge changes for fix from geenz 2013-04-09 16:01:07 -04:00
Oz Linden 8fe17529c6 fix? race condition that occasionally fails in unit test 2013-04-09 15:57:23 -04:00
Geenz 356d738250 Merged with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-09 15:41:37 -04:00