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

41985 Commits (f3c95fce80ea00b999f8debd3dc1d668d7ec39a5)

Author SHA1 Message Date
Callum Prentice f3c95fce80 Pull in a new version of Dullahan that is identical other than a bump in version number 2020-05-05 14:12:51 -07:00
Callum Prentice 27efc55cdb Nonsensical, trivial change to force a build after I ran afoul of a TeamCity buildscripts change 2020-05-04 14:24:28 -07:00
Callum Prentice 691a2d996c Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512 2020-05-04 10:53:11 -07:00
Nat Goodspeed 4a7fd0117a Increment viewer version to 6.4.2 
following promotion of DRTVWR-500
 2020-05-04 12:15:30 -04:00
Callum Prentice 77d2a05921 Pick up first version of new Dullahan build autobuild scripts that builds CEF wrapper first before building Dullahan. Change to version headers meant a change to appviewer.cpp too. 2020-05-03 19:03:22 -07:00
Callum Prentice 25aa0999c6 Fix for SL-13138 - Remove extraneous additon of dullahan_host.exe that crept in trying to make code signing work 2020-04-28 15:52:13 -07:00
Callum Prentice 1305c03a13 Remove dullahan_host.exe from signing list - doesn't change anything security wise and leads to an extra copy of dullahan_host.exe because of a code signing bug 2020-04-28 15:38:45 -07:00
Callum Prentice b9fcd3dbf9 Pull in the Dullahan package from the DRTVWR-512 branch of the canonical Dullahan repository 2020-04-28 15:37:27 -07:00
Callum Prentice 013f7c9c92 Pull in this viewers version of Dullanan (and CEF) - identical to DRTVWR-509 (aduly swim) for now but will evolve 2020-04-28 13:39:37 -07:00
Callum Prentice 9c78928311 Initial port of the changes from DRTVWR509 (Adult Swim) minus the volume fall-off settings updates 2020-04-28 10:57:17 -07:00
Andrey Lihatskiy f20b22e325 AMD CPUs list update 2020-04-21 00:35:19 +03:00
Andrey Kleshchev 231b51f40f Restored SL-12732 after merge conflict 2020-04-20 22:20:16 +03:00
Andrey Kleshchev d9783adba7 SL-13040 Fixed crash at EnvironmentPersistAcrossLogin 2020-04-20 22:03:06 +03:00
Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500 
# Conflicts:
#	indra/newview/pipeline.cpp
 2020-04-20 21:23:34 +03:00
Nat Goodspeed d7f1c88c35 Increment viewer version to 6.4.1 
following promotion of DRTVWR-440
 2020-04-20 14:09:16 -04:00
