From 27c855149e657cebda863e279c8545f7816e1c18 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Aug 2010 13:36:28 -0400 Subject: First pass commit for breast physics. --- indra/newview/skins/default/xui/en/strings.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 676bef2d0b..e16bbfa5a5 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2471,6 +2471,20 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Bulbous Bulbous Nose +Breast Mass +Breast Smoothing + +Breast Side Spring +Breast Side Bounce +Breast Side Damping +Breast Side Drag +Breast Side Max + +Breast UpDown Spring +Breast UpDown Bounce +Breast UpDown Damping +Breast UpDown Drag +Breast UpDown Range Bushy Eyebrows Bushy Hair -- cgit v1.2.3 From 78538f4f618bebbdb4b441dc2b1e23877c0d3cb9 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Aug 2010 14:15:17 -0400 Subject: Changed Acceleration to gain. Changed behavior of gain. Changed names of Driver/Driven params. --- indra/newview/skins/default/xui/en/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e16bbfa5a5..7a010697ac 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2473,15 +2473,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Breast Mass Breast Smoothing +Breast Gravity Breast Side Spring -Breast Side Bounce +Breast Side Gain Breast Side Damping Breast Side Drag Breast Side Max Breast UpDown Spring -Breast UpDown Bounce +Breast UpDown Gain Breast UpDown Damping Breast UpDown Drag Breast UpDown Range -- cgit v1.2.3 From 981a43b355e44daa7e1b4065b896ea4cd2fec3a2 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Aug 2010 16:13:10 -0400 Subject: Created new wearable type. Added debug setting for disabling physics. Added disable-multiwear and disable-camera-reset to wearabletype. --- indra/newview/skins/default/xui/en/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7a010697ac..532a4a2e6d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1813,6 +1813,7 @@ Clears (deletes) the media and all params from the given face. Skirt Alpha Tattoo + Physics invalid none @@ -1828,6 +1829,7 @@ Clears (deletes) the media and all params from the given face. Skirt not worn Alpha not worn Tattoo not worn + Physics not worn invalid @@ -1846,6 +1848,7 @@ Clears (deletes) the media and all params from the given face. Create new skirt Create new alpha Create new tattoo + Create new physics invalid @@ -3186,6 +3189,7 @@ Abuse Report New Skirt New Alpha New Tattoo + New Physics Invalid Wearable New Gesture New Script -- cgit v1.2.3 From 2c6a9dd47e617c79ab3df4d758cd9f2e6b77c21a Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Aug 2010 17:38:31 -0400 Subject: Changed "Range" to "Max Velocity" Changed logic to reset to user params if velocity is 0. Code cleanup. Took out extraneous "Physics" accordions from previous implementation. --- indra/newview/skins/default/xui/en/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 532a4a2e6d..9fbb1ed045 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2482,13 +2482,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Breast Side Gain Breast Side Damping Breast Side Drag -Breast Side Max +Breast Side Max Breast UpDown Spring Breast UpDown Gain Breast UpDown Damping Breast UpDown Drag -Breast UpDown Range +Breast UpDown Range Bushy Eyebrows Bushy Hair -- cgit v1.2.3 From 8c95027334b24130dfdc1a51b3020156f371d538 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 24 Aug 2010 11:54:22 -0400 Subject: Moved BreastMotion class to its own separate file out of llvoavatar. Changed range of some breast motion params. Updated icon. --- indra/newview/skins/default/xui/en/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 9fbb1ed045..8b5389fd90 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2482,13 +2482,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Breast Side Gain Breast Side Damping Breast Side Drag -Breast Side Max +Breast Side Max Speed Breast UpDown Spring Breast UpDown Gain Breast UpDown Damping Breast UpDown Drag -Breast UpDown Range +Breast UpDown Max Speed Bushy Eyebrows Bushy Hair -- cgit v1.2.3 From 3825ee503ddab29cf408ae35f5a43bcc154353f2 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 17 Mar 2011 17:36:01 -0400 Subject: Work in progress. Big code cleanup ported from TheShining/avatar-physics (defunct branch). Added butt and belly. --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 30de6d14c6..3c7d7d1777 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2530,6 +2530,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Bushy Eyebrows Bushy Hair Butt Size +Butt Gravity Bustle Skirt No Bustle More Bustle -- cgit v1.2.3 From 53a944f2859d07eceed2a01a6b4f7339c0c591d9 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 18 Mar 2011 18:02:27 -0400 Subject: Set default parameters. Renamed various parameters. --- indra/newview/skins/default/xui/en/strings.xml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 3c7d7d1777..e5d52b03e5 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2500,8 +2500,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Body Thin Bow Legged -Breast Buoyancy -Breast Cleavage +Breast Buoyancy +Breast Cleavage Breast Size Bridge Width Broad @@ -2527,6 +2527,18 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Breast UpDown Drag Breast UpDown Max Speed +Belly Updown Bounce +Belly Updown Spring +Belly Updown Gain +Belly Updown Damping +Belly Updown Max Speed + +Butt UpDown Bounce +Butt UpDown Spring +Butt UpDown Gain +Butt UpDown Damping +Butt UpDown Max Speed + Bushy Eyebrows Bushy Hair Butt Size -- cgit v1.2.3 From 717d81daa7f42d18ca37eb738ceacfe2b9c1a09a Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 21 Mar 2011 12:04:31 -0400 Subject: Added left-right butt control. Did a bunch of code cleanup. --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e5d52b03e5..e183b0ba78 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2534,6 +2534,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Belly Updown Max Speed Butt UpDown Bounce +Butt LeftRight Bounce Butt UpDown Spring Butt UpDown Gain Butt UpDown Damping -- cgit v1.2.3 From 92802e69509824f1d3dca212726373fd9d799104 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 29 Mar 2011 21:56:18 -0400 Subject: Fixed some labels, and made some labels/wearables hidden in edit. Added accordions for physics. --- indra/newview/skins/default/xui/en/strings.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e183b0ba78..9570e28d26 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2500,7 +2500,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Body Thin Bow Legged -Breast Buoyancy +Breast Buoyancy Breast Cleavage Breast Size Bridge Width @@ -2527,14 +2527,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Breast UpDown Drag Breast UpDown Max Speed -Belly Updown Bounce Belly Updown Spring Belly Updown Gain Belly Updown Damping Belly Updown Max Speed -Butt UpDown Bounce -Butt LeftRight Bounce Butt UpDown Spring Butt UpDown Gain Butt UpDown Damping -- cgit v1.2.3 From 993ad22f9ffeae6d20f75dc409cf0128ca167a0e Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 30 Mar 2011 19:28:03 -0400 Subject: Cleanup to logically group physics params in avatar_lad.xml. Added more controls for belly & butt. Cleaned up code around physics parameter initialization. --- indra/newview/skins/default/xui/en/strings.xml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 9570e28d26..e12f7c679e 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2514,28 +2514,39 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Breast Mass Breast Smoothing Breast Gravity - Breast Side Spring Breast Side Gain Breast Side Damping Breast Side Drag Breast Side Max Speed - Breast UpDown Spring Breast UpDown Gain Breast UpDown Damping Breast UpDown Drag Breast UpDown Max Speed -Belly Updown Spring -Belly Updown Gain -Belly Updown Damping -Belly Updown Max Speed - +Belly Mass +Belly Smoothing +Belly Gravity +Belly UpDown Spring +Belly UpDown Gain +Belly UpDown Damping +Belly UpDown Drag +Belly UpDown Max Speed + +Butt Mass +Butt Smoothing +Butt Gravity Butt UpDown Spring Butt UpDown Gain Butt UpDown Damping +Butt UpDown Drag Butt UpDown Max Speed +Butt LeftRight Spring +Butt LeftRight Gain +Butt LeftRight Damping +Butt LeftRight Drag +Butt LeftRight Max Speed Bushy Eyebrows Bushy Hair -- cgit v1.2.3 From 1ceb29bdacb309ed374128feae879953c2e13820 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 30 Mar 2011 23:17:58 -0400 Subject: Change in physics parameter names. Split some physics parameters into separate accordions based on updown/leftright. Fixed a minor issue with physics edit tab height. --- indra/newview/skins/default/xui/en/strings.xml | 71 ++++++++++++++------------ 1 file changed, 38 insertions(+), 33 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e12f7c679e..88b5eb7e23 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2501,7 +2501,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Bow Legged Breast Buoyancy -Breast Cleavage +Breast Cleavage Breast Size Bridge Width Broad @@ -2511,42 +2511,47 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Bulbous Bulbous Nose -Breast Mass -Breast Smoothing -Breast Gravity -Breast Side Spring -Breast Side Gain -Breast Side Damping -Breast Side Drag -Breast Side Max Speed -Breast UpDown Spring -Breast UpDown Gain -Breast UpDown Damping -Breast UpDown Drag -Breast UpDown Max Speed - -Belly Mass -Belly Smoothing -Belly Gravity -Belly UpDown Spring -Belly UpDown Gain -Belly UpDown Damping -Belly UpDown Drag -Belly UpDown Max Speed +Mass +Smoothing +Gravity + +Max Effect +Spring +Gain +Damping +Drag + +Max Effect +Spring +Gain +Damping +Drag + +Mass +Smoothing +Gravity + +Max Effect +Spring +Gain +Damping +Drag Butt Mass Butt Smoothing Butt Gravity -Butt UpDown Spring -Butt UpDown Gain -Butt UpDown Damping -Butt UpDown Drag -Butt UpDown Max Speed -Butt LeftRight Spring -Butt LeftRight Gain -Butt LeftRight Damping -Butt LeftRight Drag -Butt LeftRight Max Speed + +Max Effect +Spring +Gain +Damping +Drag + +Max Effect +Spring +Gain +Damping +Drag Bushy Eyebrows Bushy Hair -- cgit v1.2.3 From 90b6b7e1b70a9bc8eb5def793616149fa0fceb4d Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 31 Mar 2011 11:38:34 -0400 Subject: Created Advanced Physics panel. Made a bunch of aesthetic changes to physics panel accordion. --- indra/newview/skins/default/xui/en/strings.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 88b5eb7e23..6f03606869 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2511,31 +2511,31 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Bulbous Bulbous Nose -Mass -Smoothing -Gravity +Breast Mass +Breast Smoothing +Breast Gravity Max Effect Spring Gain Damping -Drag +Breast Cleavage Drag Max Effect Spring Gain Damping -Drag +Breast Bounce Drag -Mass -Smoothing -Gravity +Belly Mass +Belly Smoothing +Belly Gravity Max Effect Spring Gain Damping -Drag +Belly Bounce Drag Butt Mass Butt Smoothing @@ -2545,13 +2545,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Spring Gain Damping -Drag +Butt Bounce Drag Max Effect Spring Gain Damping -Drag +Butt Sway Drag Bushy Eyebrows Bushy Hair -- cgit v1.2.3 From cc2a813ce40a09bab230a62809f5ff21083a81f2 Mon Sep 17 00:00:00 2001 From: Seraph Linden Date: Sat, 2 Apr 2011 18:36:49 -0400 Subject: Moved Drag to be a general shape physics param, to save on number of transmitted params. --- indra/newview/skins/default/xui/en/strings.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 6f03606869..879ed2b505 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2514,44 +2514,42 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Breast Mass Breast Smoothing Breast Gravity +Breast Drag Max Effect Spring Gain Damping -Breast Cleavage Drag Max Effect Spring Gain Damping -Breast Bounce Drag Belly Mass Belly Smoothing Belly Gravity +Belly Drag Max Effect Spring Gain Damping -Belly Bounce Drag Butt Mass Butt Smoothing Butt Gravity +Butt Drag Max Effect Spring Gain Damping -Butt Bounce Drag Max Effect Spring Gain Damping -Butt Sway Drag Bushy Eyebrows Bushy Hair -- cgit v1.2.3 From a47ea6c619d1b689478f9e41c87cb89c010273de Mon Sep 17 00:00:00 2001 From: Seraph Linden Date: Sun, 3 Apr 2011 13:56:55 -0400 Subject: Added breast sway (left-right). --- indra/newview/skins/default/xui/en/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 879ed2b505..b4c3ab3817 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2526,6 +2526,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Gain Damping +Max Effect +Spring +Gain +Damping + Belly Mass Belly Smoothing Belly Gravity -- cgit v1.2.3 From e8f2380489b9ce58f7a7bb047231256ae7833309 Mon Sep 17 00:00:00 2001 From: Seraph Linden Date: Sun, 3 Apr 2011 13:59:19 -0400 Subject: Changed Max Velocity param name to Max Effect --- indra/newview/skins/default/xui/en/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index b4c3ab3817..548d49308f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2516,17 +2516,17 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Breast Gravity Breast Drag -Max Effect +Max Effect Spring Gain Damping -Max Effect +Max Effect Spring Gain Damping -Max Effect +Max Effect Spring Gain Damping @@ -2536,7 +2536,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Belly Gravity Belly Drag -Max Effect +Max Effect Spring Gain Damping @@ -2546,12 +2546,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Butt Gravity Butt Drag -Max Effect +Max Effect Spring Gain Damping -Max Effect +Max Effect Spring Gain Damping -- cgit v1.2.3 From 62ebe50a561694d2072dcf4db27119303c686bb8 Mon Sep 17 00:00:00 2001 From: Seraph Linden Date: Sun, 3 Apr 2011 21:16:34 -0400 Subject: Added duplicate morph to handle breast bounce/clap. Took out unused params in llphysicsmotion.cpp. --- indra/newview/skins/default/xui/en/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 548d49308f..3b59642bfb 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2500,8 +2500,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Body Thin Bow Legged -Breast Buoyancy -Breast Cleavage +Breast Buoyancy +Breast Cleavage Breast Size Bridge Width Broad -- cgit v1.2.3