Ansariel
|
46da82657a
|
Clean the build instructions up a bit:
* We do not recommend...
* Reduce the KDU emphasis
|
2025-09-12 00:24:52 +02:00 |
|
chanayane
|
4c43e89232
|
updated build instructions for Linux, macOS and Windows
|
2025-09-11 23:32:23 +02:00 |
|
Ansariel
|
f37e2785d5
|
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
|
2025-07-27 12:54:37 +02:00 |
|
Darl
|
31f8ebf735
|
Update test plan to match current functionality per suggested/requested change in #4406
|
2025-07-26 14:02:22 +03:00 |
|
Darl
|
c4204a9687
|
Media first click interact large number value fix
|
2025-07-26 14:02:22 +03:00 |
|
Ansariel
|
56f30a7696
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelgroupbulk.cpp
# indra/newview/llpanelgroupbulkimpl.h
# indra/newview/lltoolpie.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
|
2025-06-25 21:30:06 +02:00 |
|
Ansariel
|
b46f7b1c74
|
Rename FS_PR_GUIDELINES.md to CONTRIBUTING.md and move it to root so it gets linked when creating PRs on Github
|
2025-06-16 11:39:56 +02:00 |
|
Ansariel Hiller
|
5840aabc1a
|
Fix layout issues in PR guidelines
|
2025-06-16 11:30:26 +02:00 |
|
Ansariel
|
5d1657cc6d
|
Fix errors in PR guidelines
|
2025-06-16 11:26:50 +02:00 |
|
Darl
|
ea75bfd410
|
Implement support for PRIM_MEDIA_FIRST_CLICK_INTERACT and autoplay for HUD media
|
2025-05-28 10:49:02 -05:00 |
|
Ansariel Hiller
|
281213632e
|
Formatting fix in building_windows.md
|
2024-12-20 12:41:08 +01:00 |
|
Ansariel
|
57338733d0
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-12-04 15:15:01 +01:00 |
|
Const Correctness
|
f44778ec01
|
Update building_windows.md
|
2024-11-23 18:10:52 -05:00 |
|
Ansariel
|
98510a3762
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-09-19 21:58:28 +02:00 |
|
Ansariel
|
43551ad0f2
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-09-18 13:34:52 +02:00 |
|
Ansariel
|
5ebe25778d
|
Remove nonsense sentence
|
2024-09-18 12:36:54 +02:00 |
|
Ansariel
|
a9b52b1f73
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llfontgl.cpp
# indra/llrender/llrender.cpp
# indra/llui/llbutton.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/newview/llhudtext.h
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2024-09-04 11:17:13 +02:00 |
|
Cosmic Linden
|
e42e95d878
|
secondlife/viewer#2483: Fix label typo in PBR terrain texture transforms tab
|
2024-09-03 10:10:32 -07:00 |
|
Ansariel
|
07228d3a9e
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/Tracy.cmake
# indra/llappearance/llavatarappearancedefines.cpp
# indra/llcommon/llprofiler.cpp
# indra/llcommon/llprofiler.h
# indra/llfilesystem/lldiskcache.cpp
# indra/llfilesystem/lldiskcache.h
# indra/llinventory/llinventorytype.cpp
# indra/media_plugins/example/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llgroupmgr.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatarself.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/viewer_manifest.py
|
2024-08-15 00:12:13 +02:00 |
|
cosmic-linden
|
d696010cea
|
Merge pull request #2210 from secondlife/v-1883
secondlife/viewer#1883: Local-only PBR terrain paintmap with developer tools
|
2024-08-13 10:34:35 -07:00 |
|
Cosmic Linden
|
f1fac8127f
|
secondlife/viewer#1883: Add informal documentation for how to use the local paintmap bake and compare it to the heightmap
|
2024-08-06 16:30:50 -07:00 |
|
Ansariel
|
04bed35215
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llwebrtc/llwebrtc.h
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
|
2024-08-02 13:01:06 +02:00 |
|
Andrey Kleshchev
|
daa240164d
|
Post pull request contribution doc update (#2077)
|
2024-08-02 13:02:36 +03:00 |
|
Ansariel
|
eaa5dc798c
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
# Conflicts:
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llversioninfo.cpp
# indra/newview/llviewertexturelist.cpp
|
2024-07-30 10:45:11 +02:00 |
|
Ansariel
|
0b9ac4ee19
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llwindow/llwindowsdl2.cpp
|
2024-07-30 10:37:17 +02:00 |
|
Ansariel
|
e157a2db35
|
Move PR guidelines doc to doc folder
|
2024-07-27 12:00:44 +02:00 |
|
Ansariel
|
76f2b1f48c
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llfloaterspellchecksettings.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
|
2024-07-16 10:44:38 +02:00 |
|
cosmic-linden
|
e43c4c78b3
|
Merge pull request #1982 from secondlife/v-1885
secondlife/viewer#1885: Terrain texture repeats: Remove feature flag dependency on simulator feature in favor of cap
|
2024-07-10 15:47:31 -07:00 |
|
Cosmic Linden
|
95f9946425
|
secondlife/viewer#1885: Update test plan
|
2024-07-10 11:34:05 -07:00 |
|
Ansariel
|
99396c859d
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
|
2024-07-10 10:31:35 +02:00 |
|
Ansariel
|
e9b6550c48
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.cpp
|
2024-07-06 11:06:55 +02:00 |
|
Cosmic Linden
|
2c46194d70
|
secondlife/viewer#1475: Add test plan for PBR terrain texture transforms UI
|
2024-07-02 15:01:55 -07:00 |
|
Cosmic Linden
|
b7ad221f37
|
secondlife/viewer#1847: Update test plan: Enumerate support for KHR_texture_transform on prims
|
2024-07-02 14:25:30 -07:00 |
|
Ansariel
|
9a2b83b294
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llmemory.cpp
# indra/llmessage/CMakeLists.txt
# indra/llmessage/llfiltersd2xmlrpc.cpp
# indra/newview/lldebugview.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llheroprobemanager.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llslurl.cpp
# indra/newview/llsurface.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llversioninfo.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/llworld.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/pl/menu_viewer.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/pt/menu_viewer.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/ru/menu_viewer.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/tr/menu_viewer.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
# indra/newview/skins/default/xui/zh/menu_viewer.xml
# scripts/messages/message_template.msg.sha1
|
2024-07-02 18:08:57 +02:00 |
|
Ansariel
|
20294e9ee8
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
|
2024-07-02 01:23:35 +02:00 |
|
Cosmic Linden
|
9ccab0df14
|
secondlife/viewer#1847: Add test plan for normal textures on PBR materials
|
2024-07-01 16:17:06 -07:00 |
|
Cosmic Linden
|
186395ee4b
|
secondlife/viewer#1847: Add test plan
|
2024-07-01 14:22:26 -07:00 |
|
Matthias Hörmann
|
4a2d7fd7ca
|
fix build target name in docs RelWithDebInfo_open -> RelWithDebInfoFS_open
|
2024-06-22 16:37:05 +02:00 |
|
Ansariel
|
684bc1d1ea
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/llcommon/llsys.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/logcontrol.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llspeakers.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvocache.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
|
2024-06-21 19:46:51 +02:00 |
|
Cosmic Linden
|
fa4e463ba8
|
secondlife/viewer#1744: Fix missing LSL constant INVENTORY_SETTING in keywords_lsl_default.xml
|
2024-06-13 09:11:40 -07:00 |
|
Ansariel
|
050d2fefab
|
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/gltf/primitive.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
|
2024-06-13 03:21:12 +02:00 |
|
Ansariel
|
1bbe697db7
|
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llappearance/llavatarappearance.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvocache.cpp
|
2024-06-11 14:38:20 +02:00 |
|
Cosmic Linden
|
00c4d2ed4e
|
secondlife/viewer#1475: Update PBR Terrain test plans
|
2024-06-10 17:03:27 -07:00 |
|
Ansariel
|
ea5ead6f4a
|
Merge remote-tracking branch 'FS600/master'
# Conflicts:
# doc/contributions.txt
# indra/llimage/tests/llimageworker_test.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
|
2024-05-23 18:15:07 +02:00 |
|
Ansariel
|
c203bb650a
|
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/llinventorymodel.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/notifications.xml
|
2024-05-23 01:48:45 +02:00 |
|
Ansariel
|
b84b5bd949
|
Merge remote-tracking branch 'LL/release/materials_featurette'
# Conflicts:
# doc/contributions.txt
|
2024-05-16 02:52:21 +02:00 |
|
Ansariel
|
343aeeeb36
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# doc/contributions.txt
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
|
2024-05-16 02:11:51 +02:00 |
|
Andrey Lihatskiy
|
bdb8caf790
|
Merge branch 'release/materials_featurette' into marchcat/x-mf-merge
|
2024-05-16 00:10:29 +03:00 |
|
Cosmic Linden
|
ae6a402b7a
|
secondlife/viewer#1474: Remove small texture offset from PBR terrain
|
2024-05-15 09:55:55 -07:00 |
|
Andrey Lihatskiy
|
d9153532b8
|
Merge branch 'main' into marchcat/x-mf-merge
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
|
2024-05-15 12:51:21 +03:00 |