Oz Linden
|
64a4a13397
|
fix crasher in setNumTEs
|
2013-02-15 15:40:43 -05:00 |
|
Oz Linden
|
b7cd89da5f
|
change to force new codeticket number
|
2013-02-12 16:43:16 -05:00 |
|
Oz Linden
|
2bcfc9554d
|
remove obsolete LLMemType tracing from materials
|
2013-02-12 14:38:47 -05:00 |
|
Oz Linden
|
8bb3d0891d
|
merge up to 3.4.5-release
|
2013-02-12 13:27:03 -05:00 |
|
Oz Linden
|
66c75202a8
|
merge renderer update fix
|
2013-02-12 13:10:11 -05:00 |
|
Oz Linden
|
e87000ba07
|
Added tag 3.4.5-release for changeset a49c715243a3
|
2013-02-12 07:06:24 -05:00 |
|
Tonya Souther
|
3422f75cf7
|
Tell the renderer to use the updated material immediately on editing it.
|
2013-02-06 21:38:05 -06:00 |
|
Oz Linden
|
a5cfd935d3
|
merge fix to defer server updates
|
2013-02-06 15:57:24 -05:00 |
|
Oz Linden
|
79eeae502c
|
Added tag 3.4.5-beta5 for changeset 852b69ef0b5f
|
2013-02-05 13:25:24 -05:00 |
|
Oz Linden
|
34c0ed7e99
|
merge changes for DRTVWR-297
|
2013-02-05 12:32:52 -05:00 |
|
Oz Linden
|
d96c3220f8
|
tag merge of DRTVWR-297
|
2013-02-05 12:32:14 -05:00 |
|
Oz Linden
|
3279201c1b
|
merge changes for DRTVWR-296
|
2013-02-05 12:30:34 -05:00 |
|
Oz Linden
|
702332fc02
|
tag merge of DRTVWR-296
|
2013-02-05 12:30:30 -05:00 |
|
Tonya Souther
|
f2b026138d
|
Don't send a materials update to the sim until the previous one has been acknowledged.
|
2013-02-05 03:30:56 -06:00 |
|
Dave Parks
|
5a69837345
|
MAINT-2323 Fix for crash on shutodwn in mesh responder destructors
|
2013-02-04 12:23:33 -06:00 |
|
Geenz
|
170ecf5e8a
|
Whoops! Normal maps don't belong here...
|
2013-02-04 13:08:37 -05:00 |
|
Geenz
|
a91b231bfe
|
Merged with latest viewer-dev-materials.
|
2013-02-04 12:49:26 -05:00 |
|
Geenz
|
aae698ff0c
|
Merged with latest viewer-dev-materials.
|
2013-02-04 11:55:04 -05:00 |
|
Geenz
|
2ae4b6976b
|
Added a new draw pool specifically for faces with materials applied to them. Removed materials rendering from the bump draw pool, and reverted it to its previous state.
|
2013-02-04 11:32:05 -05:00 |
|
Oz Linden
|
68ec77127b
|
merge tonyas loop fixes
|
2013-02-04 09:38:06 -05:00 |
|
Oz Linden
|
7cc7ae873c
|
improve and clarify logging
|
2013-02-04 09:35:12 -05:00 |
|
Tonya Souther
|
5bbc33383e
|
Don't spam the sim with repeated queries for an empty list of materials.
|
2013-02-03 23:01:22 -06:00 |
|
Tonya Souther
|
da82358116
|
Enable sending material updates.
|
2013-02-03 23:00:37 -06:00 |
|
Kitty Barnett
|
d149aea87c
|
Merged with viewer-dev-materials
|
2013-02-04 01:01:07 +01:00 |
|
Kitty Barnett
|
0a99aadd7a
|
Material PUT queue entries aren't removed after a request is sent
|
2013-02-04 00:57:45 +01:00 |
|
Oz Linden
|
4c71d5eba7
|
merge up to latest version from tonya
|
2013-02-01 10:21:46 -05:00 |
|
Oz Linden
|
90bf22ef24
|
add debug logging, ostream support for material ids, and some minor cleanup
|
2013-02-01 10:20:44 -05:00 |
|
Whirly
|
0908b60c1c
|
STORM-1930 Quality & Speed slider has Ultra label where High should be.
|
2013-02-01 08:10:16 +00:00 |
|
Oz Linden
|
510a681341
|
make logging tag for Materials uniform
|
2013-01-31 16:00:57 -05:00 |
|
Tonya Souther
|
132db13fb6
|
Fixing VC++ compile error: calling a static routine doesn't need the "this" pointer
|
2013-01-31 14:49:11 -06:00 |
|
Tonya Souther
|
c1b110dd1d
|
Merging in main repository.
|
2013-01-31 11:40:16 -06:00 |
|
Oz Linden
|
d1b224158d
|
merge workaround for llprocess test failures
|
2013-01-31 10:34:30 -05:00 |
|
Oz Linden
|
dfc3faf240
|
workaround by skipping llprocess tests that frequently fail on Windows
|
2013-01-31 10:33:39 -05:00 |
|
Oz Linden
|
e7ba74b9ea
|
merge workarounds for failing tests
|
2013-01-31 10:22:44 -05:00 |
|
Oz Linden
|
19233999ed
|
disable timing sensitive check in the pipe and pump fitness test
|
2013-01-31 09:34:00 -05:00 |
|
Oz Linden
|
5ade41c09d
|
disable timing sensitive check in the pipe and pump fitness test
|
2013-01-31 09:34:00 -05:00 |
|
Oz Linden
|
7b4edf93b7
|
work around inexplicably failing unit tests
|
2013-01-31 08:45:18 -05:00 |
|
Oz Linden
|
e8d38f7885
|
skip some http core tests on Windows because they fail too frequently
|
2013-01-31 08:42:10 -05:00 |
|
Tonya Souther
|
d53f69b67f
|
Control reorganization and bugfixes.
|
2013-01-31 00:36:23 -06:00 |
|
Oz Linden
|
d9eb8e27d5
|
Added tag 3.4.5-beta4 for changeset 1567de5700c2
|
2013-01-30 15:04:06 -05:00 |
|
Geenz
|
071a53c814
|
Merge with latest viewer-dev-materials.
|
2013-01-30 12:45:26 -05:00 |
|
Geenz
|
aa1befd689
|
Specular map support. This is the vast majority of the material parameters implemented at this point for opaque geometry.
|
2013-01-30 12:17:04 -05:00 |
|
Oz Linden
|
577515e93f
|
merge build floater updates
|
2013-01-30 10:30:17 -05:00 |
|
Oz Linden
|
2968478a6a
|
merge MAINT-2252 fix
|
2013-01-30 10:25:29 -05:00 |
|
Tonya Souther
|
ada2d07572
|
Compile fix for potentially uninitialized variable.
|
2013-01-29 22:12:20 -06:00 |
|
Tonya Souther
|
1751c965ba
|
Editing interface for normal and specular maps and other parameters.
|
2013-01-29 21:19:58 -06:00 |
|
Oz Linden
|
2fa8205d4d
|
MAINT-2281: correct test for XP (corrected fix I applied incorrectly)
|
2013-01-29 18:39:51 -05:00 |
|
Oz Linden
|
07deaaef88
|
tag merge of DRTVWR-292
|
2013-01-29 18:27:40 -05:00 |
|
Geenz
|
66a01ba4c5
|
Basic normal mapping support.
|
2013-01-28 19:56:18 -05:00 |
|
Oz Linden
|
d56de96086
|
merge linearlize lighting
|
2013-01-28 16:22:21 -05:00 |