Commit Graph

27270 Commits (e280422d4454549e4fd992ad45ec2ea4d41b08eb)

Author SHA1 Message Date
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 53d7db98ff 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
Mnikolenko ProductEngine 305d111910 Additional fix for CHUI-903 2013-03-29 18:34:16 +02:00
Graham Madarasz (Graham Linden) 742b301059 Plug in Oz built-by-magic breakpad packages for testing 2013-03-28 19:07:13 -07:00
Graham Madarasz (Graham Linden) 8e54486468 Add new linux breakpad build for testing 2013-03-28 16:27:39 -07:00
Dave Parks 8f07110103 NORSPEC-63 Fix for faces with materials not casting shadows. 2013-03-28 14:43:46 -05:00
Dave Parks 001ed7626b Fix md5sum mismatch on google breakpad on windows 2013-03-28 12:53:55 -05:00
Dave Parks 0f8976388b Automated merge with https://bitbucket.org/lindenlab/davep-materials 2013-03-28 12:16:16 -05:00
Dave Parks 5121dd1a53 NORSPEC-62 Fix for fullbright checkbox not working with materials 2013-03-28 12:15:32 -05:00
AlexanderP ProductEngine 3b51f73b7c CHUI-799 FIXED Notification is not given to user when they select only friends and groups can IM me preference 2013-03-28 19:06:39 +02:00
Mnikolenko ProductEngine a62a824efb CHUI-903 FIXED Don't show toasts if Session floater is torn-off and in focus. 2013-03-29 15:23:17 +02:00
Oz Linden 130e4e5101 merge changes for 3.5.0-beta6 2013-03-28 10:12:18 -04:00
Oz Linden cf1747712b Added tag 3.5.0-beta6 for changeset 55339537d99a 2013-03-28 08:01:49 -04:00
Oz Linden bfc52a2d75 merge changes for DRTVWR-305 2013-03-28 07:20:46 -04:00
Oz Linden a53b017bad tag merge of DRTVWR-305 2013-03-28 07:20:40 -04:00
Graham Madarasz 48f433212f Fix breakpad breakage from linux API diffs 2013-03-27 23:18:14 -07:00
AlexanderP ProductEngine 8e3a85ed66 CHUI-896 FIXED Line flashing and FUI button flashing not working correctly for CHUI notifications: added flashing of the line item after conv. floater opens 2013-03-28 05:49:28 +02:00
Gilbert Gonzales e76a4eb7c5 CHUI-905 (Viewer crashes while using Insert keyboard key in chat): Problem was because when insert was used at the end of a string of text, this would attempt to delete something past the bounds of the string...as a side effect the size of the segment was increasing even though the string length never changed. The segment size would be greater than the string size and would eventually cause an invalid read outside the bounds of the string. 2013-03-28 17:31:45 -07:00
Dave Parks 74b5bfb98f Automated merge with https://bitbucket.org/lindenlab/davep-materials 2013-03-27 22:01:56 -05:00
Dave Parks 4f8827d2a8 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-03-27 21:59:52 -05:00