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

39310 Commits (0d10445d50b816699e86643b641c53cce2179a67)

Author SHA1 Message Date
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 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
Rider Linden c5283f63ab Merged in andreykproductengine/maint-eep (pull request #94) 
SL-9670 and SL-9678

Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
 2018-09-18 18:17:54 +00:00
andreykproductengine 89c48daf35 SL-9678 EEP Sometimes not switching inventory based environments 2018-09-18 18:37:18 +03:00
maxim_productengine e53d35f4e8 SL-1258 FIXED [EEP] Custom cloud, sun & moon textures don't update when you apply a Windlight sky locally. 2018-09-18 17:38:06 +03:00
andreykproductengine 6858f007c7 SL-9670 [EEP] 'New Day' is named as 'Default' in the Day Cycle editor. 2018-09-18 17:13:27 +03:00
Rider Linden fb0212b853 override is no longer optional. 2018-09-17 14:30:25 -07:00
Rider Linden a11706b388 Merge 2018-09-17 14:22:06 -07:00
Rider Linden 17fb7d0bf4 SL-9667, SL-9669: Do not attempt to request environment for non-eep parcels, use handle to panel passed to static for callbacks. 2018-09-17 14:21:38 -07:00
Rider Linden 5fa543fd5c Merged in graham_linden/viewer-eep-graham (pull request #93) 
SL-9618
 2018-09-17 19:38:31 +00:00
Graham Linden eb5038fe75 SL-9618 
Remove extraneous linear to sRGB conversion causing underwater refracted screen tex to be brighter than it should be.
 2018-09-17 20:09:58 +01:00
Rider Linden 027bc36259 Merged in graham_linden/viewer-eep-graham (pull request #92) 
SL-1491 and SL-1873
 2018-09-17 19:04:32 +00:00
Graham Linden 9581a197ac SL-1873 
Make range of star brightness in code and in UI 0-500 (not 512).
 2018-09-17 19:48:58 +01:00
Graham Linden 57d89c8094 SL-1491 take two: fix non-ALM/class2 atmospherics additive artifacts 
Modulate class1 softenLight atmospheric additive by specular.a (same fix as for class2).

Clamp additive color to <= vec3(0.2) to avoid similar artifacts in non-deferred render path.
 2018-09-17 19:40:21 +01:00
andreykproductengine 53a93d3e73 SL-9654 EEP Double click should apply instead of opening in settings picker 2018-09-17 20:29:45 +03:00
Rider Linden 8a65439c76 Merged in andreykproductengine/maint-eep (pull request #89) 
SL-9650 EEP environment panel should not animate

Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
 2018-09-17 16:41:43 +00:00
maxim_productengine 8f44ac2319 SL-9664 FIXED [EEP] File pickers are not threaded 2018-09-17 17:03:10 +03:00
andreykproductengine 59a92c8523 SL-9650 EEP environment panel should not animate 2018-09-17 16:51:45 +03:00
Rider Linden 636839a47c Merged in graham_linden/viewer-eep-graham (pull request #88) 
SL-9632
 2018-09-14 21:48:47 +00:00
Graham Linden 1df7760d31 SL-9632 add uniform and code to supress atmospherics in all shaders that could be used by HUDs 
Make sky and cloud shaders use common scaleSoftClip implementation in gammaF.glsl
 2018-09-14 21:52:52 +01:00
Rider Linden 6298f0b0e3 Merged in graham_linden/viewer-eep-graham (pull request #87) 
SL-1491
 2018-09-14 19:21:16 +00:00
Graham Linden a167f8857f SL-1491 
Fix name at top of the 3 softenLight shaders so we can differentiate which is in use when using nSight debug.

Made class2 softenLightF shader modulate the atmospherics additive to only specular shading to fix lens flare on terrain etc.
 2018-09-14 18:42:41 +01:00
Rider Linden 7c6ac0740d SL-1556: Correctly identify when the selected parcel is in another region and display a message about cross region environments. 2018-09-14 09:52:28 -07:00
Rider Linden 3dd286064e Merged in andreykproductengine/maint-eep (pull request #86) 
SL-9653 Multy slider edge overlap cases

Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
 2018-09-14 15:45:28 +00:00
Rider Linden 13efe74bc1 Merged in maxim_productengine/viewer-eep (pull request #85) 
SL-9656 and SL-9652 fixed
 2018-09-14 15:44:31 +00:00
Rider Linden 62005a3b52 Merged in graham_linden/viewer-eep-graham (pull request #84) 
SL-1872
 2018-09-14 15:43:52 +00:00
andreykproductengine 3988bc8d85 SL-9653 EEP Blender abruptly jumps from correct value to initial 2018-09-14 18:27:31 +03:00
andreykproductengine 8290206887 SL-9653 Multy slider edge overlap cases 2018-09-14 17:52:08 +03:00
maxim_productengine a2bd8673d7 SL-9652 FIXED EEP Not allowed characters can be used for Environment Assets name 2018-09-14 16:03:05 +03:00
maxim_productengine d1f746ff7f SL-9656 FIXED EEP viewer crash after opening About Land and then right-clicking a Day Cycle in Inventory 2018-09-14 15:47:52 +03:00
Graham Linden 46d194d352 SL-1872 make daycycle water editor normal map texture control use proper blank normal map asset 2018-09-14 00:11:03 +01:00
Graham Linden 2f9d08f48d Spruce up the non-ALM stars too. 2018-09-13 22:08:06 +01:00
Rider Linden 53de3916a1 Explicit cast for LLUIColor 2018-09-13 10:48:55 -07:00
Rider Linden 86a38d1ea2 Remove optimize pragma for mac 2018-09-13 09:45:29 -07:00
Rider Linden 079f5f6da9 Merged in andreykproductengine/maint-eep2 (pull request #82) 
SL-1168 and SL-1307
 2018-09-13 16:31:36 +00:00
Rider Linden 3af4837032 Merged in andreykproductengine/maint-eep (pull request #78) 
SL-1961 Icon support for multislider and icons on altitudes slider

Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Rider Linden <rider@lindenlab.com>
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
 2018-09-13 16:28:56 +00:00
andreykproductengine bb52cdf4f0 SL-1307 EEP At startup viewer does not recognize what parcel you are on. 2018-09-13 18:36:47 +03:00
maxim_productengine 3928710cc7 SL-9625 EEP "Save As" and "Save" are initially unavailable in Day Cycle 2018-09-13 17:43:13 +03:00