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

28421 Commits (96f7f6d01bb652fb049cd64b55b2933aa436f9d2)

Author SHA1 Message Date
Graham Madarasz 96f7f6d01b NORSPEC-258 and NORSPEC-226 make tex picker close refresh build tool UI correctly and fix issues with transition from no-bumps to normal maps 2013-06-11 17:18:20 -07:00
Graham Madarasz 7fcbb7c177 Fix build failure from warning and dav3p no-JIRA bug about normal map scale editing 2013-06-11 13:54:03 -07:00
Graham Madarasz 87946113cc NORSPEC-257 can't use automated TEMaterialGet functor as we need two possible defaults for diffuse alpha mode based on the alpha content of the diffuse texture 2013-06-11 12:48:59 -07:00
Graham Madarasz 01f595d871 Speculative fix for tangent calc asserts on Mac 2013-06-11 12:02:54 -07:00
Dave Parks 840c2f9237 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-11 12:04:14 -05:00
Graham Madarasz 5c1144c48b NORSPEC-222 fix issues with removing the use texture item selecting weave when the TE was BUMPY_TEXTURE, but no normal map was applied 2013-06-10 19:06:19 -07:00
Graham Madarasz e666725f9d NORSPEC-257 fix alpha mode display incorrect default when alpha is present in tex 2013-06-10 18:49:50 -07:00
Graham Madarasz 6b2a22e11c MAINT-2777 work-around for APR assert_always causing random crash in materials build 2013-06-10 16:55:05 -07:00
Graham Madarasz a4676adebb NORSPEC-251 fix issues with not binning objects changed from having a material to using legacy bumps causing incorrect rendering 2013-06-10 15:49:09 -07:00
Graham Madarasz 9d73f625ab NORSPEC-252 fix reverting normal maps to none 2013-06-10 15:17:45 -07:00
Dave Parks d09f1e7117 NORSPEC-242 Followup, fix a couple more sources of NaN and infinity. 2013-06-10 16:01:53 -05:00
Dave Parks 0073884f83 NORSPEC-247 Fix for rigged attachments with alpha masking on occluding alpha object when 100% transparent. 2013-06-10 13:00:47 -05:00
Dave Parks aaf42d473e Line endings. 2013-06-10 13:00:12 -05:00
Graham Madarasz fe077cfba6 MAINT-2414 fix for texture cache crasher 2013-06-10 10:45:15 -07:00
Dave Parks 322b19d698 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-10 11:17:18 -05:00
Graham Madarasz 4cd133fe00 NORSPEC-248 fix broken repeats handling in media mode 2013-06-10 09:13:59 -07:00
Graham Madarasz 31e05ba675 Merge vwr-dev-mat 2013-06-10 08:20:00 -07:00
Graham Madarasz bc2a6adb5a NORSPEC-87 fix diffuse repeats display as well 2013-06-10 08:10:59 -07:00
Graham Madarasz 8ff9786c81 NORSPEC-87 fix regression from NSPEC 233 fix typo which is breaking norm repeats display 2013-06-10 07:52:39 -07:00
Graham Madarasz f56dd414b7 NORSPEC-87 fix regression from 233 fix that made spec repeats info show in norm tab 2013-06-10 07:33:30 -07:00
Graham Madarasz df3df9de4f NORSPEC-246 fix shader compile errors from missing return 2013-06-09 21:12:40 -07:00
Graham Madarasz 33a2608da5 NORSPEC-246 fix issues with normal encoding on precision-deprived hardware and remove haxors 2013-06-09 20:55:02 -07:00
Graham Madarasz 75c4b50f88 NORSPEC-246 WIP fix callsite missed when swapping in macro impl 2013-06-09 12:40:43 -07:00
Graham Madarasz e38514f9fd NORSPEC-246 WIP Fix macro bug that slipped past due to MSVC promiscuity 2013-06-09 09:38:45 -07:00
Graham Madarasz c120feb18d NORSPEC-246 WIP fix handling of encoded normals with single FP only cards 2013-06-09 06:12:11 -07:00
Graham Madarasz 045634f89e NORSPEC-233 fix regressions in default spec parameters 2013-06-08 07:43:26 -07:00
Graham Madarasz fba40dc4f7 NORSPEC-226 NORSPEC-222 fix menu content bugs and alpha mask stomp when editing multiple objects 2013-06-08 07:25:47 -07:00
Graham Madarasz eba7eb2d06 NORSPEC-233 fix default value and material apply logic errors 2013-06-08 06:28:48 -07:00
Dave Parks bfbf64f39a NORSPEC-230 Fix for incorrect gamma under water. 2013-06-07 16:50:22 -05:00
Graham Madarasz c78cd1aae6 NORSPEC-233 WIP fix completely bogus substitution of offsets for scales and make scale accessors get with the program 2013-06-07 14:37:39 -07:00
Dave Parks ddf15867e4 NORSPEC-242 Fix for infinity and NaN showing up in tangents and texture coordinates sometimes. 2013-06-07 16:18:37 -05:00
Graham Madarasz af0cc77199 NORSPEC-233 WIP cleanup and fix crasher in templated material get driver func 2013-06-07 14:17:13 -07:00
Graham Madarasz b15cdc828e Fix busted WIP check-in 2013-06-07 13:10:36 -07:00
Graham Madarasz c60eac25e5 Merge MAINT-2740 crash fix 2013-06-07 12:50:02 -07:00
Graham Madarasz 3a4d72f8d9 Merge vwr-dev-mat 2013-06-07 10:50:01 -07:00
Graham Madarasz 3541b4c613 NORSPEC-233 WIP clean up regressions in enable/tentative logic from rework 2013-06-07 10:41:08 -07:00
Graham Madarasz 646b8c0c15 NORSPEC-233 WIP make gcc like it and do some clean-up 2013-06-07 09:10:33 -07:00
Graham Madarasz 7e4e59470f NORSPEC-233 WIP for individual material param edits across hetero object selections 2013-06-07 08:58:15 -07:00
Dave Parks 9bcae4a4e6 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-05 17:35:19 -05:00
Graham Madarasz c38204f5e0 Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat 2013-06-05 14:26:27 -07:00
Graham Madarasz d40acfb05a NORSPEC-237 nix resetting the keyboard focus to cripple the repeats per meter control 2013-06-05 14:18:29 -07:00
Dave Parks 9c7c1efe00 NORSPEC-232 Fix for broken alpha masking with basic shaders disabled. 2013-06-05 15:54:49 -05:00
Graham Madarasz badbce6f97 Merge 2013-06-05 11:51:04 -07:00
Dave Parks 2c46363bfd Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-05 12:38:27 -05:00
Dave Parks e454c3d48c NORSPEC-238, NORSPEC-225 Fix for specular map alpha channel being improperly used and glossiness bludgeoning environment intensity. 
Reviewed/written by Graham.
 2013-06-05 12:31:55 -05:00
Graham Madarasz ef8a7914bd NORSPEC-238 NORSPEC-225 fix issues with env mask term being ignored and or damped by glossiness 2013-06-05 10:08:10 -07:00
Graham Madarasz 8d4864750e NORSPEC-238 NORSPEC-225 fix issues with env mask term being ignored and or damped by glossiness 2013-06-05 10:08:10 -07:00
Graham Madarasz d50aeed8de NORSPEC-238 spec map env mask term in alpha chan ignored 2013-06-05 10:04:51 -07:00
Graham Madarasz 2996f34e86 NORSPEC-238 spec map env mask term in alpha chan ignored 2013-06-05 10:04:51 -07:00
Dave Parks da294b79c0 NORSPEC-236 Fix for rigged attachments with materials not rendering under water when advanced lighting is enabled. 2013-06-05 11:10:32 -05:00