Dave Houlton 693791f4ff Merged in euclid-13019 (pull request #70) 
SL-13019, fix broken varying linkage on MacOS

Approved-by: Michael Pohoreski
 2020-04-14 19:00:25 +00:00
Dave Houlton ff27f6c8f7 SL-13019, fix broken varying linkage on MacOS 2020-04-14 12:56:40 -06:00
Andrey Kleshchev ee88ebf9e9 SL-13029 Fixed load order 2020-04-13 17:16:10 +03:00
Andrey Kleshchev 483c459e2e SL-13029 Environment update was not applying properly 2020-04-12 12:02:38 +03:00
Dave Houlton 8b3071dd1f Merged in euclid-12975 (pull request #65) 
SL-12975, unfix alpha and undo non-fix magic number of refracted portion of water Fresnel
 2020-04-10 00:40:07 +00:00
Dave Houlton 3c6b666ccd SL-12975, unfix alpha and undo non-fix magic number of refracted portion of water Fresnel 2020-04-09 18:30:33 -06:00
Michael Pohoreski 538a6d737d Merged in SL-10449 (pull request #63) 
SL-10449

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-04-07 23:30:48 +00:00
Ptolemy af7563968c SL-10449: Put first shader error on new line for readability 2020-04-07 16:22:25 -07:00
Ptolemy e4f72db20d SL-10449: Add dumping of shader to log file 2020-04-07 16:21:39 -07:00
Dave Houlton 9e8e623197 SL-10449, add missing linkage variable, fix OSX & Intel deferred shaders comp 2020-04-07 14:23:24 -07:00
Ptolemy 0b717e2d1a SL-10449 Cleanup dumping shader without LOG spam on every line when it fails to compile/link 2020-04-07 14:22:24 -07:00
Ptolemy 4051f5754a SL-10449 Fix off-by-one line numbers when dumping shader that failed to compile/link 2020-04-07 14:07:45 -07:00
Ptolemy 1016b9de18 SL-10449 Fix ALM on OSX 2020-04-07 14:02:48 -07:00
Andrey Lihatskiy 72aad48427 Merged in DRTVWR-500 (pull request #60) 
SL-10993 Fixed Korean font on OSX Catalina

Approved-by: Andrey Kleshchev
 2020-04-06 20:40:48 +00:00
Andrey Lihatskiy 7d992f2331 SL-10993 Fixed Korean font on OSX Catalina 2020-04-06 20:57:33 +03:00
Dave Houlton 81c4c76d6d Merged in euclid-11368 (pull request #58) 
SL-11368, fix missing water uniforms for low shader settings

Approved-by: Michael Pohoreski
 2020-04-03 18:06:51 +00:00
Dave Houlton 0524a1a86f SL-11368, fix missing water uniforms for low shader settings 2020-04-03 11:52:18 -06:00
Michael Pohoreski eb4ceb533d Merged in SL-12852 (pull request #57) 
SL-12852 Cleanup for readability

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-04-03 16:11:22 +00:00
Ptolemy a3f0913b4b SL-12852 Cleanup for readability 2020-04-03 08:10:36 -07:00
Rye Mutt 6058c49bb4 Merged in eep-fix-falloff-edit (pull request #54) 
Fix light falloff being corrupted when editing value via build floater spinner

Approved-by: Dave Houlton
 2020-04-01 00:25:07 +00:00
Rye Mutt c77e4e7a57 Merged in eep-fix-light-color (pull request #53) 
Fix editing light color corrupting intensity and color values

Approved-by: Dave Houlton
 2020-04-01 00:23:57 +00:00
Michael Pohoreski 2cd264f4a8 Merged in SL-12888 (pull request #55) 
SL-12888 Fix space alpha megaprim not using z-test

Approved-by: Dave Houlton <euclid@lindenlab.com>
 2020-03-31 16:53:58 +00:00
Rye Mutt 516ca23659 Update falloff fix with changes requested in review. 2020-03-30 23:27:04 -04:00
Ptolemy 8c46605c32 SL-12888 Fix space alpha megaprim not using z-test 2020-03-30 16:11:54 -07:00
Rye Mutt 3dc71d1ce9 Fix light falloff being corrupted when editing value via build floater spinner 2020-03-30 12:53:11 -04:00
Rye Mutt 8e436fc396 Fix editing light color corrupting intensity and color values 2020-03-30 10:39:10 -04:00
Dave Parks c28852bd9a Merged in davep/DRTVWR-440 (pull request #52) 
SL-12902 Better fix for light color values in color swatch not matching light color values inworld.
 2020-03-27 22:33:57 +00:00
Runitai Linden e468d80186 SL-12902 Better fix for light color values in color swatch not matching light color values inworld. 2020-03-27 17:32:01 -05:00
Dave Houlton f61474fe5b DRTVWR-440, quick fix, add return value - needed for Mac build 2020-03-27 11:24:22 -06:00
Andrey Kleshchev 6620211bff SL-12911 Add Debug setting EnvironmentPersistAcrossLogin 2020-03-27 00:24:08 +02:00
Andrey Kleshchev a7849c6ec4 Removed obsolete and misleading variable 2020-03-27 00:24:07 +02:00
Dave Parks 964597af05 Merged in davep/DRTVWR-440 (pull request #48) 
SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values.
 2020-03-26 22:00:54 +00:00
Runitai Linden d756e18573 SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values. 2020-03-26 16:48:33 -05:00
Dave Houlton a248018d6d Merged in euclid_gDebugGL_inf_loop (pull request #46) 
Fix infinite loop debug message when debugGL flag is enabled.

Approved-by: Michael Pohoreski
 2020-03-26 16:25:53 +00:00
Dave Houlton 126b91f8ee DRTVWR-440, make enabling GLdebug flag slightly less infinite-loopy 2020-03-26 10:24:25 -06:00