Commit graph

381 commits

Author SHA1 Message Date
Jeff Clinton
3776472550
Merge pull request #14731 from AndrewMeadows/fix-mexico-hats
cases 20709 and 20715: wear and see mexico hats
2019-01-22 12:58:56 -08:00
Andrew Meadows
74f9a415d3 move _cauterizationNeedsUpdate back to MyAvatar 2019-01-17 13:58:34 -08:00
Seth Alves
4fbc257be0 don't cauterize head-children when they are grabbed 2019-01-17 13:34:36 -08:00
Roxanne Skelly
6317ceb9b3 Case20277 - Ignoring user causes loading orb to appear at /0,0,0
Loading orb was created for all other avatars upon OtherAvatar object
creation without checking the ignore list.
2019-01-15 13:34:29 -08:00
Andrew Meadows
9ea6968e35 fix bug where attached AvatarEntities do not update in timely fashion 2019-01-09 17:40:18 -08:00
Andrew Meadows
c998ddbb9e ScriptableAvatar::setAvatarEntityData() works 2019-01-09 17:28:00 -08:00
Andrew Meadows
a4be4fb6c0 MyAvatar.setAvatarEntityData() works 2019-01-09 17:28:00 -08:00
Andrew Meadows
cbcd70aee6 namechanges and comments to help clarify necessary fixes 2019-01-09 17:28:00 -08:00
Andrew Meadows
9f404ef006 Agent bots can manipulate AvatarEntities again 2019-01-09 17:28:00 -08:00
Andrew Meadows
d622635a71 fix wording in comment to reflect new 'HostType' parameter 2019-01-09 17:27:14 -08:00
Andrew Meadows
c4115bece3 remove unused ScriptEngine instance 2019-01-09 17:27:14 -08:00
Andrew Meadows
09f3b8f485 add bit of sanity checking for incomming AvatarEntities data 2019-01-09 17:27:14 -08:00
Andrew Meadows
61b8d005b5 scripts can edit AvatarEntities again 2019-01-09 17:27:14 -08:00
Andrew Meadows
e37b5b52f0 correctly load AvatarEntities from settings redux 2019-01-09 17:27:14 -08:00
Andrew Meadows
01fc442695 save AvatarEntities settings as strings 2019-01-09 17:27:14 -08:00
Andrew Meadows
d3fea94540 send AvatarEntities via raw data packet 2019-01-09 17:27:14 -08:00
John Conklin II
e4abb66199
Merge pull request #14627 from AndrewMeadows/fewer-avatar-entity-updates
case 20304: please don't flood the avatar-mixer with unnecessary AvatarEntity udpates
2019-01-09 14:55:23 -08:00
Sam Gondelman
db3187ec6c
Merge branch 'master' into propFix 2019-01-07 14:57:38 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption
Add menu checkbox to toggle collisions with other avatars
2019-01-07 08:58:09 -08:00
SamGondelman
b5b7574c48 set created 2019-01-04 16:52:11 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Jeff Clinton
c2c744b44e
Merge pull request #14622 from SimonWalton-HiFi/avatar-scaling-delayed
Correctly set avatar-scale timestamp when changing in Avatar class
2019-01-04 10:00:46 -08:00
Andrew Meadows
65a7e15f5d don't send AvatarEntity updates when not necessary 2019-01-03 17:57:11 -08:00
Anthony Thibault
fa137f0586 Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation 2019-01-03 13:19:11 -08:00
Seth Alves
3c0243419b trying again on avatar-entity grab releases 2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1 fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again 2019-01-03 08:17:52 -08:00
Seth Alves
fc128b49de don't crash when releasing an entity that has expired 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Anthony Thibault
d87bc3e898 Update eye look at interest calculation
This now takes distance, your facing toward them, and their facing toward you into the interest calculation.
Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar.
Previously these two separate elements where merged together in a single loop.
2018-12-31 13:37:22 -08:00
Simon Walton
9cb53af023 Correct set avatar-scale timestamp when changing in Avatar class 2018-12-19 16:13:12 -08:00
amantley
42a17980cb fixed mac build conflict, unused variable 2018-12-17 16:21:22 -08:00
Angus Antley
77fa4e7d13 took out the unnecessary hfm.jointindex code 2018-12-16 17:29:16 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
SamGondelman
e282d51883 CR 2018-11-26 01:15:07 -05:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
153b8920be
Merge pull request #14348 from sabrina-shanman/hfm_library
(case 19302) Create the HFM library and namespace
2018-11-13 12:03:53 -08:00
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
sabrina-shanman
753557736e Merge branch 'master' into hfm_library 2018-11-12 15:03:30 -08:00
SamGondelman
df1a848811 fix fade out 2018-11-12 12:58:40 -08:00
SamGondelman
1d1510e18e Merge remote-tracking branch 'upstream/master' into police 2018-11-09 13:32:41 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations.
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
2018-11-06 16:24:32 -08:00
Andrew Meadows
6ecf850159 clarify ShapeInfo::setCapsuleY() API and use it correctly 2018-11-06 12:37:55 -08:00
John Conklin II
4d74f7a0da
Merge pull request #14338 from sabrina-shanman/hfm_geo2model
(case 19302) Rename HFMGeometry to HFMModel and adjust related variables
2018-11-05 15:00:06 -08:00
sabrina-shanman
2801f324b7 Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00
sabrina-shanman
30eb360f62 Convert remaining HFMModels called model to hfmModel, and rename some missed local variables 2018-11-05 12:07:17 -08:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-11-02 16:44:31 -07:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
Anthony Thibault
5c78a463de
Merge pull request #14270 from luiscuenca/softEntitiesLooseJointsFix
Extra joints on soft entities keep their local transform
2018-11-01 09:29:16 -07:00