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

3171 Commits (0cf61eed937f5362175e23dcdfa7b20f676fe6ef)

Author SHA1 Message Date
Ansariel 0cf61eed93 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	indra/newview/llvoicevivox.cpp
 2024-04-16 11:41:43 +02:00
Ansariel bc2b88be93 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-09 19:46:31 +02:00
Pork Chop 06c8475d74 Linux: Remove obsolete gstreamer 0.10 3p package (superseded by existing gstreamer 1.x package), replace 3p dependency for icu4c and fltk with LL provided versions. 2024-04-06 06:01:37 +00:00
Pork Chop 26bdff6572 Linux: Update 3p library packages for SDL2, freetype and open_libndofdev 2024-04-01 09:48:54 +00:00
Pork Chop 8693cf763a Linux: Consume LL provided 3p library dependencies since numerous linux64 builds for them are now available on github, remove unused bundled dependencies (SDL1 and FC) 2024-03-28 14:39:39 +00: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
Ansariel c111665779 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-26 22:29:40 +01:00
Pork Chop 81da03f8c7 Fix linux build 2024-03-24 16:56:54 +11:00
Ansariel 39c32ae9ca Revert "use the github release asset path for autobuild webrtc" 
This reverts commit 3794e3275c.
 2024-03-19 17:10:36 +01:00
Ansariel 5e75273b49 Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/llagent.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvoicevivox.h
#	indra/newview/viewer_manifest.py
#	scripts/messages/message_template.msg.sha1
 2024-03-19 17:09:42 +01:00
Roxie Linden 3794e3275c use the github release asset path for autobuild webrtc 2024-03-18 17:32:51 -07:00
Roxie Linden 2f40b1fcef update to use public github-based release of autobuild webrtc 2024-03-18 17:13:36 -07:00
Pork Chop 159b94d8ea Linux: dullahan + cef - same version, replace with zstd compressed package instead. 2024-03-18 19:58:23 +11:00
Roxie Linden 0e7b5f5270 Update paths for webrtc-shim 2024-03-15 12:24:37 -07:00
Roxie Linden d67a3022d3 Merge branch 'main' of github.com:secondlife/viewer-private into roxie/webrtc-voice 2024-03-10 15:36:58 -07:00
Ansariel 9d0b91fed7 Undo the reordering of autobuild.xml 2024-03-10 15:53:10 +01:00
Pork Chop 470c607b05 Linux: Update the bundled libfreetype with one that has the bz2 dependency dropped from it - it shouldnbt be needed anyway in most cases 2024-03-10 18:06:44 +11:00
Beq dcde02f97f Fix the autobuild.xml ready for upload of new package 2024-03-10 03:18:27 +00:00
Roxie Linden 994039c948 Use webrtc autobuild package 2024-03-08 22:49:05 -08:00
Beq 1d6d5c3c52 Use our modified font package that has B&W emoji font. 2024-03-09 00:23:18 +00:00
Pork Chop 7f038e68e7 Linux: Fix build after recent merge 2024-03-03 00:10:32 +11:00
Ansariel 2827ebf04f Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-01 22:47:21 +01:00
Ansariel 203ac04bf6 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_stats.xml
 2024-03-01 20:49:42 +01:00
Ansariel 474cbf62cf Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-02-14 18:04:46 +01:00
Ansariel bc6a69ac66 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-02-11 18:37:21 +01:00
Beq 6248b77457 Update FMOD Studio 2.02.20 for Linux and MacOS 2024-02-08 16:21:41 +00:00
Ansariel bce7069a32 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-02-08 15:01:40 +01:00
Ansariel 4ce6b5114d Update FMOD Studio to 2.02.20 for Windows 2024-02-07 18:10:16 +01:00
Ansariel 11207d7985 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 2024-01-26 13:19:06 +01:00
Ansariel fa05f94eae Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/app_settings/settings.xml
 2024-01-23 12:23:54 +01:00
Nat Goodspeed 0752cc0792 DRTVWR-601: Merge branch 'release/gltf-maint2' into DRTVWR-601-gha-libs 2024-01-19 11:38:02 -05:00
Ansariel c7a44ac88b Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/lltexturectrl.h
 2024-01-17 11:04:36 +01:00
Ansariel Hiller 0fa6ff2b1f
Undo re-ordering of autobuild.xml (#638) 2024-01-16 11:08:39 -06:00
Ansariel b592795c0b Updated Havok lib with the presumed navmesh fix 2024-01-12 18:15:04 +01:00
RunitaiLinden fab4cfbab2 SL-20704 Fix for pathfinding debug display not working. 2024-01-10 13:50:15 -06:00
Ansariel 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
Ansariel 3bd76c0fea Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llfasttimerview.cpp
#	indra/newview/skins/default/xui/en/widgets/color_swatch.xml
#	indra/newview/skins/default/xui/en/widgets/texture_picker.xml
 2024-01-09 09:37:38 +01:00
Ansariel a8f43fd40b Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-01-05 13:17:23 +01:00
Ansariel 0e154e344e It's 2024... basically... almost... 2023-12-31 14:06:25 +01:00
Nat Goodspeed bc3076938e DRTVWR-601: Update xxhash common platform to GHA build. 
Remove identical platform-specific package references.
 2023-12-20 12:50:34 -05:00
Nat Goodspeed 6f4dcd58b7 DRTVWR-601: Update mikktspace, tinygltf, tracy, vulkan_gltf, xxhash 
to latest GitHub builds. Some of these were still referencing codeticket
builds produced by TeamCity.
 2023-12-18 14:47:03 -05:00
Ansariel 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
Ansariel 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
Ansariel 783e488a63 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 
# Conflicts:
#	indra/newview/llfloaterimcontainer.cpp
#	indra/newview/llspatialpartition.cpp
 2023-12-15 22:48:56 +01:00
Nat Goodspeed 67da0c7f60 DRTVWR-601: Update vulkan_gltf to GHA build. 2023-12-15 16:23:49 -05:00
Nat Goodspeed d07cd115e3 DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub. 2023-12-15 16:14:38 -05:00
Nat Goodspeed 1df31d64e8 DRTVWR-601: Update mikktspace and tinygltf to GHA package builds. 
Ditch 32-bit Windows build of mikktspace.
 2023-12-15 16:13:51 -05:00
Ansariel 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
Ansariel 881eb4fd02 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-12-15 18:23:24 +01:00
Andrey Lihatskiy 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