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

3203 Commits (f4250bcfaff4e5047d3d585f7ecd2f7dec3956e9)

Author SHA1 Message Date
Ansariel f4250bcfaf Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/llmanip.cpp
#	indra/newview/llmaniptranslate.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/pipeline.h
 2024-04-24 22:05:15 +02:00
Ansariel 4a2790a987 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/newview/app_settings/graphic_preset_controls.xml
 2024-04-24 21:10:15 +02:00
Brad Linden 86c0c1d553 Merge remote-tracking branch 'origin/main' into release/materials_featurette 2024-04-24 09:55:34 -07:00
Rye Mutt e361671018
Port from OpenEXR to TinyEXR for reduced installer and library size (#1287) 2024-04-19 14:39:28 -05:00
RunitaiLinden 3ebf8761bc Update autobuild.xml 2024-04-19 11:17:33 -05:00
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 096aef2a72 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-10 01:49:35 +02:00
Brad Linden 5a47a3cb23 Merge remote-tracking branch 'origin/main' into release/materials_featurette 2024-04-09 14:17:34 -07: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
Ansariel 22d4c8b94d Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-02 19:35:40 +02: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
Andrey Lihatskiy 990c8b81da Merge branch 'main' into marchcat/yz-merge 2024-03-27 01:40:12 +02:00
Andrey Lihatskiy 78174fc865 Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W 
# Conflicts:
#	.github/workflows/build.yaml
 2024-03-27 00:14:56 +02: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
Ansariel 051c9bafc8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-23 12:40: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 efe7cdf153 Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/skins/default/xui/de/panel_region_terrain.xml
#	indra/newview/skins/default/xui/es/panel_region_terrain.xml
#	indra/newview/skins/default/xui/fr/panel_region_terrain.xml
#	indra/newview/skins/default/xui/it/panel_region_terrain.xml
#	indra/newview/skins/default/xui/ja/panel_region_terrain.xml
#	indra/newview/skins/default/xui/pt/panel_region_terrain.xml
#	indra/newview/skins/default/xui/ru/panel_region_terrain.xml
#	indra/newview/skins/default/xui/tr/panel_region_terrain.xml
#	indra/newview/viewer_manifest.py
 2024-03-15 22:52:24 +01:00
Ansariel 60f4614a2b Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-15 21:08:35 +01:00
RunitaiLinden 4c3d090bf4 #926 Unshuffle autobuild.xml 2024-03-13 14:47:31 -05:00
RunitaiLinden 5c605a60f5 Revert "secondlife/viewer#926 further work on mac openexr lib." 
This reverts commit ce6170802d.
 2024-03-13 14:42:22 -05:00
Brad Linden ce6170802d secondlife/viewer#926 further work on mac openexr lib. 
switching mac lib to be statically linked

autobuild installables edit openexr platform=darwin64 url=https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-darwin64-df7544d.tar.zst hash_algorithm=sha1 hash=17cd63922214b588d9a36137fadf927237ec0f25
autobuild installables edit openexr platform=linux64 url=https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-linux64-df7544d.tar.zst hash_algorithm=sha1 hash=b092658ab5ec009a5875e8b6e5b7109730ad6846
autobuild installables edit openexr platform=windows64 url=https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-windows64-df7544d.tar.zst hash_algorithm=sha1 hash=c511ae9a3e401375af2199b498a75f32cebc010f
 2024-03-12 16:46:48 -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
Beq 1d6d5c3c52 Use our modified font package that has B&W emoji font. 2024-03-09 00:23:18 +00:00
Ansariel 2c64715842 Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llimage/llimagebmp.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llrender/llrender.cpp
#	indra/llui/lltransutil.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llfilepicker.h
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/viewer_manifest.py
 2024-03-08 20:35:53 +01:00
Ansariel dec97544fc Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-08 19:12:09 +01:00
RunitaiLinden c1bde75768
HDRI Local Preview (#953) 
* #926 WIP - HDRI import prototype v0

* #926 WIP -- add OpenEXR to autobuild.xml

* #926 WIP -- Add OpenEXR cmake

* #926 WIP -- Attempt at using OpenEXR autobuild package and don't hard code .exr file to load

* #926 Unmangle autobuild.xml and get dll's in the right place (thanks, Caladbolg!)

* implement mac shared libs plumbing for OpenEXR for secondlife/viewer#926

* Fix Xcode/clang compile error regarding new[]/delete[] mismatch

* #926 HDRI Preview finishing touches.

- Full ACES when HDRI is enabled
- Fix for probes getting stuck paused
- Add exposure and rotation controls

---------

Co-authored-by: Brad Linden <brad@lindenlab.com>
 2024-03-08 12:01:20 -06: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
Brad Linden 258c039584 Merge remote-tracking branch 'origin/main' into release/gltf-maint2 2024-03-01 10:12:00 -08:00
Andrey Lihatskiy faf69f407f Merge branch 'main' into marchcat/yz-merge 
# Conflicts:
#	indra/newview/llinventorygallery.cpp
 2024-03-01 18:02:48 +02:00
Andrey Lihatskiy 6d077c90a0 Merge branch 'main' into DRTVWR-588-maint-W 2024-03-01 17:30:06 +02: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