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

28762 Commits (9f60fc46e2454bb5d711ba6d136e2cd47ba2b8eb)

Author SHA1 Message Date
simon 9f60fc46e2 Merge 2013-08-01 16:18:39 -07:00
simon daa98bf1cf Merge downstream code 2013-07-30 15:22:00 -07:00
simon 6db14e3988 MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexes 
bullet-proof.  Reviewed by Kelly
 2013-07-30 15:12:02 -07:00
callum_linden 2c5b265e39 MAINT-2849 FIX Certain streams that play with FMod do not play with FModEx 2013-07-15 16:31:32 -07:00
maxim@mnikolenko 7766129495 MAINT-2875 FIXED Shortcut was changed and menu item was added. 2013-07-12 19:51:22 +03:00
simon 37048620dd MAINT-2879 : Viewer should revoke animation permissions with "Stop Animating Me" 
Reviewed by Kelly
 2013-07-11 17:51:20 -07:00
Baker Linden c6a15ab02d [MAINT-2386] Viewer crashes when user move landmarks from Inventory -> Landmarks or Places to Favorite bar 
Forgot to commit the errant comment -- double whoopsie all the way across the sky!
 2013-07-09 15:37:12 -07:00
Baker Linden d65e34319a [MAINT-2386] - Viewer crashes when user move landmarks from Inventory -> Landmarks or Places to Favorite bar 
- Pushed to viewer-cat for release.
 2013-07-09 15:35:00 -07:00
simon d75ae6b4f4 Merge 2013-07-02 16:05:44 -07:00
simon f41c8f5341 MAINT-2808 Viewer side : Stats for OBJECT_ATTACHMENT_GEOMETRY_BYTES and OBJECT_ATTACHMENT_SURFACE_AREA 
do not return to the 'no attachments' values after avatar removes last attachment
 2013-07-02 16:04:31 -07:00
Dave Parks 0b763695bb Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-07-02 15:31:16 -05:00
Dave Parks 716f6b9335 NORSPEC-290 Disable occlusion culling for distortion render target since there are generally zero under water occluders. 2013-07-02 15:30:42 -05:00
Maestro Linden e589f47e5e MAINT-528 added syntax highlighting for STATUS_BLOCK_GRAB_OBJECT and corrected related tooltips 2013-07-02 18:41:03 +00:00
Maestro Linden 9e5b4db928 MAINT-1312 Fixed a typo in PRIM_TEMP_ON_REZ tooltip. Reviewed by Kelly. 2013-07-02 18:07:32 +00:00
Maestro Linden ccc8577798 MAINT-1260 add missing PRIM_ constants to syntax highlighting. Reviewed by Kelly. 2013-07-02 17:59:43 +00:00
Dave Parks d6d2f74fbb NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, slight cleanup. 2013-07-01 16:27:20 -05:00
Dave Parks d262ca32d3 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-07-01 10:59:46 -05:00
Dave Parks 1c9a4fc080 NORSPEC-290 Shader optimization WIP -- remove some more divides and normalizes from various lighting functions, rework flow control based on profile feedback. 2013-07-01 10:53:09 -05:00
callum_linden bd41392b7e Merge with viewer-bear which was just merged with viewer-release 2013-06-28 13:36:41 -07:00
Dave Parks 7df863265f NORSPEC-290 Shader optimization WIP -- remove a couple normalizes, pows, and divides from various lighting functions. 2013-06-28 13:32:01 -05:00
callum_linden b6b4b59138 Merge with viewer-release 2013-06-27 18:03:47 -07:00
Oz Linden 6060e5e46a increment viewer version to 3.6.2 2013-06-27 18:10:18 -04:00
Dave Parks 380785e613 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-27 16:16:56 -05:00
Dave Parks 21b78d7368 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-26 19:18:19 -05:00
Dave Parks 06b024f60e MATBUG-194 Fix for crazy colors on projector shadows with NVIDIA OpenGL 3.3 implementations 2013-06-26 19:16:49 -05:00
Oz Linden b2db719faf Added tag 3.6.1-release for changeset 75cf8e855ae1 2013-06-26 16:35:53 -04:00
Dave Parks 2b5205c743 Merge cleanup. 2013-06-26 15:33:07 -05:00
Dave Parks bb66e722d3 Automated merge with https://bitbucket.org/davep/viewer-release-iqa-1366 2013-06-26 11:55:03 -05:00
Dave Parks b717a28194 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-26 11:53:47 -05:00
Dave Parks 5595888dd2 NORSPEC-290 Allow shader compiler to unroll loop in multiPointLightF 2013-06-26 11:52:10 -05:00
Oz Linden 1c6783fdb5 NORSPEC-29: use the MaxMaterialsPerTransaction simulator feature if available 2013-06-26 09:43:01 -04:00
Dave Parks 280a9d9827 MATBUG-78 Fix for alpha lighting falloff not matching opaque lighting falloff (again). 2013-06-25 18:02:08 -05:00
Oz Linden 7ede4c4b6e merge changes for NORSPEC-280 2013-06-25 16:43:55 -04:00
Oz Linden b23143418b merge changes for NORSPEC-280 2013-06-25 16:25:32 -04:00
Graham Madarasz (Graham) df0da562af MAINT-2800 revert changes to objectSkinV to make it match 3.6.0 code and not slow down on ATI on Mac 2013-06-24 12:00:56 -07:00
Oz Linden 7f2ad72fe6 merge changes for DRTVWR-326 3.6.1-beta1 2013-06-24 14:41:16 -04:00
Graham Linden 559173f711 NORSPEC-280 include fix to downsampleDepthRect shader making GL 3.3. drivers cry 2013-06-24 06:44:14 -07:00
Dave Parks 4696eeeb30 Merge cleanup. 2013-06-21 17:07:37 -05:00
Dave Parks 8817ecc1e3 NORSPEC-280 Fix for shader compilation error on OpenGL 3.3 2013-06-21 15:57:59 -05:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Dave Parks 80552a465e Only render bounding boxes for volumes in info display. 2013-06-21 12:19:07 -05:00
Graham Linden 3a8cdb5d46 NORSPEC-277 WIP backout old-school normal permutation 2013-06-20 15:27:22 -07:00
Dave Parks af860d0953 Try to track down some bad bounding boxes in particles. 2013-06-20 17:17:54 -05:00
Dave Parks 4e46ce5520 MATBUG-204 Fix for crash in genVolumeBBoxes 2013-06-20 17:17:28 -05:00
Dave Parks 1e3060f6d5 Merge cleanup 2013-06-20 16:56:10 -05:00
Graham Linden 65f0972a64 NORSPEC-262 make drag and drop aware of editing context so that editing normal/spec textures causes application to the correct tex channel 2013-06-20 12:41:46 -07:00
Dave Parks 9ea2d90a0d Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-06-20 12:10:26 -05:00
Graham Linden 42a4659555 NORSPEC-278 fix misuse of legacy bumps when rendering objects with TE bumpmap setting of 18 aka BUMPY_TEXTURE 2013-06-20 09:34:30 -07:00
Oz Linden 5a661a4d82 merge changes for DRTVWR-326 2013-06-19 19:23:26 -04:00
Graham Linden 504b834000 Merge 2013-06-19 15:13:19 -07:00