Oz Linden
|
eff106ae68
|
merge latest integration changes
|
2013-05-22 16:13:54 -04:00 |
|
Graham Madarasz (Graham)
|
b3000136b8
|
NORSPEC-186 clamp norm/spec map rotations to 0-360 until we can fix the server side issue with negative rotations
|
2013-05-22 12:22:04 -07:00 |
|
Oz Linden
|
74ea01d6f2
|
merge changes for maint-2718
|
2013-05-22 14:40:26 -04:00 |
|
Graham Madarasz (Graham)
|
46c3c7f7a5
|
Merge
|
2013-05-22 10:27:00 -07:00 |
|
Graham Madarasz (Graham)
|
69ad1f6236
|
NORSPEC-205 more dueling spec controls
|
2013-05-22 09:54:11 -07:00 |
|
Oz Linden
|
2b517892ad
|
merge latest project repo
|
2013-05-22 11:43:32 -04:00 |
|
Oz Linden
|
d4f2a2df53
|
merge tags for 3.5.2-release
|
2013-05-22 11:41:37 -04:00 |
|
Oz Linden
|
5758b9e304
|
merge changes for 3.5.3-release
|
2013-05-22 11:09:43 -04:00 |
|
Graham Madarasz
|
03eb406d05
|
NORSPEC-203 fix handling of objs with materials due to alpha mode in non-deferred
|
2013-05-22 07:06:22 -07:00 |
|
Oz Linden
|
7fad053982
|
merge changes for chui-967
|
2013-05-22 06:27:51 -04:00 |
|
Gilbert Gonzales
|
892f3cdd2c
|
CHUI-967: fix display of % escapes in chat
|
2013-05-22 06:26:54 -04:00 |
|
callum_linden
|
1d8b9ff07c
|
MAINT-2718 FIX Update Windows version of FMOD Ex DLLs with non-logging versions
|
2013-05-21 21:38:09 -07:00 |
|
Graham Madarasz
|
8b7a4c503c
|
NORSPEC-96 tweak fix to follow clone/modify/re-apply pattern from build tool to avoid changing objects sharing a material
|
2013-05-21 17:09:04 -07:00 |
|
Graham Madarasz
|
d187ee8e59
|
NORSPEC-96 slight refrain, make Stretch Textures apply to norm/spec maps in planar texgen mode
|
2013-05-21 16:51:36 -07:00 |
|
Graham Madarasz
|
e2ca8412e4
|
Merge
|
2013-05-21 16:13:09 -07:00 |
|
Oz Linden
|
4f08780b00
|
merge changes for maint-2628
|
2013-05-21 19:05:23 -04:00 |
|
Graham Madarasz
|
06b3879acc
|
NORSPEC-200 fix regression from 188 fix caused by not having enough bits to store SHINY_TEXTURE in the TEs bitfield
|
2013-05-21 15:27:52 -07:00 |
|
Oz Linden
|
10f2060547
|
merge changes for chop-947
|
2013-05-21 17:34:40 -04:00 |
|
Oz Linden
|
2df5b9caa6
|
BUG-2432: Crashfix. Don't call map::erase when the iterator is not valid.
|
2013-05-21 17:25:51 -04:00 |
|
Oz Linden
|
f9bdc6d5e1
|
merge changes for chop-948
|
2013-05-21 17:13:26 -04:00 |
|
callum_linden
|
c0bd675fdb
|
NORSPEC-196: fix frame stalls caused by FmodEx logging
|
2013-05-21 17:10:30 -04:00 |
|
Oz Linden
|
70b0b2a2e3
|
revise test for hg to detect and ignore incorrect results from cygwin hg
|
2013-05-21 15:44:08 -04:00 |
|
Oz Linden
|
c13d75dc38
|
CHOP-947: create summary.json (really python) metadata file for TeamCity results
|
2013-05-21 12:45:44 -04:00 |
|
Dave Parks
|
4c522f8212
|
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
|
2013-05-21 11:43:09 -05:00 |
|
Oz Linden
|
187c7042b9
|
CHOP-948: correctly persist the UpdaterWillingToTest preference
|
2013-05-21 11:43:37 -04:00 |
|
Graham Madarasz
|
756c3d30ee
|
NORSPEC-191 make alpha masked rigged faces appear with deferred rendering on and off
|
2013-05-20 17:35:16 -07:00 |
|
Graham Madarasz
|
c7a9a2fcc1
|
Merge
|
2013-05-20 16:40:48 -07:00 |
|
Graham Madarasz
|
eaff189b45
|
Merge
|
2013-05-20 16:38:10 -07:00 |
|
Graham Madarasz
|
a1a8048d3e
|
NORSPEC-188 avoid removing 'Use Texture' item when cancelling from picker back to having prev texture
|
2013-05-20 16:24:58 -07:00 |
|
callum_linden
|
af134f9a2e
|
Merge
|
2013-05-20 15:10:57 -07:00 |
|
callum_linden
|
1f9710ebcb
|
Quieten down writing to fmod.log - only write errors - speculate this is related to audio stutter/frame stalls
|
2013-05-20 15:09:42 -07:00 |
|
Dave Parks
|
8122418567
|
NORSPEC-197 Fix for fullbright alpha masked objects not rendering
|
2013-05-20 17:07:41 -05:00 |
|
Graham Madarasz
|
5acb0b3a32
|
NORSPEC-168 fix UI update to not re-add the 'Use Texture' item when selecting legacy bump settings
|
2013-05-20 11:56:48 -07:00 |
|
Oz Linden
|
0ebcb7e3fd
|
increment version to 3.5.3 to be higher than the release
|
2013-05-17 19:25:29 -04:00 |
|
Oz Linden
|
9ef6449455
|
merge changes for lastest integrations
|
2013-05-17 18:06:24 -04:00 |
|
Graham Madarasz (Graham)
|
2ff880ddb1
|
Merge vwr-dev-mat
|
2013-05-17 14:28:29 -07:00 |
|
Graham Madarasz (Graham)
|
74c1bc29e7
|
NORSPEC-189 restore old mat param update registration
|
2013-05-17 14:02:31 -07:00 |
|
Oz Linden
|
4d62a56ff9
|
advance project to Beta phase... !!!
|
2013-05-17 16:27:17 -04:00 |
|
Oz Linden
|
251d3f8966
|
merge changes for latest integration repo
|
2013-05-17 16:25:59 -04:00 |
|
Oz Linden
|
8761c87990
|
increment version to 3.6.0
|
2013-05-17 16:14:44 -04:00 |
|
Oz Linden
|
8ee91f8259
|
Added tag 3.5.2-release for changeset 9b1b6f33aa53
|
2013-05-17 15:39:37 -04:00 |
|
Dave Parks
|
0ed964fd20
|
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
|
2013-05-17 13:56:04 -05:00 |
|
Dave Parks
|
88a42cd453
|
NORSPEC-187 Add directionality to ambient lighting.
|
2013-05-17 13:54:58 -05:00 |
|
callum_linden
|
174eda3ed0
|
Extra fix for Dave's shader OS X related shader change
|
2013-05-17 11:35:12 -07:00 |
|
Dave Parks
|
559934705f
|
Backout OpenGL 2.1 compatibility attempt
|
2013-05-17 12:27:50 -05:00 |
|
Dave Parks
|
e6c2a76529
|
NORSPEC-187 Directional ambient work in progress.
|
2013-05-17 12:19:08 -05:00 |
|
callum_linden
|
30fcff121f
|
Merge with head
|
2013-05-17 09:34:57 -07:00 |
|
Dave Parks
|
f18fd226c3
|
Fix for compilation error in shadows disabled and don't load transform feedback shaders unless transform feedback is enabled.
|
2013-05-16 17:13:16 -05:00 |
|
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 |