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

28051 Commits (a9ede989158ceaa4914ea48ff6a2027e89fdbda2)

Author SHA1 Message Date
Graham Madarasz a9ede98915 NORSPEC-126 Make objects with normal maps applied obey legacy shiny settings 2013-05-06 08:56:32 -07:00
Graham Madarasz 8e027971a2 Remove unnecessary assert as ternary protects against null ptr deref 2013-05-04 18:13:26 -07:00
Graham Madarasz (Graham) d3c1fdeb34 NORSPEC-160 fix trashing of spec map from sunshine integration snafu 2013-05-03 15:59:43 -07:00
Graham Madarasz (Graham) 9187a06d0b NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well 2013-05-03 09:16:15 -07:00
Graham Madarasz (Graham) 419a06036b Merge with vwr-dev-mat 2013-05-03 08:22:50 -07:00
Dave Parks f1975f0fe9 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-02 17:09:32 -05:00
Graham Madarasz 735d19eeae NORSPEC-157 make texture repeats/offsets controls display in media mode 2013-05-02 13:05:25 -07:00
Graham Madarasz dd06eb4021 NORSPEC-157 make texture repeats/offsets controls display in media mode 2013-05-02 13:05:25 -07:00
Dave Parks 6bb9c2720e NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into alpha mask pool. 2013-05-02 12:35:48 -05:00
Graham Madarasz 3e8101834b NORSPEC-99 add break statement to fix legacy bump vert program from being stomped with inappropriate material prog sans skinning 2013-05-02 10:20:55 -07:00
graham linden 33d2225666 Merged lindenlab/viewer-development-materials into default 2013-05-02 09:12:20 -07:00
Graham Madarasz 1a880b47ab NORSPEC-119 redux : fix getState to find the material ID of individually selected faces correctly 2013-05-01 19:03:09 -07:00
Graham Madarasz de582bfe86 NORSPEC-99 add break statement to fix legacy bump vert program from being stomped with inappropriate material prog sans skinning 2013-05-02 10:20:55 -07:00
Graham Madarasz 91c618c8cd NORSPEC-119 redux : fix getState to find the material ID of individually selected faces correctly 2013-05-01 19:03:09 -07:00
Dave Parks 90c2be46bf NORSPEC-145 Fix for improper rendering of glow pass for rigged meshes. 2013-05-01 20:01:37 -05:00
Graham Madarasz e78184a58c Merge vwr-dev-mat 2013-05-01 14:54:41 -07:00
Graham Madarasz ef7c661dc0 More informative light func tex binding message 2013-05-01 14:53:59 -07:00
Dave Parks 73404da266 Fix for sky being too bright with advanced lighting enabled 2013-05-01 16:48:27 -05:00
Dave Parks 5534078e9d Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-01 16:43:08 -05:00
Dave Parks 0938ce04f7 Fix up specular highlights and gamma correction for projectors. 2013-05-01 16:42:07 -05:00
Graham Madarasz 78004e74f2 Add some diag for debugging light func tex binding 2013-05-01 14:31:35 -07:00
Graham Madarasz (Graham) d7877e078e Add missing debian dir for appearnace util packaging 2013-05-01 12:07:07 -07:00
Graham Madarasz (Graham) fb73cf01af NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect Mac too 2013-05-01 11:56:15 -07:00
Graham Madarasz (Graham) d328bfd96e NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect Mac too 2013-05-01 11:56:15 -07:00
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