dbbb89a13c
Merge
2018-07-30 15:55:33 -07:00
d6ede8e81c
MAINT-8904: Creating new setting in inventory now causes simulator to assign default asset ID to inventory item.
2018-07-30 15:54:36 -07:00
d7ae8a0d28
MAINT-8344 EEP Make arrows white
2018-07-30 20:08:58 +03:00
dfe3757236
MAINT-8879 EEP Make image swatches square
2018-07-30 18:38:59 +03:00
c24cbff2ab
MAINT-8830 EEP rename "Default Environment" option in About Land > Environment
2018-07-30 18:04:35 +03:00
bc82509ccd
fix init on array
2018-07-27 12:20:05 -07:00
ed8082a94b
Pausing the clouds will now also stop the waves.
2018-07-27 10:46:32 -07:00
04ddc58714
'override' key word is all or nothing. Add override to method in editor class
2018-07-26 09:51:18 -04:00
b50faa9b6f
Merged in andreykproductengine/maint-eep (pull request #31 )
...
MAINT-8886 EEP - Implement code for load button in fixed environment floater
Approved-by: Simon Linden <simon@lindenlab.com>
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Rider Linden <rider@lindenlab.com>
2018-07-25 17:39:45 +00:00
3bbfd3c676
MAINT-8886 EEP - Implement code for load button in fixed environment floater
2018-07-25 18:46:26 +03:00
c822d8af16
MAINT-8344 implement slider support for an overlap threshold and reenable shift-copy
2018-07-20 19:10:22 +03:00
bb836fcdec
Should have been an empty capture for noop lambdas.
2018-07-19 13:40:47 -07:00
881dc7f3ae
Merged in graham_linden/viewer-eep-graham (pull request #29 )
...
MAINT-8876
2018-07-19 20:35:00 +00:00
e3ef729477
Remove optimization of building skybox as possible source of MAINT-8864
2018-07-19 21:32:35 +01:00
31aa86b703
Compile fixes for latest Xcode on OSX.
2018-07-19 21:11:23 +01:00
5b874db7c0
Modify deferred sun disc and moon shaders to write all deferrred gbuffer channels
...
and fix rendering issue from norm/spec channels during lighting.
2018-07-19 20:46:37 +01:00
80f98daed9
MAINT-8842 Should not be able to add Environment Setting Assets to Group Notices on a Non-EEP region
2018-07-19 22:27:49 +03:00
affb75666c
MAINT-8906 EEP - Disable sky layer tabs when not supported
2018-07-19 19:23:04 +03:00
1abea33b70
MAINT-8334 EEP UI control: Virtual Trackball
2018-07-18 14:13:29 +03:00
9391744164
Add default and wellknown asset ids.
2018-07-16 16:49:49 -07:00
fb3dba5a6e
MAINT-8865 Fixed Day Cycle keyframe cannot be deleted
2018-07-12 18:39:35 +03:00
ca5d5be4fb
Minor change from the simulator to throttle the minimum blend in a time based blend.
2018-07-11 16:46:14 -07:00
d8ca452163
Merged in graham_linden/viewer-eep-graham (pull request #24 )
...
Fix OSX rendering
2018-07-11 17:30:17 +00:00
c7478f200c
Make sun/moon vert shaders use calcAtmospherics in hopes it will get OSX GL to link the shaders without complaining about unwritten varying vars.
2018-07-11 18:03:07 +01:00
658b2be775
Merged in graham_linden/viewer-eep-graham (pull request #23 )
...
Render fixes and performance improvement for advanced atmo codepath
2018-07-10 23:04:45 +00:00
5fade93da8
Make moon/star rendering handle transitions between settings w defined textures and settings without better.
...
Reverse direction of mix to match blend_factor values in stars shader.
2018-07-11 00:01:12 +01:00
ffdd6c3d7d
Make advanced atmo sky shader compile again.
...
Make atmospheric model avoid redundant work when settings don't change.
Point autobuild.xml at libatmosphere with op== to compare density profiles.
2018-07-10 23:26:35 +01:00
7724ace152
Merge
2018-07-10 15:16:50 -07:00
294793b9a9
MAINT-8821: Tighten up floater. Allow apply from gear menu.
2018-07-10 15:15:47 -07:00
9da2480891
Merged in graham_linden/viewer-eep-graham (pull request #22 )
...
Support blending current/next bloom textures in deferred star rendering.
2018-07-10 20:30:44 +00:00
a90e61b798
Support blending current/next bloom textures in deferred star rendering.
2018-07-10 19:08:14 +01:00
b83c028c00
Merged in graham_linden/viewer-eep-graham (pull request #21 )
...
Fix star rendering issues in ALM.
2018-07-10 17:25:35 +00:00
4fde1adbcf
Fix star rendering issues in ALM.
2018-07-10 18:23:02 +01:00
e7ed4b4584
Merged in graham_linden/viewer-eep-graham (pull request #19 )
...
Fix mat stack overflow and broken snapshots in ALM.
Approved-by: Rider Linden <rider@lindenlab.com>
2018-07-10 16:40:38 +00:00
e61d7ac009
MAINT-8833 EEP UI should be either responsive or indicate that it is disabled.
2018-07-10 17:09:47 +03:00
26b6cc5160
MAINT-8821: Clean up some of the selection and enable/disable code, Add menu for adding settings.
2018-07-09 17:06:24 -07:00
21d165011b
Attempting to create a settings inventory item on a non-eep region will now show a visible failure message to the user. Menu items for greating settings in inventory are disabled on non eep regions.
2018-07-09 13:26:48 -07:00
cafea5d9bb
Test Hg coding policy hooks.
2018-07-09 19:36:38 +01:00
fd7b0acd9f
Test Hg coding policy hooks.
2018-07-09 19:35:00 +01:00
a9fba594dd
Restore setting the inv proj matrix for advanced atmo render path.
...
Set nSight debug setting to 0 to fix ALM snapshots.
Add popMatrix call to balance push around heavenly body rendering in ALM and fix mat stack overflow.
2018-07-09 18:27:01 +01:00
0bf678e23b
MAINT-8827 EEP Edit Day Cycle window needs Save & Cancel buttons linked to bottom of the window
2018-07-05 18:30:56 +03:00
9bacdc9886
Fix up sun glow/size bindings in edit panel.
2018-07-04 01:33:22 +01:00
a682d91ea1
Fix deferred stars shader output decl.
2018-07-03 23:20:42 +01:00
cb178672c6
Merge
2018-07-03 14:19:52 -07:00
a4137d72eb
MAINT-8821: New "My Environments" floater. First pass.
2018-07-03 14:18:24 -07:00
8969b11435
MAINT-8838 render a sun disc if the texture(s) are provided by WL settings (default is no sun disc and just haze)
...
Refactor sky texture optimization to retain building the cubemap used by shiny.
2018-07-03 16:37:32 +01:00
9717589a55
MAINT-8837 fix legacy haze validation to make all params optional
2018-07-02 23:15:38 +01:00
ab159f7c4a
Merged in graham_linden/viewer-eep-graham (pull request #13 )
...
MAINT-4019 fix star rendering in advanced lighting mode
2018-06-29 23:50:31 +00:00
affd9ac094
Add menu item for "My Environments"
2018-06-29 16:23:48 -07:00
ec496d5e1a
MAINT-4019 fix ALM star rendering (make post-deferred and actually blend)
2018-06-30 00:22:10 +01:00
Rider Linden