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

495 Commits (c12c377c6129f63f119e9aaee63d8b2ec17268d3)

Author SHA1 Message Date
Ansariel c12c377c61 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
 2023-10-01 18:18:17 +02:00
Andrey Kleshchev 1b493d5690 SL-20343 Material floater was disconnected from object's face 2023-09-28 03:55:43 +03:00
Maxim Nikolenko 6e32993c87
SL-20338 FIXED Texture tab Material drop-down does not change if same numbered face is selected 2023-09-26 13:59:31 +03:00
Ansariel 4532e17e3d Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llpanelface.cpp
 2023-09-20 15:07:19 +02:00
Andrey Kleshchev 97ee8b207b SL-5522 Fix applying textuers and materials with limited restrictions to attachments 
1. Texture picker now updates filter's permissions based on selection
2. Various panels now properly check permissions
 2023-09-19 01:01:43 +03:00
Ansariel 9c338b3167 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llpanelface.cpp
 2023-09-07 15:47:51 +02:00
Cosmic Linden ab66df94cb SL-20167: Also check permission on paste to be certain 2023-09-06 11:02:31 -07:00
Cosmic Linden 05c8ef3f3c SL-20167: Grey out the clipboard when copying the material to clipboard is not allowed 2023-09-01 17:36:00 -07:00
Ansariel 402595346b Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/installers/windows/installer_template.nsi
 2023-08-24 20:50:27 +02:00
Andrey Kleshchev ef33902f22 SL-20145 GLTF specific feature notification 2023-08-21 19:51:04 +03:00
Ansariel fdee1057aa Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-08-19 13:14:50 +02:00
Ansariel dc42a2b8c7 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 2023-08-14 21:21:19 +02:00
Cosmic Linden 466914e122 SL-20024: Double-check object inventory is not pending when save button pressed 2023-08-11 17:18:06 -07:00
Cosmic Linden 6c8ced0edd SL-20024: Show loading message when inventory permissions are loading 2023-08-11 16:31:01 -07:00
Cosmic Linden 27842d0c5f SL-20024: Fix material edit/save buttons on build floater sometimes not re-enabling after object inventory load 2023-08-11 16:31:00 -07:00
Cosmic Linden a5d318567c SL-20024: (WIP) (untested) Fix GLTF material permissions in some more edge cases 2023-08-11 16:31:00 -07:00
Cosmic Linden 7bf6103ad9 SL-20024: (WIP) (not tested) Improved behavior for saving material to inventory. Check perms, keep perms. 2023-08-11 16:31:00 -07:00
Cosmic Linden a4030031f8 SL-20024: Do not show material preview for no-modify materials 2023-08-11 16:30:59 -07:00
Cosmic Linden e7e565dc6e SL-20024: Put material in object inventory when material is no-modify or no-transfer 2023-08-11 16:30:49 -07:00
Ansariel fb7d8e2bc1 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-08-11 11:24:23 +02:00
Andrey Kleshchev d8e4572b90 SL-20039 "Save to inventory" should only allow saving identical faces 2023-08-10 21:29:36 +03:00
Andrey Kleshchev 87c00d8daa SL-20133 Shift clicking selected face leaves Editor's Texture tab in a weird state 2023-08-10 17:01:47 +03:00
Ansariel ed67ca001c Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/logcontrol.xml
#	indra/newview/app_settings/settings.xml
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2023-08-09 11:05:56 +02:00
Maxim Nikolenko 4705515e78
SL-19303 switch automatically between Materials/PBR/Media based on current values 2023-08-03 20:29:30 +03:00
Ansariel 056407518d Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llpanelface.cpp
#	indra/newview/lltexturectrl.cpp
 2023-07-28 18:16:42 +02:00
Andrey Kleshchev 5e344813dc SL-18396 PBR and blinn phong should not be allowed to be edited together 2023-07-27 23:26:46 +03:00
Ansariel e85546fc3d Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2023-07-18 11:17:02 +02:00
Ansariel 289fb458f3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/llprimitive/llmaterial.h
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpool.cpp
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llfilepicker.h
#	indra/newview/llpanelface.cpp
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llvovolume.cpp
 2023-07-18 10:59:02 +02:00
