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

39269 Commits (62005a3b52ffbc79c78a99fc4a1e2f7911943bfd)

Author SHA1 Message Date
Rider Linden 62005a3b52 Merged in graham_linden/viewer-eep-graham (pull request #84) 
SL-1872
 2018-09-14 15:43:52 +00: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
Graham Linden ef2c61275e Move fname back inside class loop. grumble stringstream grumble. 
Fix sky depth-testing with advanced atmospherics.
 2018-09-10 21:18:37 +01:00
Graham Linden 8a162bc59c Pull fname out of class loop so we can see which actual shader file we were trying to load while debugging. 2018-09-10 20:41:10 +01:00
Graham Linden 642a4ddd60 Fixes for switching between atmospherics implementations on the fly. 2018-09-10 20:39:48 +01:00
Rider Linden 2fd4ce55af MAINT-9115: When selecting no parcel or a parcel without a day cycle, close the day cycle editor if it is not dirty, if dirty just disable commit. 2018-09-10 11:22:36 -07:00
Graham Linden e5c0022a7c Merge 2018-09-10 16:48:26 +01:00
Graham Linden e075c65ee2 First pass at preferences and feature table hookup for advanced atmospherics. 2018-09-10 16:43:49 +01:00
maxim_productengine 598cd8a30f MAINT-9066 EEP should not be able to delete all Keyframes from Ground Level or Water 2018-09-10 17:31:31 +03:00
andreykproductengine 43c8f5959f MAINT-9099 Adjustable region altitudes. 2018-09-10 16:44:56 +03:00
Rider Linden 8c9d758e3a Get rid of (void)this... (this should not have been captured in the first place.) 2018-09-07 17:10:27 -07:00
Rider Linden b239522fea Merge 2018-09-07 16:10:36 -07:00
Rider Linden 114e358aae Work to make edit floaters respect no mod and no trans. Importing no-trans frame will cause day cycle to become no trans. 2018-09-07 16:09:32 -07:00
Graham Linden eb1ddbc142 Merge 2018-09-07 23:13:57 +01:00
Graham Linden 1f69a685eb MAINT-8988 
Make rebuilding sky tex not look up invariant values by converting from LLSD 15 times per pixel.

Set range on density multiplier to be non-zero to clamp light attenuation to sane values.

Fix UI for density multiplier to include 4 decimal places and not show 0.0003 as 0.00
 2018-09-07 22:10:14 +01:00
Graham Linden 0c599af917 Merge 2018-09-07 19:03:52 +01:00
Graham Linden d20c4c17af Nerf OSX warning about use of this in lambda. 2018-09-07 18:51:36 +01:00
Graham Linden 7708708984 Nerf OSX warning about use of this in lambda. 2018-09-07 18:49:07 +01:00
Graham Linden 770baa2852 Merge 2018-09-07 17:27:24 +01:00
Graham Linden 4bd2b8b98b Fix createDensityProfileLayer dropping passed in values. 
Enable sky density panel to update advanced atmo precomputed textures.

Take wild stab at appropriate ranges for density parameters in edit panel UI.

Clean up debug-only code that isn't necessary anymore.

Point autobuild at latest version of libatmosphere package.
 2018-09-07 17:24:29 +01:00