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

39337 Commits (405f5c879c44f32635dcb94de2c7dfb9e4a8673a)

Author SHA1 Message Date
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
andreykproductengine ceb336c5f3 SL-1168 EEP Shouldn't be possible to create more than 20 keframes 2018-09-13 16:32:41 +03:00
maxim_productengine a2288ecca3 SL-984 Disable creating EEP settings under Lost and Found folder 2018-09-13 11:40:27 +03:00
Rider Linden f31b35cb5c Merge 2018-09-12 17:27:04 -07:00
Rider Linden 27a76a7e73 SL-1402, SL-1193, SL-976: Corrected strings and layout for named bugs 
("Use Shared Environment", no selection format in panel, Missing String in give object)
Also Rider learned how to spell Committed
 2018-09-12 17:05:27 -07:00
Graham Linden a21fa8664b SL-1127 fix sky tex update with EEP interpolation getting confused 
Disable RenderUseAdvancedAtmospherics in feature table to prevent Ultra from turning it on before its time.
 2018-09-13 00:34:24 +01:00
Graham Linden d4927e8f07 Fix for hanging W64 builds from llcorehttp refcount tests 2018-09-12 22:25:54 +01:00
Graham Linden 6b03cd79d4 SL-9634 turn off nSight debug setting breaking snapshots (glReadPixels is incompatible with nSight debugging) 2018-09-12 20:30:33 +01:00
Graham Linden 211ae97cbd SL-9635 remove init of libatmosphere causing crashes on Intel HD 2018-09-12 20:15:23 +01:00
andreykproductengine c5936bbba0 SL-1961 Icon support for multislider and icons on altitudes slider 2018-09-12 21:02:58 +03:00
Rider Linden 4fe44b9033 SL-9626: When the panel loses visibility the picker is now automatically closed. Also picker checks handle to parent rather than pointer to parent. 2018-09-11 17:10:32 -07:00
Rider Linden 3558377d54 Good grief OSX 2018-09-11 15:23:31 -07:00
Rider Linden be979a0cac OSX gets anoyingly cranky if I don't use a variable. 2018-09-11 14:48:10 -07:00
Rider Linden a0b9c26218 SL-9620: Double check that commit actually passes back a day cycle from the editor. 
Also hide the altitude setting interface for the moment.
 2018-09-11 14:04:43 -07:00
Rider Linden fe28c3e886 Merged in graham_linden/viewer-eep-graham (pull request #77) 
SL-1936 and SL-1912 WIP
 2018-09-11 18:41:52 +00:00
Graham Linden 1207c2fd00 Merge TC CMake fix 2018-09-11 17:52:46 +01:00
Graham Linden fa7b290551 Merge advanced atmo WIP 2018-09-11 17:50:32 +01:00
Graham Linden cd2dc42a28 Hide UI related to advanced atmospherics and make it off by default again. 2018-09-11 17:49:26 +01:00
Graham Linden 24e0e64f2f Fix cloud shader tex binding to be more robust. 
Make vert generation not skip dome verts used for clouds when doing advanced atmospherics.
 2018-09-11 00:23:10 +01:00
Graham Linden 3262446f07 Put back new func dropped in merge. 2018-09-10 23:49:40 +01:00
Graham Linden 87cecc7679 Put back extern decl of gSavedSettings dropped in merge. 2018-09-10 23:26:23 +01:00
Graham Linden 48ec44c2fa Merge 2018-09-10 23:22:42 +01:00
Graham Linden 555dfdc6ef Add copies of existing lighting shaders for advanced atmo path. 
Enable advanced atmo by default.

Disable nSight in settings.xml

Remove MSVC debug pragmas.
 2018-09-10 23:21:34 +01:00
Rider Linden 6246c8077e MAINT-9118: Allow the environment panel to indicated that the environment may be modified. 2018-09-10 14:49:14 -07:00