Graham Madarasz
|
2a3f4dfc45
|
Merge
|
2013-05-16 13:46:10 -07:00 |
|
Graham Madarasz
|
69e680a37c
|
Merge beta fixes
|
2013-05-16 13:42:20 -07:00 |
|
Graham Madarasz
|
2dddf959bd
|
NORSPEC-189 return to inefficient material update reg to avoid crashes from brundlefly solution with old reg and new callback
|
2013-05-16 12:45:19 -07:00 |
|
Oz Linden
|
efa839b75a
|
merge changes for 3.5.3-beta6
|
2013-05-16 14:37:14 -04:00 |
|
Graham Madarasz
|
666896ac4e
|
NORSPEC-119 put back TE-specific get registration in material manager stomped during 'reloading'.
|
2013-05-15 17:00:13 -07:00 |
|
Graham Madarasz
|
c46b24fc9a
|
Merge
|
2013-05-15 16:26:05 -07:00 |
|
Oz Linden
|
d69ffe1939
|
Added tag 3.5.2-beta6 for changeset 9013c07bfe1c
|
2013-05-15 18:48:28 -04:00 |
|
Graham Madarasz
|
5dea7c6b8f
|
Merge
|
2013-05-15 15:05:00 -07:00 |
|
Graham Madarasz
|
f58b17cb29
|
NORSPEC-152 better default norm/spec textures which read better in the UI and provide better default spec feedback
|
2013-05-15 15:03:39 -07:00 |
|
Oz Linden
|
387732090b
|
merge up to latest integration repo
|
2013-05-15 17:23:51 -04:00 |
|
callum_linden
|
83608fedb7
|
Merge
|
2013-05-15 12:56:47 -07:00 |
|
callum_linden
|
20fc4bf186
|
NORSPEC-132 Fix (again) Rotation degree has range -9999.00..9999.00
|
2013-05-15 12:55:01 -07:00 |
|
Oz Linden
|
ffec03515e
|
MAINT-2665: fix crashes being counted as wrong type in last_exec_event due to log macro wrapper
|
2013-05-15 15:45:30 -04:00 |
|
Graham Madarasz
|
3c594c5d57
|
NORSPEC-183 fix regression in diff map blank texture from NSPEC 152 fix by forcing new BlankImageID to the old default
|
2013-05-15 10:38:10 -07:00 |
|
Graham Madarasz
|
1d5a853669
|
NORSPEC-103 added new shaders for using norm/spec TCs in overlay
|
2013-05-14 16:12:53 -07:00 |
|
Graham Madarasz
|
5dc7012f43
|
Merge
|
2013-05-14 15:27:53 -07:00 |
|
Graham Madarasz
|
a37bff8bf1
|
NORSPEC-103 reflect normal/spec UVs in face edit overlay display
|
2013-05-14 15:26:43 -07:00 |
|
Dave Parks
|
46eface63c
|
NORSPEC-181 Fix for performance regression.
|
2013-05-14 16:20:54 -05:00 |
|
Kitty Barnett
|
ad09e2111c
|
NORSPEC-102 & Co Reloaded
|
2013-05-14 21:14:46 +02:00 |
|
Dave Parks
|
be712ba6b5
|
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
|
2013-05-14 11:48:04 -05:00 |
|
Graham Madarasz
|
8b6be5c667
|
NORSPEC-85 fix default normal vert offset
|
2013-05-14 08:25:42 -07:00 |
|
Graham Madarasz
|
c334a185f3
|
NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker
|
2013-05-14 05:59:48 -07:00 |
|
Dave Parks
|
e1db8d4191
|
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
|
2013-05-13 23:05:39 -05:00 |
|
Dave Parks
|
dc38ef5d39
|
NORSPEC-177 Add glare to transparent surfaces.
|
2013-05-13 17:26:51 -05:00 |
|
Oz Linden
|
fc4a6431c9
|
CHOP-942: fix crash if update check times out
|
2013-05-13 16:28:50 -04:00 |
|
Graham Madarasz
|
d9e8ee7cfd
|
NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more consistent and increased max range on repeats per meter
|
2013-05-13 13:02:53 -07:00 |
|
Dave Parks
|
369dadf823
|
NORSPEC-173 Fix for mac build
|
2013-05-13 13:34:14 -05:00 |
|
Dave Parks
|
3702cb138f
|
NORSPEC-171 Fix for full bright checkbox breaking transparent objects with materials set.
|
2013-05-13 12:15:05 -05:00 |
|
Dave Parks
|
edd6349952
|
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
|
2013-05-13 10:57:05 -05:00 |
|
Kitty Barnett
|
5ac9d9cb05
|
LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::null
|
2013-05-12 16:10:31 +02:00 |
|
Kitty Barnett
|
c2c9380fe1
|
Avoid code duplication in LLMaterialMgr
|
2013-05-12 13:02:54 +02:00 |
|
Kitty Barnett
|
c486d9498b
|
Refactor LLPanelFace to make it clearer that the material is a property of the face(s) and never the panel
|
2013-05-12 12:58:46 +02:00 |
|
Kitty Barnett
|
6fd7f146d4
|
Merged with viewer-dev-materials
|
2013-05-12 12:39:52 +02:00 |
|
Graham Madarasz
|
e1c1428569
|
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
|
2013-05-11 20:38:23 -07:00 |
|
Graham Madarasz
|
f356d7eb9f
|
Fix many issues with selection misapplication and rendering not matching applied materials
|
2013-05-11 19:58:56 -07:00 |
|
Oz Linden
|
ab4104d2d7
|
increment version to 3.5.3
|
2013-05-11 13:24:27 -04:00 |
|
Oz Linden
|
4165f2eac8
|
merge latest integration repo changes
|
2013-05-11 11:30:20 -04:00 |
|
Graham Madarasz
|
a099815774
|
Merge vwr-dev-mat
|
2013-05-11 08:11:13 -07:00 |
|
callum_linden
|
9b632f060b
|
NORSPEC-132 Fix for Rotation degree has range -9999.00..9999.00
|
2013-05-10 16:10:17 -07:00 |
|
Graham Madarasz
|
f2455ccaaf
|
Put back normal map and spec map initializers/destruction, delete FMOD refs (unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
|
2013-05-10 16:10:25 -07:00 |
|
Graham Madarasz
|
e413f4b335
|
Fixup merge diffs
|
2013-05-10 15:13:07 -07:00 |
|
Dave Parks
|
efe8d75fe3
|
NORSPEC-173 Shrink size of matrix palette for backwards compatibility.
|
2013-05-10 16:08:48 -05:00 |
|
Oz Linden
|
d47a436815
|
merge changes for 3.5.2-beta5
|
2013-05-10 14:56:28 -04:00 |
|
Oz Linden
|
4dd245055f
|
Added tag 3.5.2-beta5 for changeset 895628bb5e16
|
2013-05-10 14:44:52 -04:00 |
|
Graham Madarasz
|
6074f65991
|
Merge with vwr-dev-mat
|
2013-05-10 10:34:26 -07:00 |
|
Oz Linden
|
199086fada
|
merge changes for MAINT-2647
|
2013-05-10 12:56:25 -04:00 |
|
Oz Linden
|
f6519afee0
|
tag merge of MAINT-2647
|
2013-05-10 12:56:21 -04:00 |
|
Dave Parks
|
d2f71df15f
|
Remove some unreachable code
|
2013-05-10 11:24:19 -05:00 |
|
Oz Linden
|
da343188ff
|
fix merge error in 3.5.2 merge
|
2013-05-10 11:52:08 -04:00 |
|
Oz Linden
|
4d22c32aa9
|
merge changes for 3.5.2-beta4
|
2013-05-10 10:56:40 -04:00 |