Commit graph

2191 commits

Author SHA1 Message Date
Anthony Thibault
569bef50fd AnimPose operator* optimizations 2019-02-05 14:48:05 -08:00
luiscuenca
a6dce5dd84 Merge branch 'master' into multiSphereAvatar04 2019-01-28 17:48:22 -07:00
Shannon Romano
607ce00713
Merge pull request #14766 from AndrewMeadows/grab-it
case 20701: fixes for grab
2019-01-28 15:57:36 -08:00
luiscuenca
cc73649ef8 Merge branch 'master' into multiSphereAvatar04 2019-01-28 11:57:04 -07:00
Jamil Akram
bcaad3092b
Merge pull request #14695 from amantley/trumpFix
Fixed Sinking Trump Avatar Bug: Stops unnecessary vertical re-centering with big-headed avatar
2019-01-28 10:12:55 -08:00
Shannon Romano
a2b2f3f67c
Merge pull request #14742 from hyperlogic/bug-fix/user-recenter-model-pref
Settings > Controls > User Recenter Model now saves properly
2019-01-25 17:34:33 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type
Added HMD Avatar Alignment Type
2019-01-25 17:32:41 -08:00
amantley
91fddf783f increased the threshold to stop vertical recentering 2019-01-25 16:09:45 -08:00
amantley
cc4d9e2ae2 Merge remote-tracking branch 'upstream/master' into trumpFix 2019-01-25 15:05:00 -08:00
luiscuenca
f54f9e5bfd Merge branch 'master' into multiSphereAvatar04 2019-01-25 13:54:01 -07:00
luiscuenca
df4be641eb More fixes 2019-01-25 13:42:18 -07:00
Shannon Romano
28edb472fc
Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale
20565 Avatar::_collideWithOtherAvatars does not scale
2019-01-25 11:06:36 -08:00
Andrew Meadows
09fe9735fa plug grab leak, more correct names 2019-01-24 14:57:54 -08:00
Andrew Meadows
ee3fde9df1 unravel spaghetti, prefer std over Qt containers 2019-01-24 14:39:00 -08:00
Anthony Thibault
a7a71e4286 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-23 15:52:20 -08:00
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
Anthony Thibault
205e375d36 Settings > Controls > User Recenter Model now saves properly 2019-01-18 16:58:26 -08:00
raveenajain
d2e37d0c90 my and other avater changes, if setting toggled can pass through other avatar 2019-01-18 16:50:44 -08:00
Andrew Meadows
9a854291af supress spurious not important AvatarEntity updates 2019-01-18 15:36:38 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter
Limit upstream bandwidth to the Avatar Mixer
2019-01-18 13:32:03 -08:00
luiscuenca
43244193e8 Mesh picking against default pose with transformed ray 2019-01-18 12:46:18 -07: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
Adam Smith
f955313afc
Merge pull request #14687 from SamGondelman/cancel
Case 20580: Trying to fix wearables and avatar app
2019-01-17 11:25:30 -08:00
SamGondelman
9727c8fd38 CR 2019-01-16 14:14:01 -08:00
luiscuenca
67cc5bd7f2 Fix warnings and wrong shapes position for myAvatar 2019-01-16 10:52:34 -07:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d
Make mouselook directly proportional to right-click mouse
2019-01-16 09:09:38 -08:00
luiscuenca
a7f143dbce Merge branch 'master' into multiSphereAvatar04
# Resolved Conflicts:
#	interface/src/avatar/MyAvatar.h
#	interface/src/avatar/OtherAvatar.cpp
2019-01-15 18:27:04 -07:00
luiscuenca
71e7023a3e Refactor and optimizations 2019-01-15 18:07:50 -07:00
Clement
8480624797 Limit upstream data to avatar mixer 2019-01-15 14:18:53 -08:00
SamGondelman
68e15c6c07 fixes from 78 2019-01-14 13:36:21 -08:00
luiscuenca
19701ef333 Fix scale and add rayTest 2019-01-11 15:36:07 -07:00
amantley
8cba72743e changed the value for the top threshold that triggers a vertical reset, this stops unwanted recentering 2019-01-11 08:46:20 -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
8206daf1a6 send update when loading AvatarEntity from Settings 2019-01-09 17:28:00 -08:00
Andrew Meadows
e2d6e6f3dc more correct AvatarEntityData settings when switching domains 2019-01-09 17:28:00 -08:00
Andrew Meadows
27318a3f17 update AvatarEntitData blobs before writing to JSON during recordings 2019-01-09 17:28:00 -08:00
Andrew Meadows
c998ddbb9e ScriptableAvatar::setAvatarEntityData() works 2019-01-09 17:28:00 -08:00
Andrew Meadows
63ed0a3a98 move blob conversion recipes to EntityItemProperties 2019-01-09 17:28:00 -08:00
Andrew Meadows
855497e604 MyAvatar.updateAvatarEntity(id, data) works in theory 2019-01-09 17:28:00 -08:00
Andrew Meadows
a4be4fb6c0 MyAvatar.setAvatarEntityData() works 2019-01-09 17:28:00 -08:00
Andrew Meadows
329ec84104 MyAvatar.setAvatarEntityData() works in theory, blobs saved to settings 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
43fc86fe54 restore non-human-readable avatarEntityDataSettings format 2019-01-09 17:27:14 -08:00
Andrew Meadows
dedc14434b fix compile warnings on windows 2019-01-09 17:27:14 -08:00
Andrew Meadows
320ba9177c remove cruft 2019-01-09 17:27:14 -08:00
Andrew Meadows
121a591023 delete old AvatarEntities on domain reset on login 2019-01-09 17:27:14 -08:00
Andrew Meadows
1815d71158 fix data corruption bug 2019-01-09 17:27:14 -08:00
Andrew Meadows
ce660bee9b fix compile errors after rebase 2019-01-09 17:27:14 -08:00