d9153532b8
Merge branch 'main' into marchcat/x-mf-merge
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
2024-05-15 12:51:21 +03:00
094dcc07f8
Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705 : Maintenance X
2024-05-14 21:02:28 -04:00
1e9e5a7b76
Merge remote-tracking branch 'origin/main' into release/materials_featurette
2024-05-14 09:42:24 -07:00
85af619bbb
Reapply slvoice package URLs with autobuild 3.9.5
2024-05-10 09:10:18 -04:00
692a5eb2d3
Remove `creds=github` from slvoice platform entries.
...
https://github.com/secondlife/autobuild/issues/46
Also remove temporary `continue-on-error` setting.
2024-05-09 11:12:18 -04:00
3c023813dc
Update to S3-published GHA build of slvoice.
2024-05-06 12:34:41 -04:00
9bf2dfbb39
Use s3 hosted slvoice autobuild dependencies
...
Pull SLVoice from s3 so that the OSS build configurations work.
2024-04-29 23:51:02 +03:00
86c0c1d553
Merge remote-tracking branch 'origin/main' into release/materials_featurette
2024-04-24 09:55:34 -07:00
428f21cf79
Merge branch 'main' into marchcat/x-merge
2024-04-24 18:45:54 +03:00
e361671018
Port from OpenEXR to TinyEXR for reduced installer and library size ( #1287 )
2024-04-19 14:39:28 -05:00
3ebf8761bc
Update autobuild.xml
2024-04-19 11:17:33 -05:00
355f231f0c
Merge pull request #1224 from nerodevo/autobuild-revert
...
Revert removal of llphysicsextension_stub for Windows
2024-04-16 21:58:36 +03:00
d06e000435
Change windows to windows64 again
...
Missed the second change... Here it is.
2024-04-16 11:08:23 -05:00
b04b4de465
Change windows to windows64
2024-04-16 10:52:24 -05:00
ae79615794
Revert "DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub."
...
This reverts commit d07cd115e3
2024-04-13 06:31:38 -05:00
eab5beb54c
Merge branch 'main' into marchcat/x-merge
...
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
2024-04-12 15:43:34 +03:00
5a47a3cb23
Merge remote-tracking branch 'origin/main' into release/materials_featurette
2024-04-09 14:17:34 -07:00
990c8b81da
Merge branch 'main' into marchcat/yz-merge
2024-03-27 01:40:12 +02:00
1ae6f5dd6f
Merge branch 'main' into DRTVWR-591-maint-X
...
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterenvironmentadjust.cpp
# indra/newview/llpaneleditwater.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
2024-03-27 00:33:40 +02:00
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
2f452d06e6
Proposal #2 to restore how UI/dialogs used to render by prioritizing fallback fonts.
...
With the emojis support, a new font was added, which not only provides emojis
but also fancy colorful replacements for UTF-8 characters that used to be
supported by our fallback (monochrome) fonts: this causes discrepancies and
unwanted/undesired changes in scripted objects menus (e.g. an empty circle or
square may render as a black, full one, a heart may render red instead of white),
not to mention the larger font size used by the emoji characters...
This patch restores the aspect of such menus/dialogs/UI elements with UTF-8
characters that *are* supported by the usual fallback fonts (fonts which may
also vary from one viewer to another, and from one OS to another), so that
everything keeps working/rendering as it always did so far, while not impairing
the use of new colorful emojis.
This second proposal ensures that:
- "genuine" emojis (in the 0x1f000-0x1ffff range), will *always* be rendered
using the new emojis font (this solves, for example, the monochrome "yellow
faces" issue seen with some characters in my first proposal).
- Special UTF-8 characters (in the 0x2000-0x32FF range) which have been used by
scripters so far, will render as they used to, using the monochrome fallback
fonts (this repairs scripted dialogs menus).
- Remaining special characters, that do not have a corresponding glyph in the
monochrome font, but do have one in the emojis font, will use the latter font
to render.
It also got the nice side-effect of removing the dependency on the ICU4C library.
Note however that the recent commit:
326055ba82
2024-03-14 01:47:14 +02:00
4c3d090bf4
#926 Unshuffle autobuild.xml
2024-03-13 14:47:31 -05:00
5c605a60f5
Revert "secondlife/viewer#926 further work on mac openexr lib."
...
This reverts commit ce6170802d
2024-03-13 14:42:22 -05:00
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
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
be35287184
SL-20429 Fix emoji categories having mixed translations
...
Was caused by package substituting '&' with 'and' instead of '&'
2024-03-06 12:42:57 +02:00
b68a05e7c3
Merge branch 'main' into marchcat/x-merge
...
# Conflicts:
# indra/llcommon/llstring.cpp
# indra/llcommon/llstring.h
2024-03-04 18:01:05 +02:00
258c039584
Merge remote-tracking branch 'origin/main' into release/gltf-maint2
2024-03-01 10:12:00 -08:00
faf69f407f
Merge branch 'main' into marchcat/yz-merge
...
# Conflicts:
# indra/newview/llinventorygallery.cpp
2024-03-01 18:02:48 +02:00
6d077c90a0
Merge branch 'main' into DRTVWR-588-maint-W
2024-03-01 17:30:06 +02:00
ea916ad950
DRTVWR-594 Update llca to version 202402012004.0
2024-02-02 00:23:36 +02:00
39aefc63d1
Issue #716 Update Fmod Studio to version 2.02.20
2024-02-01 21:56:26 +02:00
0752cc0792
DRTVWR-601: Merge branch 'release/gltf-maint2' into DRTVWR-601-gha-libs
2024-01-19 11:38:02 -05:00
0fa6ff2b1f
Undo re-ordering of autobuild.xml ( #638 )
2024-01-16 11:08:39 -06:00
fab4cfbab2
SL-20704 Fix for pathfinding debug display not working.
2024-01-10 13:50:15 -06:00
6e6df8c31e
SL-20747 Fix pshell command failing in some cases
2024-01-08 19:27:58 +02:00
bc3076938e
DRTVWR-601: Update xxhash common platform to GHA build.
...
Remove identical platform-specific package references.
2023-12-20 12:50:34 -05:00
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
aed6313d7c
Merge branch 'main' into DRTVWR-594-maint-Y
2023-12-18 06:33:57 +02:00
67da0c7f60
DRTVWR-601: Update vulkan_gltf to GHA build.
2023-12-15 16:23:49 -05:00
d07cd115e3
DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub.
2023-12-15 16:14:38 -05:00
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
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
4b98ae6e8a
Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
...
# Conflicts:
# indra/newview/llspatialpartition.cpp
2023-12-14 02:47:44 +02:00
88921452ad
DRTVWR-489 Restore autobuild.xml format
2023-12-13 06:26:06 +02:00
5b789e05f5
DRTVWR-489 Update freetype to v.2.12.1.557becd
2023-12-12 19:02:54 +02:00
eff5958c11
Fix formatting in autobuild.xml (indents in close tags)
2023-12-05 20:37:21 +01:00
86a437d96c
DRTVWR-587 Update llca to version 202312051404.0
2023-12-05 18:40:08 +02:00
07ace73c49
DRTVWR-587 Update llca to version 202312051404.0
2023-12-05 16:17:04 +02:00
c9cd5631e4
Merge branch 'main' into DRTVWR-489
2023-12-05 03:37:06 +01:00
Andrey Lihatskiy