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

70457 Commits (d61d70e19dfd6bf40c6b75b1678b216d8c8e043d)

Author SHA1 Message Date
Zi Ree d61d70e19d Linux: make it build 2023-04-16 18:19:07 +02:00
Ansariel 51d1cf67e0 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/00-Common.cmake
#	indra/cmake/CMakeLists.txt
#	indra/cmake/Tracy.cmake
#	indra/llprimitive/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llvopartgroup.cpp
 2023-03-31 22:36:07 +02:00
Ansariel 68e5f326b3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	.gitignore
#	indra/cmake/00-Common.cmake
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GLEXT.cmake
#	indra/cmake/LLCommon.cmake
#	indra/cmake/LLMath.cmake
#	indra/cmake/LLRender.cmake
#	indra/cmake/Tracy.cmake
#	indra/llprimitive/CMakeLists.txt
#	indra/llrender/llglheaders.h
#	indra/llrender/llglslshader.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llface.cpp
#	indra/newview/lltexturefetch.h
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvopartgroup.cpp
#	indra/newview/llxmlrpctransaction.cpp
 2023-03-31 18:54:16 +02:00
Ansariel 95e73bf131 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/llviewermedia.cpp
 2023-03-31 17:03:50 +02:00
Ansariel 7625a540e4 FMOD Studio update to 2.02.13 for crappy Mac, attempt #2 2023-03-31 09:46:42 +02:00
Brad Linden e4173ea5cc Merge remote-tracking branch 'refs/remotes/origin/DRTVWR-559' into DRTVWR-559 2023-03-30 17:24:23 -07:00
Dave Parks c0958922c3 DRTVWR-559 Auto exposure tuning (fix horizon). 2023-03-30 18:41:34 -05:00
Dave Parks 46702c4e80 DRTVWR-559 Auto exposure tuning. 2023-03-30 18:19:32 -05:00
Dave Parks 70bdf55439 SL-19517 Followup -- fix broken fallback probe. Adjust water brightness. 2023-03-30 16:24:04 -05:00
Brad Linden 1b6cd23abd CMake and tests fixups after merge with main for DRTVWR-559 2023-03-30 13:46:00 -07:00
Dave Parks e8114dbe14 SL-19517 Fix for RenderReflectionProbeCount other than 256 causing black reflections. 2023-03-30 14:53:01 -05:00
Dave Parks 3494a61ebf DRTVWR-559 Fix for build breakage. 2023-03-30 14:30:09 -05:00
Dave Parks b4fcca60f1 Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559 2023-03-30 13:15:05 -05:00
Dave Parks b5917fbd16 DRTVWR-559 Reduce probe flashing and exposure flickering. 2023-03-30 13:14:23 -05:00
cosmic-linden 01b99278bf
Merge pull request #143 from secondlife/SL-19331 
SL-19331: Unlock mutex when bailing out from bad media state
 2023-03-30 10:21:32 -07:00
