474cbf62cf
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-02-14 18:04:46 +01:00
6248b77457
Update FMOD Studio 2.02.20 for Linux and MacOS
2024-02-08 16:21:41 +00:00
bce7069a32
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-02-08 15:01:40 +01:00
4ce6b5114d
Update FMOD Studio to 2.02.20 for Windows
2024-02-07 18:10:16 +01:00
b592795c0b
Updated Havok lib with the presumed navmesh fix
2024-01-12 18:15:04 +01:00
709aaaf0b0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-09 11:58:47 +01:00
a8f43fd40b
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-01-05 13:17:23 +01:00
0e154e344e
It's 2024... basically... almost...
2023-12-31 14:06:25 +01:00
0b556ef3b9
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/release.yaml
# autobuild.xml
# indra/newview/llviewermenu.cpp
2023-12-18 20:45:20 +01:00
b32cd27b4c
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/cmake/ViewerMiscLibs.cmake
# indra/llmath/llvolume.cpp
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
# indra/newview/llviewermenu.cpp
2023-12-18 19:25:49 +01:00
e3c2f12d53
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/skins/default/xui/da/panel_main_inventory.xml
# indra/newview/skins/default/xui/pt/panel_main_inventory.xml
# indra/newview/skins/default/xui/tr/panel_main_inventory.xml
# indra/newview/skins/default/xui/zh/panel_main_inventory.xml
2023-12-15 18:25:32 +01:00
881eb4fd02
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-12-15 18:23:24 +01:00
793bed7d06
Merge branch 'main' into DRTVWR-489
...
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
f05fa29db1
Linux: Update libndofdev 0.13 -> 0.14. Update SDL2 to latest stable release (2.28.5)
2023-12-14 14:26:56 +11:00
bdcd99861c
Linux: replace cubemaptoequirectangular with a version that actually has CubemapToEquirectangular.js in it...
2023-12-13 21:49:00 +11:00
88921452ad
DRTVWR-489 Restore autobuild.xml format
2023-12-13 06:26:06 +02:00
5b789e05f5
DRTVWR-489 Update freetype to v.2.12.1.557becd
2023-12-12 19:02:54 +02:00
c9cd5631e4
Merge branch 'main' into DRTVWR-489
2023-12-05 03:37:06 +01:00
50c7296d34
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llvoavatar.cpp
2023-12-01 11:27:42 +01:00
cfd9c49647
Merge branch 'DRTVWR-587-maint-V' of H:/ViewerDev/viewer-587
...
# Conflicts:
# .gitignore
2023-11-30 18:44:01 +01:00
c87063987c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-11-30 18:41:42 +01:00
d1c0a5b840
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
2023-11-29 10:45:43 +02:00
974a2a1d40
DRTVWR-587: Update to viewer-manager v3.0-08bf5ee.
...
This viewer-manager refactors the bad-graphics-card detection.
2023-11-22 14:12:46 -05:00
a963ba296e
SL-20591 Update viewer-manager to v3.0.0170afb
...
Restored removed commits since issue was isolated and bypassed.
Original issue: win32util.py imports wmi, if import fails it uses
registry for getting dns, if import works, it uses wmi to get dns.
Including wmi broke dns for some of the users ([Errno 11001] Name or
service not known)
2023-11-21 19:33:54 +02:00
be71515833
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-11-20 13:05:09 +01:00
b3276e50b1
Update KDU to 8.4.1 for all platforms.
2023-11-18 02:23:58 +00:00
2f735f6909
SL-20591 Update viewer-manager to v3.0.73fef89
2023-11-17 02:33:53 +02:00
a7e68395b2
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
2023-11-15 11:34:13 +01:00
198bd5cfc0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/lldrawable.cpp
2023-11-15 11:33:41 +01:00
3eeddf0a55
Clean up any stragglers using the old phoenixviewer domain for 3p libraries (seemed to be just gstreamer for linux), change URL's to use HTTPS where supported instead of plain old HTTP
2023-11-12 11:04:20 +11:00
96f7f708c1
SL-20591 Update viewer-manager to v3.0.0395b15
2023-11-10 01:57:27 +02:00
aa847c1bac
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-11-07 10:23:48 +01:00
9b6a90eedd
Revert "SL-20185 Fix connection issues ( #490 )"
...
Issue reproed again, restoring.
2023-11-06 20:41:01 +02:00
5827e92a9a
Linux: Update dullahan again (use-gl=desktop was messing things up), the default in CEF seems to now be to use the Angle compatibility layer to figure out what works. Some corrections to the viewer manifest file, the EGL/GLES libraries (which Angle needs) now reside in a different folder with recent CEF builds, so update accordingly. Moved CEF locales from bin -> lib folder as CEF was complaining about not being able to find its locales
2023-11-06 19:00:16 +11:00
835305e9d8
Linux: dullahan+cef update to 1.14/118.0.5993.117
2023-11-05 13:20:47 +11:00
6aa4a267a7
SL-20185 Fix connection issues ( #490 )
2023-11-03 00:10:50 +02:00
f47a2bddaa
Ditch Github credentials requirements for our private libs
2023-11-02 21:56:05 +01:00
698168efbe
Linux: Remove conflicting xmlrpc_epi package and revert back to a working one
2023-11-02 14:30:48 +11:00
aa440ccd28
Linux: Remove conflicting xmlrpc_epi package and revert back to a working one
2023-11-02 14:06:54 +11:00
34d2a78898
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewergenericmessage.cpp
2023-11-01 13:44:17 +01:00
66ae2434bc
DRTVWR-587: Update viewer-manager to v3.0-074736e.
...
This is viewer-manager's DRTVWR-587-actions branch updated from the new master
branch.
2023-10-31 13:40:07 -04:00
b5c7c6b078
SL-20031: Reintroduce newest viewer-manager build.
2023-10-31 11:04:41 -04:00
b64793e2b0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-10-27 16:24:33 +02:00
6c389316f1
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llrender/llrender.h
# indra/newview/VIEWER_VERSION.txt
2023-10-27 13:00:41 +02:00
70db255e02
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llcommon/tests/workqueue_test.cpp
# indra/newview/VIEWER_VERSION.txt
2023-10-27 11:52:59 +02:00
a7578e9690
Update autobuild for Mac fmodstudio 2.02.18
...
GHA builds already have this, this change keeps the autobuild in step
2023-10-27 10:03:43 +01:00
5f9fb4a395
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
# indra/newview/installers/darwin/release-dmg/background.jpg
# scripts/messages/message_template.msg.sha1
2023-10-26 21:25:27 +02:00
39a6735fc9
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/cmake/APR.cmake
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/viewer_manifest.py
# indra/test/namedtempfile.h
2023-10-26 15:49:12 +02:00
673b3309dd
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-10-25 16:12:13 -07:00
4c6ae49c88
Merge branch 'main' into DRTVWR-587-maint-V
...
# Conflicts:
# autobuild.xml
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/viewer_manifest.py
2023-10-25 21:28:26 +03:00
Ansariel