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 |
|
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 |
|
Ansariel
|
aaa52d0c66
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llprimitive/llgltfmaterial.h
# indra/newview/app_settings/settings.xml
|
2024-05-10 12:12:34 +02:00 |
|
Dan Linden
|
633fa78426
|
Update terrain_loading.md
Add more details to Behavior overview.
|
2024-04-30 15:22:58 -07:00 |
|
Cosmic Linden
|
08e012b4fa
|
secondlife/viewer-private#230: Amend terrain loading test plan
|
2024-04-26 12:10:38 -07:00 |
|
Ansariel
|
4a2790a987
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/app_settings/graphic_preset_controls.xml
|
2024-04-24 21:10:15 +02:00 |
|
Ansariel
|
b527620dfc
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-24 19:53:03 +02:00 |
|
Brad Linden
|
86c0c1d553
|
Merge remote-tracking branch 'origin/main' into release/materials_featurette
|
2024-04-24 09:55:34 -07:00 |
|
Andrey Lihatskiy
|
428f21cf79
|
Merge branch 'main' into marchcat/x-merge
|
2024-04-24 18:45:54 +03:00 |
|
Ansariel
|
7355b798d2
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# autobuild.xml
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/lltexturefetch.cpp
|
2024-04-12 19:33:20 +02:00 |
|
Andrey Lihatskiy
|
eab5beb54c
|
Merge branch 'main' into marchcat/x-merge
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
|
2024-04-12 15:43:34 +03:00 |
|
Ansariel
|
2474e3ba1d
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
|
2024-04-10 10:03:37 +02:00 |
|
Andrey Lihatskiy
|
84dfe55810
|
Merge branch 'main' into marchcat/y-merge
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
|
2024-04-10 07:08:25 +03:00 |
|
Ansariel
|
f0fd47b68e
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
|
2024-04-10 03:06:52 +02:00 |
|
Ansariel
|
096aef2a72
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-10 01:49:35 +02:00 |
|
Brad Linden
|
5a47a3cb23
|
Merge remote-tracking branch 'origin/main' into release/materials_featurette
|
2024-04-09 14:17:34 -07:00 |
|
Ansariel
|
bc2b88be93
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-09 19:46:31 +02:00 |
|
Cosmic Linden
|
e2da41a759
|
secondlife/viewer#773: Improve test plan for PBR terrain feature flag
|
2024-04-03 10:28:19 -07:00 |
|
Ansariel
|
22d4c8b94d
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-02 19:35:40 +02:00 |
|
Beq
|
60c6edd3ab
|
Update autobuild install instructions to prefer requirements.txt
|
2024-03-29 23:45:56 +00:00 |
|
Pork Chop
|
881a5e63ac
|
Linux: Update documentation for compiling
|
2024-03-28 23:01:49 +00:00 |
|
Ansariel
|
77b6a6e978
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-03-27 15:32:45 +01:00 |
|
Ansariel
|
07b99632f3
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/llimage/llimagebmp.cpp
# indra/llimage/llimagetga.cpp
# indra/llrender/llrender.cpp
# indra/llui/lltransutil.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterenvironmentadjust.cpp
# indra/newview/llpaneleditwater.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/de/strings.xml
# indra/newview/skins/default/xui/en/strings.xml
|
2024-03-27 12:48:58 +01:00 |
|
Ansariel
|
cbf6aca2e8
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# .github/workflows/build.yaml
|
2024-03-27 10:35:43 +01:00 |
|
Andrey Lihatskiy
|
990c8b81da
|
Merge branch 'main' into marchcat/yz-merge
|
2024-03-27 01:40:12 +02:00 |
|
Ansariel
|
9f535a0e2d
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
|
2024-03-27 00:04:15 +01:00 |
|
Andrey Lihatskiy
|
1ae6f5dd6f
|
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterenvironmentadjust.cpp
# indra/newview/llpaneleditwater.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
|
2024-03-27 00:33:40 +02:00 |
|
Andrey Lihatskiy
|
78174fc865
|
Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
# Conflicts:
# .github/workflows/build.yaml
|
2024-03-27 00:14:56 +02:00 |
|
Ansariel
|
c111665779
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-03-26 22:29:40 +01:00 |
|
Cosmic Linden
|
2ef42c8c36
|
viewer#1051: Credit Ansariel for this fix
|
2024-03-25 15:52:30 -07:00 |
|
Ansariel
|
a8446ac624
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-03-24 21:52:26 +01:00 |
|
Ansariel
|
4882ed24e8
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llvlcomposition.cpp
# indra/newview/skins/default/xui/en/notifications.xml
|
2024-03-23 13:18:33 +01:00 |
|
Cosmic Linden
|
72594038c0
|
secondlife/viewer#1027: Update test plan
|
2024-03-20 17:11:20 -07:00 |
|
Cosmic Linden
|
e2a3edf6da
|
secondlife/viewer-issues#82: Update test plan
|
2024-03-19 16:13:04 -07:00 |
|
Cosmic Linden
|
3caf96b9ad
|
secondlife/viewer#1006: Update test plan
|
2024-03-18 13:26:41 -07:00 |
|
Ansariel
|
159ef68fa7
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llfloateremojipicker.cpp
|
2024-03-17 16:41:38 +01:00 |
|
Cosmic Linden
|
cc6175274c
|
secondlife/viewer#906: Fix broken test plan link
|
2024-03-15 16:14:13 -07:00 |
|
Ansariel
|
efe7cdf153
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/skins/default/xui/de/panel_region_terrain.xml
# indra/newview/skins/default/xui/es/panel_region_terrain.xml
# indra/newview/skins/default/xui/fr/panel_region_terrain.xml
# indra/newview/skins/default/xui/it/panel_region_terrain.xml
# indra/newview/skins/default/xui/ja/panel_region_terrain.xml
# indra/newview/skins/default/xui/pt/panel_region_terrain.xml
# indra/newview/skins/default/xui/ru/panel_region_terrain.xml
# indra/newview/skins/default/xui/tr/panel_region_terrain.xml
# indra/newview/viewer_manifest.py
|
2024-03-15 22:52:24 +01:00 |