Commit Graph

27288 Commits (f7b7f4a5fb35b1d04a975ddd91c62062dee075cc)

Author SHA1 Message Date
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) ffc4981bb9 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) bd3716b775 NORSPEC-82 NORSPEC-85 More UI shenanigans 2013-04-08 11:40:10 -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 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 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
Dave Parks 3e8da4e8d5 Automated merge with https://bitbucket.org/lindenlab/davep-materials 2013-04-02 11:18:29 -05:00
Oz Linden 5f5732365b merge changes for 3.5.0-beta7 2013-04-02 11:28:41 -04:00
Dave Parks 8f9ddc67fd Automated merge with https://bitbucket.org/lindenlab/davep-materials 2013-04-02 01:48:05 -05:00
Dave Parks 8da8e05964 NORSPEC-58 Followup -- put back blinn phong, and do gamma correction approximation in light curves. Fix fresnel math. 2013-04-02 01:47:12 -05:00
Graham Madarasz (Graham Linden) 8037601ded Remove duplicate fwrite of viewer stats data 2013-04-01 14:07:12 -07:00
Oz Linden f61f5d1c10 fix typo: Advance -> Advanced 2013-04-01 16:28:28 -04:00
Graham Madarasz (Graham Linden) 7c242dae73 Fix Mac startup crash on unbind cube map if RenderDebugGL is on 2013-04-01 13:27:25 -07:00
Graham Madarasz (Graham Linden) 4bbb21ec2d NORSPEC-23 tex box fails to indicate multiple textures in use 2013-04-01 12:58:14 -07:00
Graham Madarasz (Graham Linden) 961d52fbd3 NORSPEC-47 alpha mode enabled for textures without alpha channels 2013-04-01 12:31:20 -07:00
Oz Linden 2fde4a9ae5 merge changes for 3.5.0-beta7 2013-04-01 14:24:01 -04:00
Oz Linden 90b56ee9fa merge changes for 3.5.0-beta7 2013-04-01 09:34:41 -04:00
Oz Linden 49bef4e122 Added tag 3.5.0-beta7 for changeset 5c6098fd17d4 2013-04-01 09:33:58 -04:00
Graham Madarasz (Graham Linden) e421420055 Re-apply llmin fix for Mac 2013-03-31 07:31:41 -07:00
Dave Parks c7da38eb68 Fix for linux build? 2013-03-30 17:08:52 -05:00
Dave Parks a8816aad31 Automated merge with https://bitbucket.org/lindenlab/davep-materials 2013-03-30 16:28:05 -05:00
Dave Parks 4a6dde3b36 NORSPEC-69 Fix for bump and specular map rotation values showing up as radians instead of degrees. 2013-03-30 16:06:03 -05:00
Dave Parks adcf2d98e3 NORSPEC-72 Set default value of glossiness to 0.2 2013-03-30 15:51:16 -05:00
Dave Parks 1f739cb7bc Cleanup a couple more places where gamma curves were getting applied. 2013-03-30 15:50:51 -05:00
Dave Parks 14f02e48b8 NORSPEC-66 Hook up material parameters to rigged attachments. 2013-03-29 20:12:27 -05:00
Oz Linden 7333731bbc merge changes for DRTVWR-306 2013-03-29 17:31:00 -04:00
Oz Linden 430b8547c4 tag merge of DRTVWR-306 2013-03-29 17:30:54 -04:00
Dave Parks fc4869fb78 NORSPEC-65 Hook up texture offset/scale/rotation for normal and specular maps. 2013-03-29 16:13:36 -05:00
Graham Madarasz (Graham Linden) 2d713a2815 Google Breakpad Fix. Code reviewed by DaveP 2013-03-29 13:22:29 -07:00
Dave Parks 7c4fd34dce Automated merge with https://bitbucket.org/lindenlab/davep-materials 2013-03-29 12:03:33 -05:00
Dave Parks d81fde49f7 NORSPEC-64 Fix for batches breaking on every single face when materials are in play. 2013-03-29 12:02:53 -05:00