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

2880 Commits (480cb4e75c4abedfcd8f7d55e7d7c843e72fa6ad)

Author SHA1 Message Date
Pork Chop 63eafec8d8 Linux: Update 3p again, wrong colladadom 3p (and associated 3p's it depended on) had crept into the dependency chain. 2023-04-04 12:06:28 +10:00
Pork Chop b1e8f003e6 Linux: Update various 3p libraries 2023-04-02 23:07:44 +10:00
Ansariel 7625a540e4 FMOD Studio update to 2.02.13 for crappy Mac, attempt #2 2023-03-31 09:46:42 +02:00
Ansariel 492a11fe8b Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-573 2023-03-30 02:53:56 +02:00
Ansariel 69fd2d9973 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/cmake/00-Common.cmake
 2023-03-30 02:49:33 +02:00
Ansariel a562244671 No FMOD Update for you, crappy Mac! 
This reverts commit c9d2db1775.
 2023-03-30 02:45:02 +02:00
Ansariel c9d2db1775 Update FMOD Studio to 2.02.13 on OSX 2023-03-29 16:06:35 +02:00
Pork Chop b3d9c81370 Linux: Update FMOD Studio to 2.02.13 2023-03-27 22:40:02 +11:00
Ansariel 2c581cb994 Update FMOD Studio to 2.02.13 on Windows 2023-03-27 11:50:32 +02:00
Pork Chop 5c8d7d748b Linux: Initial work to fix broken build, restore gstreamer 1.0 2023-03-23 21:56:53 +11:00
Ansariel 40b731eb76 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 
# Conflicts:
#	.gitignore
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/cmake/UI.cmake
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/llwindow/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/viewer_manifest.py
 2023-03-21 10:57:56 +01:00
Ansariel d9e2115374 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-07 12:47:54 +01:00
Pork Chop baa9c6d731 Linux: CEF bump from 91 -> 92 -- note, it is not possible to upgrade to later versions of CEF beyond 92 due to API changes introduced in later versions of CEF - this situation will of course change once the viewer source is updated to be compatible with the later CEF API's 2023-02-17 02:59:35 +11:00
Ansariel 5bbf10db62 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-02-14 22:03:06 +01:00
Pork Chop afede9086a Linux: Update openjpeg library (now built on focal). Previous version built on Bionic (which is imminent of being EOL) introduced some compatibility issues on systems with glibc 2.31 and beyond and resulted in linker failures. 2023-02-06 11:36:24 +11:00
Ansariel 9cee21ba8d Updated Havok TPV lib to work with latest LL release 2023-02-05 15:20:34 +01:00
Pork Chop 5eae4f873f Linux: Update openjpeg library from 2.3.1 to 2.5.0 2023-02-05 07:10:20 +11:00
Pork Chop dd3dd51791 Linux: Update apr suite (sync with latest from LL) 2023-02-05 07:09:01 +11:00
Ansariel 130ac29ea6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-02-03 12:58:42 +01:00
Ansariel f156e0771f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-02-03 00:55:58 +01:00
Zi Ree 34a444b0b2 Linux: Update FMOD 3p - Patch by PorkChop, thank you! 2023-01-19 12:49:14 +01:00
Ansariel f8f4c43658 Update FMOD Studio to 2.02.11 for Windows 2023-01-18 19:23:04 +01:00
Ansariel b157ab47c0 Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/llagentui.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/llfloateravatarrendersettings.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/de/floater_tools.xml
#	indra/newview/skins/default/xui/en/floater_display_name.xml
#	indra/newview/skins/default/xui/en/floater_tools.xml
#	indra/newview/skins/default/xui/es/floater_tools.xml
#	indra/newview/skins/default/xui/ru/floater_tools.xml
 2023-01-12 16:56:08 +01:00
Ansariel 4f4c9c7473 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-01-12 12:21:57 +01:00
Andrey Lihatskiy f9866a3543 Merge branch 'main' into DRTVWR-573-maint-R 
# Conflicts:
#	autobuild.xml
#	indra/newview/llagent.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmediasettingsgeneral.cpp
#	indra/newview/pipeline.cpp
 2023-01-12 04:37:42 +02:00
PanteraPolnocy f359a39195 Flip dates to 2023 2023-01-02 19:19:28 +01:00
Ansariel 68c04f41ad Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/viewer_manifest.py
 2022-12-19 22:59:03 +01:00
Maxim Nikolenko efb96d8c6e SL-18786 Display updater on the top of other windows 2022-12-14 15:36:24 +02:00
Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloater360capture.cpp
 2022-12-12 22:09:54 +01:00
Ansariel 57e8cd490f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-23 10:00:44 +01:00
Ansariel a7d55b4e77 Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer 2022-11-22 16:30:35 +01:00
Ansariel 8f45ad9323 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-22 16:29:17 +01:00
Ansariel abbfb9b7d0 Merge branch 'DRTVWR-565-maint-P' of https://github.com/secondlife/viewer 2022-11-22 16:23:13 +01:00
Ansariel 02804db43b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-22 16:21:05 +01:00
Andrey Lihatskiy 25c62f554f Merge branch 'master' into DRTVWR-570-maint-Q 2022-11-21 22:46:35 +02:00
Ansariel dbc70be7c4 Merge branch 'master' of https://github.com/secondlife/viewer 
# Conflicts:
#	README.md
#	autobuild.xml
 2022-11-21 20:37:32 +01:00
Andrey Kleshchev 96f0c95898 Merge branch master into DRTVWR-565-maint-P 2022-11-21 20:48:24 +02:00
Andrey Kleshchev a8ded3bcc4 SL-17135 Pull in apr-suit package 
Same apr suit version, but with debug symbols
 2022-11-18 14:43:54 +02:00
Andrey Kleshchev 73ca604ad5 SL-18618 Update libpng 2022-11-15 01:13:33 +02:00
Mnikolenko Productengine bedbd98017 SL-18603 update Bugsplat 2022-11-11 23:05:25 +02:00
Ansariel da8f95ad22 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-02 18:06:07 +01:00
Ansariel 10588d606e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-02 12:54:26 +01:00
Ansariel 1bdfb7df70 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-01 15:16:40 +01:00
Zi Ree 66cecee628 Linux: Update fontconfig and freetype to remove old zlib dependency - Thanks to PorkChop! 2022-10-30 20:30:12 +01:00
Ansariel 594fb6b084 Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llcommon/CMakeLists.txt
#	indra/llwindow/CMakeLists.txt
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lllegacyatmospherics.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewertexturelist.cpp
 2022-10-25 11:56:30 +02:00
Ansariel 242c8cb5ed Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/CMakeLists.txt
#	indra/llprimitive/llmodel.cpp
#	indra/llwindow/CMakeLists.txt
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lllegacyatmospherics.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvopartgroup.cpp
#	indra/newview/llworld.cpp
 2022-10-25 11:49:36 +02:00
Ansariel e4816961a4 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-10-22 16:53:15 +02:00
Kitty Barnett f7721b5386 Update FMOD Studio to 2.02.09 on Mac 2022-10-21 23:34:40 +02:00
Ansariel 8b0d341aca Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-21 12:34:53 +02:00
Zi Ree 534a156f2b Linux: Update PNG library to have one less dependency on old zlib - Patch and 3p build by PorkChop, thank you! 2022-10-21 01:43:36 +02:00