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

28027 Commits (42b42826970bcb03486ce2ad10816a67eed4e373)

Author SHA1 Message Date
Graham Madarasz 42b4282697 Restore mismerged sunshine change 2013-05-01 08:42:35 -07:00
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 536a30d7f2 Merge vwr-dev-mat again 2013-04-30 13:57:30 -07:00
Graham Madarasz 70c1e21956 Fix gcc ternary type inference fail to unbreak Mac and Linux builds 2013-04-30 13:49:46 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Graham Madarasz d659b29f6c Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XML 2013-04-30 13:44:35 -07:00
Dave Parks b06ec66a5d MATBUG-78 Fix for alpha lighting distance attenuation not matching opaque distance attenuation 2013-04-30 14:49:53 -05:00
Dave Parks ad9e308174 NORSPEC-153 Workaround for AMD driver bug that doesn't like '\' on #define's 2013-04-29 15:01:48 -05:00
Geenz a8a3401d78 Merged with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-29 14:21:02 -04:00
Geenz 2a96a5f3ea Fix any missing color space conversions where appropriate, tweak the sun's intensity to match pre-gamma correction results, and also mask spotlight specular by the projected texture. 2013-04-29 14:15:59 -04:00
Graham Madarasz 2aa3c592b0 Fix Xui cloud raining on sunshinybumpiness 2013-04-26 15:32:31 -07:00
Graham Madarasz ced83c5248 Merge vwr-dev-mat 2013-04-26 13:13:55 -07:00
Graham Madarasz 94b7597576 Merge 2013-04-26 11:43:01 -07:00
Graham Madarasz 03cfdeca7a Fix ifdefs around asserts broken in release only by merge 2013-04-26 10:52:02 -07:00
Dave Parks 243c7bd064 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-26 11:47:15 -05:00
Graham Madarasz 9fa3381221 Appease TC cmake OCD about substring args 2013-04-26 09:36:17 -07:00
Graham Madarasz 1688e995eb Provide LLGLSLShader backwards compat so as not to break the appearance utility 2013-04-26 09:11:52 -07:00
Graham Madarasz 3834cb6f8a Fix linux breakage from sunshine merge 2013-04-26 09:02:31 -07:00
Graham Madarasz b130308d1c Restore hysteresis in llviewertexture.cpp and side-step unused var (now used again) 2013-04-26 08:10:26 -07:00
Graham Madarasz 37b64c18f5 Fix llmediadataclient test to include new dep on llprimitive and fix bogus boost lib refs in llprimitive cmake def 2013-04-26 07:28:35 -07:00
Graham Madarasz f07e0d9760 Merge viewer-dev-mat and fix llvovolume.cpp missed sunshine merges 2013-04-26 06:19:43 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Dave Parks 15852b88d9 Bump resolution on lightFunc to avoid banding. 2013-04-25 18:21:08 -05:00
Dave Parks 8bf4f15911 NORSPEC-104 Fix for texture animation sometimes not overriding specular and normal map texture coordinates. 2013-04-25 17:15:47 -05:00
Dave Parks 4102d3fb06 NORSPEC-106 Fix for emissive mask overriding environment mask. 2013-04-25 16:03:19 -05:00
Oz Linden 6f953cc97b merge changes for latest rendering fixes 2013-04-25 16:54:49 -04:00
Oz Linden d7136bac52 NORSPEC-67: fix update problem by not updating texture pickers when they are open 2013-04-25 16:50:02 -04:00
Oz Linden 399c2baaa5 add isPickerShown method 2013-04-25 16:21:55 -04:00
Oz Linden e66a32b4e2 add some debug logging, make a single return in "get" method 2013-04-25 16:14:45 -04:00
Dave Parks 3a2576cefa NORSPEC-118 Compatibility pass against advanced lighting disabled. 2013-04-25 13:29:40 -05:00
Graham Madarasz b1d608ee99 Diagnostic message for debugging adv lighting enable fail on MB Air 2k11 2013-04-25 10:38:35 -07:00
Dave Parks 454ae4cf61 NORSPEC-146 Fix for objects with alpha mode set to none or mask being shiny 2013-04-24 20:35:16 -05:00
Oz Linden 2dc4f8f8e9 merge changes for DRTVWR-309 2013-04-24 18:52:59 -04:00
Oz Linden f89d1c9665 tag merge of DRTVWR-309 2013-04-24 18:49:27 -04:00
eli 774277e9cf FIX INTL-114 translation for 9 languages of major update from CHUI (based on latest merge with viewer-development) 2013-04-24 13:56:53 -07:00
eli 80772aa1ad sync with viewer-development (per DRTVWR-309) 2013-04-24 13:49:11 -07:00
graham linden 6de39cec19 Merged lindenlab/viewer-development-materials into default 2013-04-24 10:45:41 -07:00
Dave Parks d46c7039bc Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-24 12:41:14 -05:00
Graham Madarasz 4ae48c225b Correct fix to include affect on ambient term and make work on Mac nV 2013-04-24 10:37:29 -07:00
Graham Madarasz ce48b9d8cf Fix mismerge that lost Geenz colorspace conversion of diffuse in alphaV 2013-04-24 10:33:38 -07:00
Graham Madarasz 339770698c Merge vwr-dev-mat 2013-04-24 07:41:30 -07:00
Graham Madarasz 7931804321 NORSPEC-59 NORSPEC-125 make materials and alpha shaders work on Mac laptops with nV mobile graphics cards 2013-04-24 06:24:21 -07:00
Geenz fbbbb80752 Fix for overbrigtened alpha blended objects in deferred. Linearize diffuse surface color in the vertex shader before passing it to the fragment shader. 2013-04-24 05:16:02 -04:00
graham linden b2cd114471 Merged lindenlab/viewer-development-materials into default 2013-04-23 18:40:12 -07:00
Graham Madarasz 82b87e3acb Restore deferred avi alpha program vert color usage 2013-04-23 16:15:07 -07:00
Dave Parks fcec034a38 Tweak to remove usage of GL_DEPTH_CLAMP for now until projectors can be made to work with it. 2013-04-23 17:03:57 -05:00
Oz Linden 1744d2150b NORSPEC-132 Correct rotation limits to +/- 180 for all textures 2013-04-23 16:19:31 -04:00
Oz Linden bfb1ab134f merge changes for 3.5.1-beta3 2013-04-23 14:29:24 -04:00
Dave Parks 95672cabb9 NORSPEC-142 Fix for unusable performance on GTX 285 2013-04-23 12:50:47 -05:00
Oz Linden 0bc7056ae6 Added tag 3.5.1-beta3 for changeset 65ae89aeb7ea 2013-04-23 12:27:12 -04:00