Brad Linden 4b268a5d6a Delete unprintable chars that accidentally got into the merge in kdiff3 for DRTVWR-559 2023-07-17 15:32:28 -07:00
Brad Linden f975cfd736 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-07-17 13:37:03 -07:00
Ansariel 133f8108b1 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-12 09:26:38 +02:00
Andrey Kleshchev ba4b596894 SL-19141 Fixed applying a no-copy texture to two objects failing silently 2023-07-11 01:24:22 +03:00
Ansariel 1d28a79ec6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/llcharacter/llkeyframemotion.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfilepicker.cpp
 2023-05-18 13:43:48 +02:00
Ansariel 4d0ebf6143 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llperfstats.cpp
#	indra/newview/llperfstats.h
#	indra/newview/llviewerdisplay.cpp
 2023-05-17 18:02:50 +02:00
RunitaiLinden a256a18884 SL-19674 Disable "Blinn-Phong" when a PBR material is applied to make it clear that those buttons are inoperable until you remove the PBR material. 2023-05-15 13:49:20 -05:00
Ansariel abc44d584e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 2023-05-03 14:14:14 +02:00
Zi Ree d64a16aef8 Add button to select all faces with the same texture / normal map / specular map 2023-05-03 00:02:08 +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
Cosmic Linden 5721bdbc4d SL-19399: Cleanup 2023-03-23 10:17:33 -07:00
Cosmic Linden 1ba1159a36 SL-19399: Reorganize controls for PBR material editing in the build floater in more sensible way. Ignore "Lock repeat" in PBR mode as it's redundant 2023-03-22 17:08:13 -07:00
Cosmic Linden ad590887cc SL-19399: Allow editing all PBR texture transforms at once with Complete material radio 2023-03-22 17:07:42 -07:00
Ansariel 2c51fe5aad Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfilepicker.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llvovolume.cpp
 2023-03-22 17:35:43 +01:00
Ansariel f4182ddc7f Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llreflectionmapmanager.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 2023-03-06 17:11:43 +01:00
Alexander Gavriliuk 0e837fbaad Fix formatting in indra/newview/llpanelface.* files 2023-02-27 21:46:54 +01:00
cosmic-linden 0dd4efea93
Merge pull request #85 from secondlife/SL-19002 
SL-19002: Handle edge case in client networking which could cause material ID and overrides to become out-of-sync
 2023-02-14 14:45:53 -08:00
Cosmic Linden 917932549f SL-19002: Stop sending material IDs from client via material params and just call queueApply/queueModify 2023-02-14 13:59:00 -08:00
Andrey Kleshchev a549140fd0 SL-19183 PBR mapping scale values start on zero 2023-02-14 00:12:09 +02:00
Ansariel 6cbca4da71 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llprofiler.h
#	indra/llcommon/lluuid.cpp
#	indra/llprimitive/llmodel.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
#	indra/newview/llviewerwindow.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/da/floater_about.xml
#	indra/newview/skins/default/xui/de/floater_about.xml
#	indra/newview/skins/default/xui/en/floater_about.xml
#	indra/newview/skins/default/xui/es/floater_about.xml
#	indra/newview/skins/default/xui/fr/floater_about.xml
#	indra/newview/skins/default/xui/it/floater_about.xml
#	indra/newview/skins/default/xui/pt/floater_about.xml
#	indra/newview/skins/default/xui/ru/floater_about.xml
#	indra/newview/skins/default/xui/tr/floater_about.xml
#	indra/newview/skins/default/xui/zh/floater_about.xml
 2023-02-01 11:40:17 +01:00
Andrey Kleshchev a3f43b4b73 SL-19014 Sanitize the override data sent for faces without GLTF materials 2023-01-23 20:36:54 +02:00
Ansariel 75180c8746 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llglslshader.cpp
#	indra/llrender/llrender.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llrender/llvertexbuffer.h
#	indra/newview/lldrawpool.cpp
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/lldrawpoolmaterials.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/pipeline.h
 2023-01-12 12:08:46 +01:00