2c52b8b243
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/fix-incredibuild.py
# indra/newview/CMakeLists.txt
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/viewer_manifest.py
2024-04-24 16:27:23 +02:00
5e40b5e644
Revert "SL-20140 Setting shape hand size to 36 won't save"
...
This reverts commit 810a3d24c2secondlife/jira-archive-internal#70482 )
2024-04-19 00:54:51 +03:00
7f8931fd96
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/release.yaml
# autobuild.xml
# indra/newview/llscrollingpanelparam.cpp
2023-12-12 12:57:27 +01:00
810a3d24c2
SL-20140 Setting shape hand size to 36 won't save
2023-12-06 18:51:53 +01:00
dec9d86de5
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/notifications.xml
2023-12-01 12:41:06 +01:00
386053303b
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/llimagedimensionsinfo.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2023-08-22 17:13:16 +02:00
b07a9cfec3
SL-20140 Setting shape hand size to 36 won't save
2023-08-21 11:39:25 +02:00
b96f92f884
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-05-19 20:31:00 +02:00
b3bfe05494
SL-10025 - via Cathy Foil, all bones now have standard alias 'avatar_' + name.
...
# Conflicts:
# scripts/content_tools/anim_tool.py
2022-05-18 23:31:08 +03:00
5ac650e459
FIRE-30020 - Support 1024 bakes in opensim
2020-10-12 23:39:37 +01:00
a8a2265e62
Backed out changeset: 4a4c5e6ff01e
2019-06-14 12:03:00 -07:00
4aa24aa9da
[SL-11393] - use opaque bg on aux channels
2019-06-12 12:59:10 -07:00
75f9b96622
Merge viewer-baking-updates
2019-05-02 18:47:11 +02:00
713daebc41
[SL-10823] - fix for black alpha aux layers
2019-04-30 15:46:00 -06:00
9944015842
Merge viewer-baking-updates
2018-08-03 13:21:08 +02:00
dcbf57ab2d
[MAINT-8846] - fixing duplicate id in avatar_lad.xml fixrs character test female crash. code cleanup.
2018-07-15 21:33:02 +05:30
0de7d1c227
Merge viewer-baking-updates
2018-06-28 16:28:45 +02:00
8a13530ce4
[MAINT-8742] - fix color/tint on universal tattoos
2018-06-27 03:08:06 +05:30
4aa45cb8e1
Merge viewer-baking-updates
2018-06-16 13:22:49 +02:00
7abb0c99be
[DRTVWR-476] - add universal head,upper,lower tattoos
2018-06-13 01:09:27 +05:30
56fc3222dc
[DRTVWR-476] - create new wearable type
2018-06-08 20:36:49 +05:30
31b62685f2
Merge viewer-baking-updates
2018-05-22 17:23:58 +02:00
3bf89821d9
[DRTVWR-455] - added 5 new bake channels
2018-05-21 16:00:52 -07:00
bc179e3b26
MAINT-8059 New head attachment slots are not rendered invisible in mouselook
2017-12-07 11:10:51 +02:00
b5d8138ec0
MAINT-8059 New head attachment slots are not rendered invisible in mouselook
2017-12-07 11:10:51 +02:00
1a74c055cb
Add Bento enhanced skeleton attachment points to pie menu
...
* Attachment spots have been manually added to menu_pie_avatar_self.xml and
menu_pie_object.xml due to the limitations of the pie menu with a total of 8
slices.
* "Left Hand" and "Right Hand" have been moved to the according "Left Arm" and
"Right Arm" groups to make room for the additionally needed Extended Skeleton
pie slice
* "Left Arm", "Right Arm", "Left Leg" and "Right Leg" groups have been
re-organized in a logical manner, since the current layout wasn't consistant
at all
2016-10-14 12:59:34 +02:00
0c7abda3c8
Merge bento-box
2016-09-14 23:25:42 +02:00
0ed6b643d3
SL-455 - avatar_lad.xml small fixes for asymmetry bugs
2016-09-13 06:42:33 -04:00
5cd545c40e
SL-455 - Fix for slider bug: body width on mTail6 had wrong scales.
2016-09-12 10:50:26 -04:00
4acba68785
Merge bento-box
2016-08-11 00:16:36 +02:00
b7a0d441a3
SL-126 - attachment logging under avatar at DEBUG level. Also fixed a typo in avatar_lad.xml
2016-08-09 09:17:37 -04:00
ba90b2d3c7
SL-433 - fix for mesh eye scaling with eye size slider. Previous values were based on incorrectly sized reference eyes.
2016-08-08 15:18:12 -04:00
a1655f032d
SL-424 - slider eye fixes, tail scaling with height
2016-07-12 15:06:48 -04:00
b73137ca17
SL-242 - eyelid slider fix
2016-07-12 08:42:10 -04:00
75ff4382d9
SL-242 - avatar_lad.xml syntax fix, added missing scale params to some skeletal distortions.
2016-07-11 18:19:37 -04:00
2929922ef2
SL-242 - more tweaks around alt eyes and wings. Alt eyes are now parented to face root, and alt eyes animate along with the original eyes inside the LLHeadRotMotion code.
2016-07-11 18:00:59 -04:00
9d8986337a
SL-242 - fix for slider param groups, added default args for skel_tool.py
2016-07-08 15:36:50 -04:00
888ed6d620
SL-242 - additional fixes for egghead slider
2016-07-08 14:51:30 -04:00
880fd82d0b
SL-424 - more proposed skeleton/slider fixes
2016-07-06 20:06:50 -04:00
575c28239d
Merge bento-box
2016-07-06 09:24:11 +02:00
84bdf7f626
SL-344 - fixes for scaling of mEye and mAltEye bones
2016-06-25 08:54:41 -04:00
4e3d76f52e
SL-344 - additional slider updates, including scaling of mEye bones
2016-06-24 09:46:34 -04:00
30d17f3fd5
SL-117, SL-344 - additional proposed updates for skeleton, sliders
2016-06-22 19:11:38 -04:00
0d4e4cb2be
SL-117 - possible skeleton changes for endpoints, jaw, eyelids
2016-06-21 17:26:41 -04:00
ccf6b6179d
SL-398 - fix for eyelash-related sliders in avatar_lad.xml
2016-06-17 14:14:07 -04:00
88b928e1dd
Merge bento-box
2016-06-16 00:53:56 +02:00
dcb8880f29
SL-276 - small skeleton file tweaks to 'end' and 'connected' attributes (no functional impact on viewer)
2016-06-09 10:09:46 -04:00
d7af1af1ec
MAINT-3745 - fix for long-standing slider bug with the pec collision volumes
2016-06-08 16:47:22 -04:00
1ca1253768
MAINT-6491 - slider fix for wings on male avatar
2016-06-08 14:42:27 -04:00
487f858c5e
SL-390 correct spelling of "tongue"
2016-06-02 17:48:03 -04:00
Ansariel