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

2921 Commits (bcb701af65344ea36b71d6bbcfc2c982879936cd)

Author SHA1 Message Date
Beq bcb701af65 How about the checksums too, Beq? 2023-08-28 14:05:17 +01:00
Ansariel c9575bf8b7 3p KDU for Windows contains both 32 and 64 bit version 2023-08-28 14:55:04 +02:00
Beq 635eabcc4c Update autobuild for KDU-8.3 2023-08-28 13:37:18 +01:00
Ansariel 5dd820c22d Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
 2023-07-29 14:35:11 +02:00
Nat Goodspeed 1f615e78b8 SL-20031: Update to viewer-manager 3.0-bd3aec2. 
This one includes the fix for SL-19756.
 2023-07-28 11:04:01 +03:00
Nat Goodspeed f6505f5a40 SL-20031: Update viewer-manager to 3.0-5cfc07c. 
This version eliminates references to the Windows wmic command, calling the
WMI API instead.
 2023-07-28 11:04:01 +03:00
Ansariel 497ecef127 Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/installers/windows/installer_template.nsi
 2023-07-12 11:54:32 +02:00
Andrey Lihatskiy 411aa59734 SL-19756 Update viewer-manager to 3.0.580913 2023-07-07 06:36:15 +03:00
Ansariel 317d4f7b0e Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/00-Common.cmake
#	indra/newview/installers/windows/installer_template.nsi
 2023-07-04 14:48:18 +02:00
Nat Goodspeed 726851b039 DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen 
to resolve conflicts in installer_template.nsi
 2023-06-28 11:02:11 -04:00
Ansariel 521dd2ff96 FMOD Studio 2.02.15 update for OSX 2023-06-23 23:23:30 +02:00
Pork Chop 156b22f28c Linux: FMOD Studio update to 2.02.15 2023-06-24 00:35:02 +10:00
Ansariel c7246d5c22 FMOD Studio update to 2.02.15 for Windows 2023-06-23 13:23:38 +02:00
Ansariel 2a6c81f1d6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-02 17:52:00 +02:00
Ansariel 1aba1c157a Fix linux build 2023-04-24 12:29:20 +02:00
Ansariel 1ded14fa3d Fix linux build 2023-04-24 12:28:00 +02:00
Ansariel 0d5282a99e Add missing build targets 2023-04-22 18:55:00 +02:00
Ansariel 7e563d3120 Sync autobuild with upstream 2023-04-22 18:54:59 +02:00
Ansariel 054d2e1d33 Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/skins/default/xui/en/notifications.xml
 2023-04-22 18:54:43 +02:00
Ansariel d3dc0e1e27 Add missing build targets 2023-04-22 02:01:37 +02:00
Ansariel a514fa7b19 Sync autobuild with upstream 2023-04-22 01:43:09 +02:00
Ansariel 94a7b3ab8e Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
 2023-04-21 15:14:43 +02:00
Ansariel 7dfe73540c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-04-21 12:23:05 +02:00
Andrey Lihatskiy 4e47e532f8 Merge branch 'SL-19594-fakesmile' into DRTVWR-577-maint-S 2023-04-19 23:15:28 +03:00
Nat Goodspeed 86846ffb8d SL-19594: Update to bugsplat build 579696 2023-04-19 15:35:47 -04:00
Bennett Goble a0cdaa75a9 SL-18839: Add basic Github build 2023-04-10 16:17:51 -07:00
Andrey Lihatskiy f1095d7831 Merge branch 'main' into marchcat/main-contrib-merge 
# Conflicts:
#	indra/cmake/CMakeLists.txt
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/tests/llleap_test.cpp
#	indra/newview/llfilepicker.h
#	indra/newview/llfilepicker_mac.h
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/skins/default/xui/en/strings.xml
 2023-04-07 00:20:59 +03:00
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 36fc36432d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/cmake/CMakeLists.txt
 2023-03-30 12:20:59 +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
Andrey Lihatskiy 5217e6bfb7 Merge branch 'main' into DRTVWR-577-maint-S 
# Conflicts:
#	indra/cmake/CMakeLists.txt
#	indra/newview/skins/default/xui/es/floater_tools.xml
 2023-03-30 00:25:16 +03:00
Ansariel c9d2db1775 Update FMOD Studio to 2.02.13 on OSX 2023-03-29 16:06:35 +02:00
Ansariel 62a57b441a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-28 18:02:32 +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
Andrey Kleshchev f6ba8306f0 SL-18876 Update fmod studion to version 2.02.13 
Should fix "Radio/Stream hiccups at a regular rate during playback"
 2023-03-22 20:19:23 +02: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
Andrey Lihatskiy dca3c83cd9 Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/newview/CMakeLists.txt
 2023-03-20 01:23:16 +02:00
Ansariel 2c03c96b3e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-07 13:23:03 +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
Andrey Kleshchev 6c54c9f8a9 Merge branch 'main' into DRTVWR-577-maint-S 
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llfilepicker.h
#	indra/newview/llfilepicker_mac.h
#	indra/newview/llfilepicker_mac.mm
 2023-02-09 22:33:52 +02: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