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

3179 Commits (2c6a6294fed78f47dece54301ac2a259a1849cb6)

Author SHA1 Message Date
Ansariel 2474e3ba1d Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
 2024-04-10 10:03:37 +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 77b6a6e978 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-27 15:32:45 +01: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
Ansariel a8446ac624 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-24 21:52:26 +01:00
Pork Chop 159b94d8ea Linux: dullahan + cef - same version, replace with zstd compressed package instead. 2024-03-18 19:58:23 +11: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
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 799c2c6dab Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/newview/llinventorygallery.cpp
#	indra/newview/skins/default/xui/de/menu_viewer.xml
 2024-03-02 00:42:18 +01: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 c6356da181 Merge branch 'release/maint-yz' of https://github.com/secondlife/viewer 
# Conflicts:
#	README.md
#	autobuild.xml
#	indra/newview/llchiclet.h
 2024-02-05 23:45:27 +01:00
Ansariel 80579b7574 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-599 
# Conflicts:
#	indra/newview/llchiclet.h
 2024-02-05 23:32:19 +01:00
Andrey Lihatskiy ea916ad950 DRTVWR-594 Update llca to version 202402012004.0 2024-02-02 00:23:36 +02:00
Andrey Kleshchev 39aefc63d1 Issue #716 Update Fmod Studio to version 2.02.20 2024-02-01 21:56:26 +02: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 b9a2c8279f Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
 2024-01-09 10:54:50 +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
Ansariel e341621a8e Merge branch 'DRTVWR-594-maint-Y' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llmemory.cpp
#	indra/llui/lltooltip.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llpanelteleporthistory.cpp
#	indra/newview/skins/default/xui/en/menu_inventory.xml
#	indra/newview/skins/default/xui/en/notifications.xml
 2023-12-27 13:00:20 +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
Andrey Lihatskiy aed6313d7c Merge branch 'main' into DRTVWR-594-maint-Y 2023-12-18 06:33:57 +02: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