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

2933 Commits (bf8154d447e8a4deecee56bbf9043ecb804b4a06)

Author SHA1 Message Date
Ansariel 0b25b931d9 Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer 2023-10-11 13:02:38 +02:00
Andrey Lihatskiy fa5a705f6e DRTVWR-588 Update viewer-manager to 3.0-f48e635 2023-10-10 22:52:59 +03:00
Ansariel 7143fecf87 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-10-10 12:25:20 +02:00
Pork Chop 188b3ae9b1 FMOD Studio update to 2.02.18 for Linux 2023-10-08 00:11:28 +11:00
Ansariel 352d39e3df FMOD Studio update to 2.02.08 for Windows 2023-10-07 14:01:17 +02:00
Ansariel fde2521319 Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/lldrawpoolground.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/skins/default/textures/textures.xml
 2023-10-04 15:22:25 +02:00
Pork Chop ef373cc849 Linux: Update SDL to v2.28.4 2023-10-02 22:35:08 +11:00
Pork Chop d2ec35f19e Linux: Update curl,openssl and nghttp2 libraries 2023-10-02 22:34:33 +11:00
nat-goodspeed 72fbd0898c
SL-20031: Update viewer-manager to v3.0-83fb46a. (#331) 
Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
 2023-09-29 04:33:20 +03:00
Beq 3dddbe6c7d Update FMOD Studio to 2.02.17 on MacOs 2023-08-28 19:49:53 +01:00
Pork Chop f1c0cd9a2f Update FMOD Studio to 2.02.17 on Linux 2023-08-29 01:25:31 +10:00
Ansariel 88cc136054 Update FMOD Studio to 2.02.17 on Windows 2023-08-28 16:06:43 +02:00
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