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

39832 Commits (f0afc19bee33a31f9e648e72935f3b7c7dee2fd5)

Author SHA1 Message Date
Rider Linden b328c7384e SL-9679: Record the asset id that the editor is expecting. If none set to null. If asset id recieved does not match expected throw it away. 2018-09-26 16:54:01 -07:00
Rider Linden 78866b33a9 Merge 2018-09-26 13:46:45 -07:00
Nat Goodspeed 58aef8beaf increment viewer version to 5.1.10 2018-09-26 16:12:20 -04:00
Nat Goodspeed e213eafca9 Added tag 5.1.9-release for changeset 52422540bfe5 2018-09-26 16:12:19 -04:00
andreykproductengine 2d5fa7a732 SL-1825 EEP - default description should be empty 2018-09-26 20:33:26 +03:00
Rider Linden 2c25b7dcc3 Merged in andreykproductengine/maint-eep2 (pull request #115) 
SL-983 EEP - When selecting a new parcel with the day editor open follow in editor
 2018-09-26 16:45:20 +00:00
andreykproductengine 41a6504c5e SL-983 EEP - When selecting a new parcel with the day editor open follow in editor 2018-09-26 18:14:44 +03:00
maxim_productengine 405f5c879c SL-9732 FIXED [EEP] Save As does not provide dialogue to supply new setting name 2018-09-26 17:39:55 +03:00
Rider Linden cca55533f8 Merged in graham_linden/viewer-eep-graham (pull request #112) 
SL-9711, SL-1505, SL-9708
 2018-09-25 22:47:41 +00:00
Rider Linden 2a1a7396b2 Fix slider max to 168 2018-09-25 15:12:46 -07:00
Graham Linden 3778dd4085 SL-1505 and SL-9608 
Get both reflections and clip plane bugs fixed (at the same damn time).
 2018-09-25 22:20:07 +01:00
Rider Linden 1cef57ef81 Merge 2018-09-25 13:25:26 -07:00
andreykproductengine 18dd6f076e SL-1961 EEP Altitude labels auto-adjustment 2018-09-25 20:27:59 +03:00
Brad Payne (Vir Linden) 963945b3ab SL-1291 - fixed some issues with selection highlighting of objects rezzed while in build mode. Not clear whether this addresses the original issue, which isn't reproing 2018-09-25 16:39:26 +01:00
Rider Linden ed2e333a54 MAINT-9734: Change limits on settings values. 2018-09-24 17:00:01 -07:00
Rider Linden 70c18ba14b SL-9736: 0.0 is no motion for cloud scroll. 2018-09-24 14:55:21 -07:00
Graham Linden 5969609c47 Merge 2018-09-24 19:53:50 +01:00
Graham Linden 501cd7d902 SL-9711 modify clamping range on atmospheric additive color to balance between maintaining old look of WL settings and fixing SL1491 lens flare bug 2018-09-24 19:50:08 +01:00
Graham Linden e5a8fb042a SL-9708 
Fix knock-on from fix for SL1505 reflection matrix bug by putting back old code for setting up underwater culling planes.

  Fix some diffs from viewer-release.
 2018-09-24 19:14:41 +01:00
Rider Linden c1974bf10a Merged in andreykproductengine/maint-eep (pull request #109) 
SL-1817 and SL-9677

Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
 2018-09-24 15:59:04 +00:00
Rider Linden 6bff7d786e Merged in andreyl_productengine/viewer-eep-marchcat (pull request #108) 
SL-1546 + line endings fix

Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
 2018-09-24 15:57:56 +00:00
andreykproductengine 6e0481b604 SL-9677 EEP Small adjustment to error message for not applying enviroment setting 2018-09-24 18:54:54 +03:00
AndreyL ProductEngine f0eb06ed13 SL-1546 VitrualTrackBall - Reduced the angle change per button click to 1deg 2018-09-24 18:24:32 +03:00
andreykproductengine ee532d946d SL-1817 EEP Day Cycle timeline scrubber can't be repositioned while it's playing 2018-09-24 18:00:01 +03:00
AndreyL ProductEngine 46481b25cd line endings fix 2018-09-24 17:44:32 +03:00
maxim_productengine 92dc9ceb83 SL-9676 EEP Pick:SELECT SETTINGS limit folder operations options 2018-09-24 16:36:01 +03:00
Rider Linden d0b214fec6 Merged in andreykproductengine/maint-eep (pull request #106) 
SL-1061 EEP prevent invalid settings from getting into environment
 2018-09-21 19:11:39 +00:00
andreykproductengine 1bd1a10109 SL-1061 EEP prevent invalid settings from getting into environment 2018-09-21 18:33:07 +03:00
maxim_productengine 339a5449fc SL-9714 [EEP] Allow changing permissions of environment settings using the bulk perms floater 2018-09-21 18:24:12 +03:00
maxim_productengine 6c9e4e3cf0 SL-9715 [EEP] Allow setting default creation permissions for environment settings 2018-09-21 14:38:32 +03:00
Rider Linden aafb9bebf4 SL-9636: Hide the anyone, group share and for sale checks in the properties panel for settings. 
(didn't do others items it may apply to)
 2018-09-20 15:39:06 -07:00
andreykproductengine 5c997d5ebc SL-9662 [EEP] Slightly shift environment label positions 2018-09-20 17:42:33 +03:00
Rider Linden 4048e28b91 Merge 2018-09-19 15:32:17 -07:00
Rider Linden cae08e0096 SL-9661: Trigger an event when the settings on a parcel or region are changed. Environment panel montiors this event and updates itself when it occurs. 2018-09-19 15:31:23 -07:00
Rider Linden 0d10445d50 Merged in graham_linden/viewer-eep-graham (pull request #101) 
SL-1505
 2018-09-19 20:35:03 +00:00
Graham Linden bc787063aa SL-1505 
Prepend dir names to comments in water shaders to differentiate them in nSight captures.

Fix calc of reflection camera modelview mats to properly reflect the environment.
 2018-09-19 20:41:14 +01:00
Rider Linden 1ef89151bd Merged in graham_linden/viewer-eep-graham (pull request #100) 
SL-9696
 2018-09-19 17:54:48 +00:00
Graham Linden 741d283c0e SL-9696 
Remove squashfarclip hackery to make horizon lines in deferred match non-ALM rendering to avoid seam when rendering deferred.
 2018-09-19 18:47:39 +01:00
Rider Linden 800b08efd0 Merged in andreykproductengine/maint-eep (pull request #99) 
SL-9679 EEP - disable panel elements until data update, null cycle crash fix
 2018-09-19 16:38:21 +00:00
andreykproductengine 9353022c5a SL-9707 EEP Make behavior more consistent for applying inventory 2018-09-19 19:18:55 +03:00
Brad Payne (Vir Linden) 301821337b SL-9680, SL-9673 - set attachment distance floor at 0.01 to avoid triggering divide-by-zero prevention logic. Force HUD attachments to always be full detail. 2018-09-19 15:53:44 +01:00
andreykproductengine ff8f5f52a4 SL-9679 EEP - disable panel elements until data update, null cycle crash fix 2018-09-19 17:48:41 +03:00
maxim_productengine 70a0fabdd8 SL-9672 [EEP] Right-click "Copy Asset UUID" should be inactive 2018-09-19 16:55:36 +03:00
maxim_productengine 2ee39e7df0 SL-9665 FIXED [EEP] "Rename" greyed out for assets in My Environments 2018-09-19 16:54:53 +03:00
Rider Linden 8d627de478 Merge 2018-09-18 15:13:52 -07:00
Rider Linden 616b1e8ec1 Arrows in wave vector ctrl now match world and clouds. North at the top and East to the right. 2018-09-18 15:12:51 -07:00
Graham Linden c9b2759469 SL-1475 
Make stars use higher alpha and brighten reflected color before mixing to get stars to show up in reflections on water.
 2018-09-18 21:54:38 +01:00
Rider Linden 030afe0aaa Merged in graham_linden/viewer-eep-graham (pull request #96) 
SL-1176 and SL-9685
 2018-09-18 20:05:35 +00:00
Graham Linden 862b8f72dc SL-9685 
Make sure legacy opaque water texture ID is assigned so it can be bound for lowest graphics use.
 2018-09-18 20:31:26 +01:00
Graham Linden 08dd04aa98 SL-1176 
Tweak position of sun in disc shader to better match the offset applied to the sun glow in atmospherics.
 2018-09-18 19:47:50 +01:00