0ff65651cc
MAINT-8011 make newly created Sky, Water, etc create a system folder with proper icon
...
Add entries to strings.xml for all langs for the "settings" string.
2018-06-27 23:52:02 +01:00
2464456ef1
MAINT-8809
...
MAINT-8810
Make jumping on daycycle editor timeline with click update the environment.
Fix tab controls staying locked when clicking on a frame after a drag.
2018-06-27 22:45:29 +01:00
5c2f49b865
Make distinct ALM moon shader, tweak mix factor for day vs night moon shading, and fix transposed name of daycycle func.
2018-06-27 22:00:50 +01:00
a98d27d976
Remove unused member vectors of uniforms from LLViewerShaderMgr.
2018-06-27 18:18:14 +01:00
3d3d24e3c1
Fix non-ALM render path to bind the 2nd moon texture (and not blend with the default square).
...
Also fixes MAINT-3962, ALM and non-ALM moon shading should be identical.
2018-06-27 17:52:23 +01:00
71a0d3e959
Fix OSX bug from OLD_SELECT GLSL work-around define not being used with automatically linked feature shaders.
...
Add LL_RELEASE_FOR_DOWNLOAD ifdef around launcher nag.
Fix OSX 10.14 SDK compile issue from unused var in scroll list.
2018-06-26 23:31:03 +01:00
3cd2a35f9d
Crib OSX 10.14 fix for MAINT-8724
2018-06-26 19:09:09 +01:00
520ba7fd21
Crib CMake hack to allow debugging in OSX again.
2018-06-26 18:05:42 +01:00
6dc109a8d2
Remove unnecessary coord sys transformation to fix moon positioning.
...
Avoid doing sky texture generation when using atmospherics shaders (which don't need that texture anyway).
2018-06-26 16:46:38 +01:00
6fb68454d5
Merge
2018-06-25 14:44:56 -07:00
d25f801814
Fix cloud scroll adjustment in the editor, pause clouds method, set sun disk UUID to null.
2018-06-25 14:44:09 -07:00
138f3edf74
Merged in graham_linden/viewer-eep-graham (pull request #7 )
...
Better legacy sky setting sun rot conversion
2018-06-25 18:49:27 +00:00
8a2532ee55
Clean up spaces vs tabs to match sim side code.
2018-06-25 19:22:04 +01:00
8b2d5cb686
Better method for deriving sun/moon quaternions from east/sun angle defs in legacy sky settings XML.
...
Avoid using static const DUE_EAST due to CRT init order issues w/ GCC.
2018-06-25 19:06:48 +01:00
4356b8dc0e
Merged in graham_linden/viewer-eep-graham (pull request #6 )
...
Fix double blend and warnings reported as errors.
2018-06-22 00:07:03 +00:00
02ffb06463
Fix double blend and warnings reported as errors.
2018-06-22 01:00:23 +01:00
f15ee2c965
Merge
2018-06-21 16:50:00 -07:00
b94df67b1f
Editor layout revisions.
2018-06-21 16:49:47 -07:00
a02b3500b9
Make LLSettingsFoo::defaults() funcs only calculate the invariant values once (use static trick ala the validations).
...
Fix conversion of legacy settings w/ non-zero east angles to account for those values being CW radian angles.
2018-06-22 00:41:19 +01:00
52b946fd09
Fix double-def of IMG_BLOOM1 from pulling over server change not needed in viewer code.
...
Make viewer code use LLSettingsSky static func to hide indraconstants dep.
2018-06-21 21:25:15 +01:00
2c0583a271
Merge 5.1.7
2018-06-21 18:40:18 +01:00
91121d113d
Merge server side bugfixes over.
2018-06-21 18:37:00 +01:00
ea75559674
Compile issue with merge. Just use the method default parameters.
2018-06-21 10:33:02 -07:00
f07dc421e8
Merge
2018-06-21 09:13:19 -07:00
dc07de2f4a
increment viewer version to 5.1.7
2018-06-21 08:54:26 -04:00
71b199bd14
Added tag 5.1.6-release for changeset 04538b8157c1
2018-06-21 08:54:26 -04:00
66d78ce1c7
Make water and sky defaults take a position value to allow for default daycycle w/ multiple frames.
...
Make default daycycle add 8 frames at 0, 0.125, 0.25 etc
Merge over server-side bugfixes.
Eliminate extraneous dirty bits in sky settings.
2018-06-15 21:15:02 +01:00
c07775798e
Fix logcontrol.xml with broken XML and put extra warn logging when live files fail to load.
2018-06-13 16:34:37 +01:00
34865c4bb5
Mods to hook up water settings to water normals for rendering with support for current to next blending.
...
Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings.
Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
2018-06-13 00:51:39 +01:00
e2adba65de
Merge
2018-06-12 12:56:53 -07:00
2add1e7abd
Time threshold on timer based updates. Editor can replace frame with one from inventory. Extra check on adding a frame type.
2018-06-12 12:39:59 -07:00
67ab0084f8
Fix env panel forward action.
...
Make env panel update environment when jumping frame to frame.
Add separate funcs for sun/moon vectors in various coord systems.
Make haze glow only pay attention to sun (i.e. fix sun glow when moon is near horizon in daytime).
2018-06-12 18:42:07 +01:00
327ded5129
Remove debug pragma and put setMoonRotation back in the header file.
2018-06-11 22:42:10 +01:00
fc8d0de673
Make cloud rendering use textures defined in sky settings and add code to shaders to lerp between current and next cloud texture.
2018-06-11 22:39:57 +01:00
0f608cb764
Merge
2018-06-11 11:45:11 -07:00
97da85de0b
remove legacy environmental edit floater and some lingering transition functions. Change floater environment switch behavior.
2018-06-11 11:43:50 -07:00
4fbdfe6370
Merge
2018-06-11 17:59:19 +01:00
a0598b1265
Fix water fog consolidation in underwater shaders.
...
Add plumbing facilities to allow current and next moon textures to be passed to moon shader.
Modify moon shader to blend between current and next moon textures by blend factor.
2018-06-11 17:46:16 +01:00
8365945f8a
Settings inventory picker.
2018-06-08 16:40:01 -07:00
507c492182
Add specific shader for the moon to allow different rendering at day vs night.
...
Add MouseMoon positioning ala MouseSun debug setting and accessors to use it.
2018-06-08 22:22:20 +01:00
363f7f84a1
Validation fixes.
2018-06-07 10:24:29 -07:00
8b3957b310
MAINT-8331 EEP UI control: XYVector
2018-06-07 20:22:20 +03:00
442bbfed34
Adding settings DAD type
2018-06-20 12:37:17 -07:00
1f9b8f59af
Don't recalculate lighting every frame. Fix altitude transitions. On track switch ignore time threshold on blender.
2018-06-19 16:46:12 -07:00
8b9ff4487b
Adding some timers for tracking
2018-06-19 12:04:35 -07:00
2f655d117a
Request environment when parcel settings are changed.
2018-06-18 15:48:48 -07:00
7f0c4cb989
Merge
2018-06-06 17:11:29 -07:00
bff5049b92
Various editor fixes. Start adding a settings picker.
2018-06-06 17:10:58 -07:00
caa5bd3cb9
Fix legacy haze validation returning warnings as errors.
...
Add assert that calculated spans are > 0 to avoid div by 0 NaNs.
Make span calc return 1.0 for case where begin == end.
Fix order of ops in LLTrackBlenderLoopingTime ctor causing skies to be init'd with water instances.
2018-06-06 19:48:12 +01:00
5651b433d3
fix xcode build
2018-06-06 03:23:32 +05:30
Graham Linden