Cosmic Linden 35acfb15b6 SL-19331: Unlock mutex when bailing out from bad (hopefully doesn't happen) media state 2023-03-30 09:16:00 -07:00
Dave Parks 9a03c819d4 Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559 2023-03-30 10:42:04 -05:00
Dave Parks 6162b9208a DRTVWR-559 Add RenderAutomaticReflectionProbes control. Tweak automatic exposure. 2023-03-30 10:41:04 -05:00
Pork Chop 934616de29 Linux: Restore more linux specific cmake configuration that went bye bye in the last merge - fixes the ability to toggle between internal/external browsers in preferences 2023-03-31 01:07:46 +11:00
Pork Chop e5c681ce8e Linux: Restore crashreporting (hopefully) 2023-03-31 00:05:29 +11:00
Ansariel 492a11fe8b Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-573 2023-03-30 02:53:56 +02:00
Ansariel bfad8764a0 Update German translation 2023-03-30 02:53:04 +02:00
Ansariel b29cfa8159 Merge branch 'main' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llimview.cpp
#	indra/newview/skins/default/xui/en/strings.xml
 2023-03-30 02:51:16 +02:00
Ansariel 69fd2d9973 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/cmake/00-Common.cmake
 2023-03-30 02:49:33 +02:00
Ansariel a562244671 No FMOD Update for you, crappy Mac! 
This reverts commit c9d2db1775.
 2023-03-30 02:45:02 +02:00
Pork Chop 8d6c2687c9 Fix for FIRE-32843 - typo in phototools tooltip 2023-03-30 10:57:00 +11:00
cosmic-linden 9e6d442ab5
Merge pull request #142 from secondlife/SL-19331 
SL-19331: Prevent some unnecessary image updates on media prims
 2023-03-29 15:42:31 -07:00
PanteraPolnocy ae53593dad FIRE-32842, FIRE-32841 Updated Russian translation (by Romka Swallowtail), French translation (by Laurent Bechir) and Polish one; Alpha channel related 2023-03-30 00:30:48 +02:00
Brad Linden a548c16989 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-03-29 14:54:06 -07:00
Dave Parks f5fb3ae271 DRTVWR-559 Drop the upper bound on exposure. 2023-03-29 16:53:19 -05:00
Cosmic Linden 8018e7935a SL-19331: Clarify that mipmapping on media prims being disabled is known behavior that should be corrected at some point 2023-03-29 14:11:43 -07:00
Nat Goodspeed c7053a6928 Increment viewer version to 6.6.11 
following promotion of DRTVWR-573
 2023-03-29 16:56:36 -04:00
Dave Parks b130831106 DRTVWR-559 Dynamic exposure followup -- stochastic sampling, weight based on luminance and distance to center of screen, rebalance night, don't rely on blending not clamping R16F. 2023-03-29 13:24:07 -05:00
Cosmic Linden a2a777ebe4 SL-19331: When initializing a media prim, set the mipmap state correctly from the beginning 2023-03-29 10:28:21 -07:00
Cosmic Linden bf9d090045 SL-19331: No need to create texture in doMediaTexUpdate - should already be handled by preMediaTexUpdate 2023-03-29 09:36:35 -07:00
Ansariel b1ec350c4b Update German translation 2023-03-29 16:16:06 +02:00
Ansariel c9d2db1775 Update FMOD Studio to 2.02.13 on OSX 2023-03-29 16:06:35 +02:00
Dave Parks 4f651bceab Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559 2023-03-28 15:52:01 -05:00
Dave Parks 81c440a4a9 DRTVWR-559 Dynamic exposure followup -- balance moon brightness and add glow to exposure sample. 2023-03-28 15:51:29 -05:00
Dave Parks 10f66c0519 DRTVWR-559 Dynamically adjust exposure. 2023-03-28 14:30:59 -05:00
Jonathan "Geenz" Goodman 320beaad85 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into DRTVWR-559 2023-03-28 09:46:09 -07:00
Jonathan "Geenz" Goodman 08cd239c5f Update the feature table. 
SL-18563
 2023-03-28 09:46:07 -07:00
Dave Parks 9bf08f553a Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559 2023-03-27 18:30:05 -05:00
Dave Parks b81761c1d0 DRTVWR-559 Bump down ambiance scale to compensate for HDRishness. 2023-03-27 18:29:35 -05:00
Dave Parks 366bae1496 DRTVWR-559 Fix for off-white metal not looking chromed when it should (fake hacky HDR sky reflections). 2023-03-27 18:22:53 -05:00
Jonathan "Geenz" Goodman 91a9a94df1 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into DRTVWR-559 2023-03-27 15:06:27 -07:00
Jonathan "Geenz" Goodman 6c554c9c92 Fix up the graphics setting detection 
SL-18563
 2023-03-27 15:06:25 -07:00
Zi Ree 9f6fff9af4 Add detection of empty/almost empty alpha layers in image uploads and strip those layers by default, unless instructed otherwise. 2023-03-27 22:00:14 +02:00
Brad Linden d6cf9e2772 Attempt to fix build breakage for DRTVWR-559 2023-03-27 22:04:02 +03:00
Dave Parks c20058b7a7 SL-18563 Pull featuretable settings for avatar impostors and volume lod from auto-fps viewer 2023-03-27 13:31:45 -05:00