Commit Graph

39918 Commits (75171ee5d1a68e25abe899fdb997ba6df06f7529)

Author SHA1 Message Date
Graham Linden 75171ee5d1 Merge 2019-01-04 16:18:18 -08:00
Rider Linden e9a2e8f88c Added new LLSINGLETON macro that includes override keyword. 2019-01-04 14:03:02 -08:00
Graham Linden 450d1806b9 Merge 2019-01-04 13:36:58 -08:00
Graham Linden c007e1197c Convert to using shared shadow sampling function (reduce duplicated code blocks in several shaders). 2019-01-04 13:26:47 -08:00
Rider Linden 1ee1a086ce Merge 2019-01-04 13:19:16 -08:00
Rider Linden 0969632b11 Move some estate requests into the LLEstateInfoModel and out of the Region floater.
Fix issue where user could potentially be looking at one set of estate options and update the estate they were standing in by mistake.
2019-01-04 12:32:23 -08:00
Graham Linden c55fa2cf13 Merge 2019-01-04 10:37:31 -08:00
Graham Linden 2312efbf3a Add new shaders for generating shadows from clouds.
Add new class3 shadow shaders for VSM shadows.

Add disabled shadow pass in WLSky for using above.
2019-01-04 10:17:09 -08:00
andreykproductengine 69a84d8172 SL-10279 Fix altitude description repositioning code 2019-01-04 17:09:09 +02:00
Graham Linden 01da53764b Fix per-frag fullbright soft clip convenience funcs to include additive and atten args. 2019-01-03 16:21:07 -08:00
Graham Linden 30fc38603a Fix two files stomped my merging VR before a downstream branch. 2019-01-03 11:22:46 -08:00
Graham Linden cccb3a541c Merge 2019-01-03 08:47:03 -08:00
Graham Linden 744e22e364 Merge VR 2019-01-03 08:46:45 -08:00
Rider Linden d607d81dba SL-10279: Temp fix for stale estate info when editing parcel environment. 2019-01-02 17:10:15 -08:00
Rider Linden 5fe626afab SL-10279: Most functionality now present. Still needs some cleanup on the bump code. 2019-01-02 15:13:47 -08:00
Rider Linden fb093ce412 Merge 2018-12-21 15:31:37 -08:00
Rider Linden 8227a0b270 SL-10279: Rework the environment pannel. Still in progress. 2018-12-21 15:30:57 -08:00
maxim_productengine 91952ec0a5 SL-10275 FIXED [EEP] Pressing Enter while setting "Settings From Inventory" opens the Day Cycle 2018-12-21 17:45:06 +02:00
maxim_productengine dfe9a02a9b SL-10274 FIXED [EEP] Settings object created by Save As cannot be copied from an object 2018-12-20 16:09:10 +02:00
Graham Linden 07bff3129a Add new shaders for advanced atmo SH env lighting calcs. 2018-12-19 14:59:19 -08:00
Graham Linden 0b357e457b Fix broken culling when rendering water reflection (unstable for many scene elements when 'Everything' is turned on). 2018-12-19 09:57:31 -08:00
Graham Linden 765ad6bb7e Merge 2018-12-17 14:39:40 -08:00
Rider Linden 634910f685 SL-10241: Group roll for changing environment. 2018-12-14 14:33:42 -08:00
Rider Linden 56d9d204f7 Merge 2018-12-13 15:52:44 -08:00
Nat Goodspeed a3b3ad727f increment viewer version to 6.0.2 2018-12-13 16:46:12 -05:00
Nat Goodspeed 1de96a0a85 Added tag 6.0.1-release for changeset 21b7604680ef 2018-12-13 16:46:11 -05:00
Rider Linden 9475a593a1 Merge 2018-12-12 14:07:56 -08:00
Rider Linden 70ac8d9fa7 SL-10238: Viewer spport for push notifications from the simulator contaiting partial groups of settings. Blend these settings into the current environment. 2018-12-12 14:07:23 -08:00
maxim_productengine 1cc8286c20 SL-10188 [EEP] add/delete/load should be disabled while the timeline "Play" button is engaged. 2018-12-12 15:27:27 +02:00
Graham Linden cdc540a5c4 Merge 2018-12-11 15:42:41 -08:00
Graham Linden 89385d1aa3 Merge 2018-12-11 08:00:22 -08:00
maxim_productengine dbcd1c2735 SL-10186 FIXED When attempting to apply Day Offset of 0.0 the slider jumps to the last set Offset value 2018-12-11 13:24:48 +02:00
Graham Linden 8c128f5b63 Mods to allow using ALM rendering in water reflections so
the reflections will better match what they're reflecting
when ALM is enabled.
2018-12-10 15:02:34 -08:00
andreykproductengine 87e83274f7 SL-9924 [EEP] Environment Settings permissions can be dropped by Save As button 2018-12-10 20:21:18 +02:00
Rider Linden a20b5bd51e Merged in andreykproductengine/maint-eep (pull request #210)
SL-10091 and SL-1894

Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
2018-12-10 17:18:29 +00:00
maxim_productengine ca336f26db SL-9698 [EEP] Add beacons that point to sun & moon position 2018-12-10 17:35:29 +02:00
andreykproductengine 6762c4515a SL-1894 When crossing regions altitude slider could misbehave 2018-12-07 17:10:05 +02:00
andreykproductengine d4fe87cca4 SL-10091 Prevent info floater from re-requesting data when not open 2018-12-07 16:24:47 +02:00
Graham Linden 13d1f84bf6 Merge 2018-12-06 12:52:14 -08:00
Graham Linden 7e9033821a De-duplicate deferred gbuffer access for getPosition/getNorm.
De-duplicate ambient occlusion shader code and move to new aoUtil.glsl

Split shared shadow tap funcs into shadowUtil.glsl
2018-12-06 10:59:11 -08:00
Rider Linden cf7658ca3b Merged in maxim_productengine/viewer-eep (pull request #209)
SL-10165 Load Frame button on Day Cycle editor is not working when a frame is selected
2018-12-06 17:44:35 +00:00
Rider Linden 5345c1d00f Merged in andreykproductengine/maint-eep (pull request #208)
SL-10091 EEP Filter out dupplicate refreshes and callbacks
2018-12-06 17:43:51 +00:00
maxim_productengine ff334b6829 SL-10165 Load Frame button on Day Cycle editor is not working when a frame is selected 2018-12-06 17:41:05 +02:00
Graham Linden 26c1430a04 Shader cleanup and consolidation of use of sRGB conversion funcs. 2018-12-05 13:08:06 -08:00
andreykproductengine 76071d4fe8 SL-10091 EEP Filter out dupplicate refreshes and callbacks 2018-12-05 22:13:49 +02:00
Rider Linden 031dabede8 Merged in andreykproductengine/maint-eep (pull request #195)
SL-9924 [EEP] Environment Settings permissions can be dropped by Save As button
2018-12-05 18:08:31 +00:00
andreykproductengine 7650fb53c8 [EEP] NULL gAtmosphere crash fix 2018-12-05 18:10:08 +02:00
maxim_productengine 2f188b36d9 SL-10167 Change wording on Add/Load/Delete buttons in the day editor 2018-12-05 17:14:06 +02:00
maxim_productengine f0afc19bee SL-10166 FIXED Sky editor add/delete frame not enabling disabling correctly 2018-12-05 15:32:17 +02:00
AndreyL ProductEngine 3d59b774f7 Merged INTL-316 2018-12-04 23:18:15 +02:00