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

72992 Commits (23edfd0bfa4a0e3ec2b2ff80cf956a8bcd39c55b)

Author SHA1 Message Date
Ansariel 23edfd0bfa Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
 2024-01-25 20:39:44 +01:00
Andrey Kleshchev ea4dc1f35d SL-20669 Force blank normal id into a local blank normal texture 
Dataserver's version has compression artifacts
 2024-01-24 17:40:01 +02:00
Andrey Kleshchev 869712e273 SL-20669 Move constants out of settings.xml 
UIImgInvisibleUUID doesn't exist
Default normal for material is 'null'
 2024-01-24 17:40:01 +02:00
RunitaiLinden 79f5231db2
Create test plan for optimizeAwayAlpha (#663) 2024-01-23 15:45:33 -06:00
Ansariel fa05f94eae Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/app_settings/settings.xml
 2024-01-23 12:23:54 +01:00
nat-goodspeed e4974b5174
Merge pull request #596 from secondlife/DRTVWR-601-gha-libs 
Update mikktspace, tinygltf, vulkan_gltf packages to GHA builds.
 2024-01-19 13:18:20 -05:00
Nat Goodspeed 0752cc0792 DRTVWR-601: Merge branch 'release/gltf-maint2' into DRTVWR-601-gha-libs 2024-01-19 11:38:02 -05:00
RunitaiLinden 586e4cd090 SL-18429 Make it so auto adjusting legacy skies merely turns on tonemapping. 2024-01-17 12:14:44 -06:00
Ansariel c7a44ac88b Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/lltexturectrl.h
 2024-01-17 11:04:36 +01:00
Ansariel d1888e8f20 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 2024-01-17 10:29:44 +01:00
Andrey Kleshchev 71bcc89776 SL-20669 Material editor uses incorect blank normal maps 2024-01-16 22:52:41 +02:00
Rye Mutt bf43a8574c
Fix failure to optimize away alpha channel on some GLTF upload paths (#606) 
Co-authored-by: RunitaiLinden <davep@lindenlab.com>
 2024-01-16 11:09:26 -06:00
Ansariel Hiller 0fa6ff2b1f
Undo re-ordering of autobuild.xml (#638) 2024-01-16 11:08:39 -06:00
Beq 1ce2844774 Merge branch 'largercaches' 2024-01-13 00:42:07 +00:00
Beq bb287a11c9 Allow larger caches (asset and texture) 
sensible limit (in MB)
 2024-01-13 00:41:37 +00:00
RunitaiLinden 21e87f8999 Merge branch 'DRTVWR-601' of github.com:secondlife/viewer into DRTVWR-601 2024-01-12 12:40:09 -06:00
RunitaiLinden 25d7828bec DRTVWR-601 Fix for Tracy instrumentation (Tracy doesn't play nice with coroutines). 2024-01-12 12:39:57 -06:00
Andrey Kleshchev 2c8532bdc7 SL-20629 Fix Probe ambiance being displayed as 0 when it isn't 
And hide warning when it's already 0
 2024-01-12 20:08:17 +02:00
Andrey Kleshchev 577706eddc SL-20629 Fix first opened legacy env displaying probe ambience as '1' 2024-01-12 20:08:17 +02:00
Ansariel b592795c0b Updated Havok lib with the presumed navmesh fix 2024-01-12 18:15:04 +01:00
Zi Ree b8916c0e30 Add nullptr check to corrupt sound protection, thanks to Rye for this and the AO crash fix 2024-01-12 04:29:33 +01:00
Zi Ree bb69ff2e6a Add nullptr check to AO as crash prevention 2024-01-12 04:20:53 +01:00
Zi Ree 3a767fbacf Fix avatar hitboxes when a mesh attachment breaks the avatar draw face 2024-01-12 03:26:51 +01:00
Zi Ree 4a45eab7f2 Vintage: use same wording for Sort by Most Recent as the default skin 2024-01-12 02:52:29 +01:00
Zi Ree c3b394ae43 Fix merge oops, texture picker filter needs to hide in non-inventory modes 2024-01-11 18:53:00 +01:00
RunitaiLinden bce1434d03 Merge branch 'DRTVWR-601' of github.com:secondlife/viewer into DRTVWR-601 2024-01-10 13:50:31 -06:00
RunitaiLinden fab4cfbab2 SL-20704 Fix for pathfinding debug display not working. 2024-01-10 13:50:15 -06:00
cosmic-linden 5443a18ba6
Merge pull request #624 from secondlife/andreyk/SL-19555 
SL-19555 Fix picker failing to highlight default material in inventory
 2024-01-09 16:51:21 -08:00
Andrey Kleshchev 390a5031dc SL-19555 Fix picker failing to highlight default material in inventory 2024-01-10 01:43:36 +02:00
RunitaiLinden 983a3c7207 SL-20780 Clean up some dead code. 2024-01-09 15:52:33 -06:00
Ansariel cd4883fccc Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/xui/en/strings.xml
 2024-01-09 11:30:13 +01:00
Ansariel 10f5b990d3 Merge branch 'main' of https://github.com/secondlife/viewer 2024-01-08 20:36:50 +01:00
Ansariel 725f7b747a Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 2024-01-08 20:34:32 +01:00
Brad Linden 8d16d6e620 Merge remote-tracking branch 'origin/main' into DRTVWR-601 2024-01-08 11:30:56 -08:00
Nat Goodspeed 77395eddc9 Increment viewer version to 7.1.3 
following promotion of DRTVWR-596
 2024-01-08 14:22:05 -05:00
Ansariel 823addfdc0 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/newview/vjlocalmeshimportdae.cpp
 2024-01-08 20:19:30 +01:00
Beq 7a0168c931 Add texture cache monitor to the texture view 
shows used vs max.
 2024-01-07 21:07:51 +00:00
Zi Ree cfcbd6fc54 Linux: selectively disable a few compiler warnings that are most likely bogus 2024-01-07 18:45:08 +01:00
Ansariel 084ee08f9b Fix some more... 2024-01-07 16:46:15 +01:00
Ansariel 2737820ca8 Fix some... 2024-01-07 16:34:14 +01:00
Andrey Kleshchev 4392f1bc8f SL-20748 Fix library materials not being previewable on an object 2024-01-05 20:03:14 +02:00
Ansariel a8f43fd40b Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-01-05 13:17:23 +01:00
Ansariel 8d59c0b1a3 Add readme file 2024-01-02 17:38:47 +01:00
Ansariel 5e759054ca FIRE-33578: Reset defaults doesn't reset materials upload folder 2024-01-01 16:22:15 +01:00
Ansariel 0e154e344e It's 2024... basically... almost... 2023-12-31 14:06:25 +01:00
Zi Ree 9d40b25f1a Merge branch 'master' of github.com:FirestormViewer/phoenix-firestorm-ll-master 
Merge vcs changes to github
 2023-12-29 23:41:04 +01:00
Zi Ree 869c8d1882 Add label / caption color support to texture picker, fix label width setting and remember to also add the required parameters to the skin 2023-12-29 20:32:28 +01:00
Zi Ree d75ba744a8 Also add the required parameters to the skin ... 2023-12-29 20:29:58 +01:00
Zi Ree 8776d50ef4 Add label / caption color support to color swatches 2023-12-29 20:28:05 +01:00
Zi Ree fdeddfcdf2 Remove unnecessary include 2023-12-29 20:21:58 +01:00