59a36c2037
Merge
2018-09-04 23:53:05 +01:00
4aaa23fe6d
Update validation range for star brightness to 0 -> 512.
2018-09-04 23:49:49 +01:00
5db0338ace
Put back less debuggable but more terse accum of update conditions.
2018-09-04 23:47:52 +01:00
94d844e187
Remove MSVC debug pragmas.
2018-09-04 23:44:41 +01:00
a65afc30a9
Merge
2018-09-04 23:43:39 +01:00
32631f09a5
8283/4 WIP
2018-09-04 23:41:36 +01:00
0a78e9271c
Make legacy star brightness setting convert to 0-512 range of new settings.
...
Make brightness scale in shader more linear and fix twinkling.
2018-09-04 23:39:21 +01:00
2e55eae9cc
Merge and fix MAINT-9087 and MAINT-9084
2018-09-04 23:08:20 +01:00
d1d248973d
Merged in andreykproductengine/maint-eep2 (pull request #68 )
...
MAINT-8989 Menu updates button instead of executing command
2018-09-04 16:22:01 +00:00
5b11cad690
Merged in maxim_productengine/viewer-eep2 (pull request #67 )
...
MAINT-9064 One more fix for crash caused by new shader calls
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Approved-by: Rider Linden <rider@lindenlab.com>
2018-09-04 16:21:05 +00:00
51fbbf7645
MAINT-9064 One more fix for crash caused by new shader calls
2018-09-04 16:07:49 +03:00
a4c49904c6
MAINT-8989 Menu updates button instead of executing command
2018-09-03 19:32:22 +03:00
a32a4dc636
MAINT-9068 FIXED EEP closing Day Cycle editor by clicking Cancel makes the environment static
2018-09-03 15:20:53 +03:00
fa2b53385e
Better code for finding a file when loading legacy windlights
2018-08-31 14:25:07 -07:00
3b10414c63
Adding optional flags to settings objects.
2018-08-31 11:47:18 -07:00
cb7592e490
Merged in graham_linden/viewer-eep-graham (pull request #65 )
...
MAINT-8983
2018-08-31 16:23:28 +00:00
c46b70c257
Null out shader pointers after passes are complete (prevents them being non-null and masking crashes when graphics prefs change).
2018-08-31 16:33:57 +01:00
d71d656ba4
Merge
2018-08-31 16:25:49 +01:00
6f8f307858
MAINT-8983 cut RenderShadowBias down to -0.004 to get shadows reconnected to the ground
2018-08-31 16:20:30 +01:00
9480ee9a4d
MAINT-9064 Fix crash caused by new shader calls
2018-08-31 16:05:06 +03:00
0c878d7e82
Merge
2018-08-30 21:39:10 +01:00
d452fd77ef
MAINT-9007
...
fix management of water plane and fog Ks shader uniforms
2018-08-30 21:37:10 +01:00
e61fb73f38
Merge
2018-08-30 18:15:26 +01:00
3b0ab35ac1
Merge
2018-08-30 18:08:16 +01:00
8b4d61bd22
Merge
2018-08-30 18:01:04 +01:00
6dd9dd3ab6
MAINT-9064
...
Fix binding of current/next sun/moon textures.
Remove redundant code in GLSLShader determination of tex uniform bindings.
Unhack mix calls in sun/moon shaders to reverse sense of blending (was working around reversed bindings).
2018-08-30 17:54:59 +01:00
51451e0b92
MAINT-9028 put back original pass order to allow depth testing to hide areas where bloom should not show through from sunlight
2018-08-30 01:50:03 +01:00
100a58778b
MAINT-8944 Fix missed mNextFooTextureId updates when jumping between keyframes by forcing mReplaced when sky is replaced.
2018-08-30 00:16:44 +01:00
52f949d71a
Fix range on rayleigh exponential scale factor to include negative values.
2018-08-29 21:14:56 +01:00
964a472461
Hook up sky density panel to fixedenv and edit_ext_daycycle UI.
...
Fix retrieving LLSD for density configs (element not array) in density UI.
Tweak layout of sky density controls.
2018-08-29 21:13:09 +01:00
cb00370c4a
Remove func referring to LLDensityCtrl which we no longer include in the header.
2018-08-29 19:22:47 +01:00
ca75963f3f
Merge
2018-08-29 18:26:54 +01:00
0b3a4c7556
MAINT-8910 FIXED EEP - clicking at settings embedded into notecard does nothing
2018-08-28 18:18:36 +03:00
33597dcd7e
Ensure that settings folder is created at startup.
2018-08-27 16:33:40 -07:00
edda833a35
MAINT-9039 Don't show environment editor floaters in multi-preview
2018-08-27 16:53:45 +03:00
06a77dd5fe
is dirty code in day cycle editor. When environment panel closes disconnect commit hook for crash.
2018-08-24 16:46:07 -07:00
185915aeed
Finish dirty and close warning for fixed environment editors.
2018-08-24 14:25:31 -07:00
d62079002d
Some work on clearDirtyFlag and fix a unit test.
2018-08-24 12:39:14 -07:00
99f855e550
MAINT-9044: Aditi helper_uri uses https
2018-08-24 12:01:02 -07:00
d5f2267369
Remove "Commit" from fixed editor. Check isDirty() before replacing or closing fixed editor.
2018-08-24 11:59:28 -07:00
d965af2b0c
MAINT-9032 Virtual Track Ball improvements
2018-08-24 02:40:12 +03:00
94c24b8713
MAINT-8944 Fix frame transition's images
2018-08-23 20:14:15 +03:00
d7c687b62f
Merged in graham_linden/viewer-eep-graham (pull request #55 )
...
MAINT-9006
2018-08-23 16:54:45 +00:00
b86e899e7e
MAINT-9006
...
Make perspective projection consistent between ALM and non-ALM when drawing water (horizon matches).
Make perspective projection consistent between ALM and non-ALM when drawing heavenly bodies (sun disc position matches).
Make gamma correction of sun disc tex consistent between ALM and non-ALM rendering.
2018-08-23 00:53:11 +01:00
2acd13eef8
Merge
2018-08-22 15:15:17 -07:00
9d3a5fef8f
MAINT-9034, MAINT-9035: Move the load frame button and change the lock icon to text.
2018-08-22 15:12:27 -07:00
f45edabe47
MAINT-9026 hook up sun/moon scale to settingsvo and render code
2018-08-22 23:02:16 +01:00
3b9e6636e5
Merge
2018-08-22 22:46:31 +01:00
28f311b7ff
Don't sun_scale twice. Should have been moon_scale.
2018-08-22 11:55:36 -07:00
84cff0eca2
MAINT-8877: Fix the XML to fix the sizes of the dialogs. (also enforce single instance)
2018-08-22 10:39:17 -07:00
Graham Linden