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

27313 Commits (d8f2ecd5b3f0cb8475fa1d092cc7a315ca1e8ca9)

Author SHA1 Message Date
Oz Linden d8f2ecd5b3 merge NORSPEC-94 2013-04-11 20:53:45 -04:00
Tonya Souther 81781bf0d8 NORSPEC-94: Set default specular color to white. 2013-04-11 10:21:33 -05:00
Oz Linden a280ff382c merge per pixel improvement from geenz 2013-04-10 17:40:38 -04: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
Graham Madarasz 991a3cf40e Merge 2013-04-09 12:39:01 -07:00
Graham Madarasz 893bcf34f7 NORSPEC-59 work around nV driver crash when doing deferred rendering on NV 9400M/9600M 2013-04-09 12:37:57 -07:00
graham linden 76f36001e2 Merged lindenlab/viewer-development-materials into default 2013-04-09 12:18:05 -07:00
Geenz e4faf91bb2 Start using R16F again, and divide the bloom contrib by 6. 2013-04-09 14:45:27 -04:00
Graham Madarasz (Graham) 2a220ca9eb NORSPEC-84 fix alpha mode UI appearing when coming back from media mode 2013-04-09 09:39:57 -07:00
Graham Madarasz (Graham) 74712b47df NORSPEC-84 fix alpha mode UI appearing when coming back from media mode 2013-04-09 09:39:57 -07:00
Graham Madarasz (Graham) f7b7f4a5fb NORSPEC-87 NORSPEC-88 fix interaction between norm/spec scale (aka repeats) and repeats per meter control 2013-04-09 09:24:58 -07:00
Graham Madarasz (Graham) af44715f90 NORSPEC-87 NORSPEC-88 fix interaction between norm/spec scale (aka repeats) and repeats per meter control 2013-04-09 09:24:58 -07:00
Geenz 27fbf5efc9 Re-added RGB10_A2 normal buffer, this time encoded with a sphere map transform so we can store the environment intensity in the blue channel. 2013-04-09 11:46:52 -04:00
Geenz c2df68743d First pass of per-pixel lit alpha blended objects. 2013-04-08 23:02:57 -04:00
Geenz 3f01526e71 Fix for specular exponents not being applied appropriately from the normal map alpha. 2013-04-08 21:09:29 -04:00
Graham Madarasz (Graham) ffc4981bb9 NORSPEC-83 repts per meter active with bumpy none 2013-04-08 16:48:24 -07:00
Graham Madarasz (Graham) b2ebfbf665 NORSPEC-83 repts per meter active with bumpy none 2013-04-08 16:48:24 -07:00
Graham Madarasz (Graham) 7fa137ab1d NORSPEC-86 Shiny type resets when editing spec glossiness 2013-04-08 15:42:45 -07:00
Graham Madarasz (Graham) 1a4c8775f8 NORSPEC-86 Shiny type resets when editing spec glossiness 2013-04-08 15:42:45 -07:00
Graham Madarasz (Graham) bd3716b775 NORSPEC-82 NORSPEC-85 More UI shenanigans 2013-04-08 11:40:10 -07:00
Graham Madarasz (Graham) 9e3155c368 NORSPEC-82 NORSPEC-85 More UI shenanigans 2013-04-08 11:40:10 -07:00
Dave Parks 5425e3fa89 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-08 11:11:07 -05:00
Graham Madarasz 73aa45d105 Add hack around norspec 59 crash 2013-04-06 05:20:07 -07:00
Graham Madarasz (Graham Linden) 1741d82a1d Merge with oz-materials (no conflicts) 2013-04-04 09:18:46 -07:00
Graham Madarasz (Graham Linden) 1517d061bc Merged with viewer-dev-materials 2013-04-04 08:25:09 -07:00
Oz Linden 98c93a54bf merge changes for 3.5.0-release 2013-04-04 10:38:20 -04:00
Dave Parks 8a73610997 NORSPEC-80 Fix for mask cutoff UI showing up in Shininess context 2013-04-04 00:22:29 -05:00
Dave Parks 57b371ab9b Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-03 23:49:53 -05:00
Graham Madarasz (Graham Linden) 7bd15e5917 NORSPEC-23 NORSPEC-76 NORSPEC-37 and other stability improvements 2013-04-03 20:49:26 -07:00
Dave Parks 7a820b88fc NORSPEC-71 Lots more UI hookups 
Written with and Reviewed By Graham
 2013-04-03 16:56:59 -05:00
Dave Parks f189ba4a3d NORSPEC-71 Lots more UI hookups 
Written with and Reviewed By Graham
 2013-04-03 16:56:59 -05:00
Oz Linden 00390ccbd7 merge changes for 3.5.0-release 2013-04-03 15:11:28 -04:00
Oz Linden 8a330ee2eb Added tag 3.5.0-release for changeset adc360e6bf21 2013-04-03 15:01:24 -04:00
Oz Linden e280422d44 merge changes for from graham 2013-04-03 14:20:06 -04:00
Dave Parks d0b12d0af5 NORSPEC-70 Hook up material texture parameters to build UI in a way that isn't infuriating to the user. 2013-04-02 18:23:22 -05:00
Dave Parks 6fcec6b47d NORSPEC-70 Hook up material texture parameters to build UI in a way that isn't infuriating to the user. 2013-04-02 18:23:22 -05:00
Dave Parks 53d7db98ff NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials. 2013-04-02 15:45:17 -05:00
Dave Parks 679a095aa0 NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials. 2013-04-02 15:45:17 -05:00
Dave Parks c13f7721f8 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-02 12:20:38 -05:00
Graham Madarasz (Graham Linden) f03899562c Remove redundant fwrite of stats data tripping up linux builds and likely the stats themselves 2013-04-02 09:47:04 -07:00
Graham Madarasz (Graham Linden) 38ad100a83 NORSPEC-73 mac crash on startup with RenderDebugGL on due to false alarm from cubemap unbind 2013-04-02 09:45:31 -07:00
Graham Madarasz (Graham Linden) a1a6699684 NORSPEC-23 and NORSPEC-47 fix llpanelface issues with reflecting default alpha blend state and presence of multiple textures when editing at face level 2013-04-02 09:41:57 -07:00