John Conklin II
d64858b1c7
Merge pull request #14724 from sethalves/fix-excessive-cauterization-update
...
case 15942: fix bug that caused avatar cauterization code to run constantly
2019-01-17 12:59:57 -08:00
John Conklin II
45ec44423b
Merge pull request #14694 from danteruiz/delete-only-domain-entities
...
case 20595: case 20563: Do not delete local entities when switching domains.
2019-01-17 11:25:58 -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
8d2e81a13b
Merge remote-tracking branch 'upstream/master' into matFallthrough
2019-01-17 10:27:43 -08:00
Wayne Chen
ef63213d28
fixing linking account problems on oculus/steam, changing callback
2019-01-16 21:07:54 -08:00
SamGondelman
62b853816a
deprecate the new property so that people hopefully don't use it
2019-01-16 19:35:15 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature
2019-01-16 17:24:22 -08:00
Wayne Chen
116a15afe8
removing oculus userID to server - no need
2019-01-16 17:15:40 -08:00
Wayne Chen
8e916ea41b
linking oculus acct creation to spinner
2019-01-16 17:05:59 -08:00
Wayne Chen
d38a657c54
filling username with oculus username, checking create error
2019-01-16 17:05:54 -08:00
Wayne Chen
2d16e71e74
adding sending oculus ID including username
2019-01-16 17:05:52 -08:00
Wayne Chen
7e674ba3c4
better check for if oculus is running
2019-01-16 17:05:51 -08:00
Wayne Chen
39a68a88f0
fixing typos in callback implementation
2019-01-16 17:05:51 -08:00
Wayne Chen
ed39b43d3b
changing request to have a callback function passed
2019-01-16 17:05:51 -08:00
Wayne Chen
6bc1164d58
more wip on oculus login
2019-01-16 17:05:50 -08:00
Wayne Chen
4320f4cbe4
migrating platform plugin
2019-01-16 17:05:50 -08:00
Wayne Chen
a905310a58
more staging
2019-01-16 17:05:49 -08:00
Wayne Chen
a24ebe2718
oculus functions live in the display plugin; display plugins update
2019-01-16 17:05:49 -08:00
Wayne Chen
970798705c
improving flow from Oculus API to login dialog wip
2019-01-16 17:05:48 -08:00
Wayne Chen
1af57bdba6
staging
2019-01-16 17:05:48 -08:00
Wayne Chen
ebb9cd7de6
adding new plugin
2019-01-16 17:05:48 -08:00
Wayne Chen
db06533018
adding more staging
2019-01-16 17:05:48 -08:00
SamGondelman
3835796419
deprecate the new property so that people hopefully don't use it
2019-01-16 14:01:05 -08:00
SamGondelman
611998f799
add pulse group properties to shapes, particles, text, web, image, and grid
2019-01-16 13:34:10 -08:00
Seth Alves
1104e56bc3
fix bug that caused tablet to be constantly hooked and unhooked from avatar at SpatiallyNestable level
2019-01-16 13:23:27 -08:00
Simon Walton
024cb70fce
Change member-initializer order to fix warnings
2019-01-16 12:58:13 -08:00
Simon Walton
b53fcb2c3d
Pass udt::Socket pointer in initializer-list for udt::Connection
2019-01-16 12:08:02 -08:00
Ken Cooke
328809f008
More robust approximation of distance attenuation at extreme settings.
...
Fixes artifacts that occur when attenuation zone coef = 1.0 and distance > 32m.
2019-01-16 11:10:38 -08:00
Stephen Birarda
0a9ac72e7b
Merge pull request #14720 from birarda/add-comments-to-atv
...
pepper AssociatedTraitValues with some needed comments
2019-01-16 10:59:08 -08:00
birarda
a63c2b3e29
pepper AssociatedTraitValues with some needed comments
2019-01-16 10:15:04 -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
Anthony Thibault
104084d811
Avatar Mixer Protocol: Normalize translation before compression
2019-01-15 18:56:09 -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
SamGondelman
1d2270e9c7
web entity fixes
2019-01-15 16:51:36 -08:00
Seth Alves
c4fc884bce
ignore position edits from server when grabs are in effect
2019-01-15 16:35:20 -08:00
Antonina Savinova
560c44a74a
Merge pull request #14697 from howard-stearns/more-log-purge
...
log purge
2019-01-15 16:19:03 -08:00
Seth Alves
b1c34eb9ec
update queryAACube during grab rather than only when grab is released
2019-01-15 16:01:44 -08:00
Clement
8480624797
Limit upstream data to avatar mixer
2019-01-15 14:18:53 -08:00
Seth Alves
174c79d66d
use new-style far-grabbing code for mouse grabs
2019-01-15 13:43:51 -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
Shannon Romano
4b34465113
Merge pull request #12899 from kitely/warn-property-too-large
...
Log a warning if an entity's property is too large
2019-01-15 12:00:04 -08:00
Clement
6bd6c45b60
Remove dead IdentityRequest code
2019-01-15 11:40:08 -08:00
sabrina-shanman
df17614fc3
Actually, don't support 3d vectors for Maya uv scale/offset
2019-01-15 11:16:22 -08:00
sabrina-shanman
f02d6433e3
Be more descriptive about Maya uv scale/translation property, and better guess for 3d vector case
2019-01-15 11:09:16 -08:00
Shannon Romano
eed53f60ba
Merge pull request #14556 from vladest/avatar_app_warnings
...
Fix Avatar apps warnings.
2019-01-15 11:03:43 -08:00
Shannon Romano
0089b91eea
Merge pull request #14609 from sethalves/fb-20280
...
fix a couple shutdown crashes and a class of asan warning
2019-01-15 10:59:08 -08:00
Shannon Romano
547f167539
Merge pull request #14654 from kencooke/audio-injector-stereo-distattn-bugfix
...
Fix the distance attenuation of stereo local injectors
2019-01-15 10:54:54 -08:00
sabrina-shanman
c875492d50
Be more efficient with MaterialParam in FBXSerializer::getTexture
2019-01-15 10:29:12 -08:00
SamGondelman
9803043512
web entity fixes
2019-01-15 09:51:55 -08:00
Andrew Meadows
4771fa5f27
fix zones using FBX models with non-trivial mesh.modelTransform
2019-01-15 09:17:48 -08:00
Dante Ruiz
4ab7308669
addressing code review requests
2019-01-14 14:04:01 -08:00
SamGondelman
68e15c6c07
fixes from 78
2019-01-14 13:36:21 -08:00
Dante Ruiz
e7d3844620
making pre review requests
2019-01-14 11:14:57 -08:00
sabrina-shanman
5173577a92
Fix issues with uv scale checking
2019-01-14 10:11:30 -08:00
Brad Hefta-Gaub
a115af6353
Merge pull request #14674 from kencooke/audio-asan-warnings3
...
Fix ASAN warning due to mixed signed/unsigned arithmetic
2019-01-14 09:32:22 -08:00
SamGondelman
6fd34bf1f0
setup qml surface contexts
2019-01-14 09:26:57 -08:00
sabrina-shanman
00a9e9e92f
Add support for Maya material uv scale/translation
2019-01-11 17:14:10 -08:00
sabrina-shanman
5b207775e7
Remove redundant TextureParam transform variables
2019-01-11 17:12:09 -08:00
Seth Alves
1ef047a329
revert unneeded change to LimitedNodeList
2019-01-11 16:49:09 -08:00
Dante Ruiz
8252481ce7
Delete domain entities only
2019-01-11 16:00:10 -08:00
Seth Alves
b71f4e0204
remove commented-out code
2019-01-11 15:53:49 -08:00
Seth Alves
6ca9ab6fba
avoid shutdown crash
2019-01-11 15:53:49 -08:00
Seth Alves
ecb34450bd
quiet uneeded logging
2019-01-11 15:53:49 -08:00
Seth Alves
114bcc003a
quiet build warnings
2019-01-11 15:53:49 -08:00
Seth Alves
36040597ba
rename variable for consistency
2019-01-11 15:53:49 -08:00
Seth Alves
6589db628a
fix a couple shutdown crashes and a class of asan warning
2019-01-11 15:53:49 -08:00
Seth Alves
6cd5770505
Merge pull request #14690 from sethalves/plugin-versioning
...
Plugin versioning
2019-01-11 15:20:05 -08:00
luiscuenca
19701ef333
Fix scale and add rayTest
2019-01-11 15:36:07 -07:00
Seth Alves
2ef47304ba
Merge pull request #14558 from AndrewMeadows/faster-avatar-entities
...
case 20020: faster avatar entities
2019-01-11 14:13:05 -08:00
Howard Stearns
62ed84aa19
more log purge
2019-01-11 12:34:44 -08:00
SamGondelman
4b67a79561
more web entity wip
2019-01-11 09:57:42 -08:00
Andrew Meadows
bc19689910
remove unnecessary culling of properties
2019-01-10 17:32:52 -08:00
Seth Alves
d31cdd3779
review
2019-01-10 15:35:40 -08:00
Seth Alves
e941dbb4a9
review
2019-01-10 15:33:34 -08:00
Seth Alves
fd8702d5a6
use const references when querying plugin metadata
2019-01-10 15:20:53 -08:00
Seth Alves
6a88941166
put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.
2019-01-10 15:07:06 -08:00
Andrew Meadows
0098dedcbb
don't update server for AvatarEntity queryAACube
2019-01-09 18:25:12 -08:00
John Conklin II
83cb60f46f
Merge pull request #14621 from birarda/feat/message-cycle-cap
...
cap the number of considered message channels in PacketQueue
2019-01-09 17:43:36 -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
b9667a0679
fix merge conflict after rebase
2019-01-09 17:28:00 -08:00
Andrew Meadows
9d6acf007a
fix build after rebase
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
4dd6e23fef
fix typo in comment
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
9b253690db
bump packet version number
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
320ba9177c
remove cruft
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
0083c77280
add EntityTypes::extractEntityTypeAndID(), remove one spaghetti
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
Andrew Meadows
61b8d005b5
scripts can edit AvatarEntities again
2019-01-09 17:27:14 -08:00
Andrew Meadows
6c81e8845b
cleanup
2019-01-09 17:27:14 -08:00
Andrew Meadows
fe2ee68b79
add EntityItemProperties::copyFromJSONString()
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
026c6301a6
correctly load AvatarEntities from settings
2019-01-09 17:27:14 -08:00
Andrew Meadows
263d6cb7ad
only change parentID=AVATAR_SELF_ID for non-clientOnly case
2019-01-09 17:27:14 -08:00
Andrew Meadows
e4cc3fa976
minor cleanup
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
d1927340f5
remove redundant addToNeedsParentFixupList()
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
sabrina-shanman
f349e48a25
Fix support for FBX texture scaling using ModelUVTranslation/ModelUVScaling
2019-01-09 17:14:03 -08:00
luiscuenca
95fca826a5
Add fit AABox for avatar and implement multisphere on shapeManager
2019-01-09 17:49:19 -07:00
Simon Walton
1245abbb53
Merge branch 'master' into avatar-mixer-entities-stats
2019-01-09 16:07:26 -08:00
John Conklin II
2757590158
Merge pull request #14633 from roxanneskelly/Case20377
...
Trait-level flow control
2019-01-09 15:57:13 -08:00
Shannon Romano
87f966773c
Merge pull request #14601 from SimonWalton-HiFi/reliable-service-min-timeout
...
Set minimum timeout for retransmits within reliable network service
2019-01-09 15:35:40 -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
birarda
3c6b7e3bd0
add a cap to cycled message channels in SendQueue
2019-01-09 13:06:30 -08:00
SamGondelman
45ec7fe3e1
working on ignorePickIntersection and web entities
2019-01-09 12:03:35 -08:00
Ken Cooke
b854840f43
Fix ASAN warnings due to mixed signed/unsigned arithmetic
2019-01-09 10:03:35 -08:00
Anthony Thibault
5d606981de
Added HMD Avatar Alignment Type
...
Adds a new API to set this type, and an option to the Avatar App.
* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head. The new default behavior.
This prevents the body from lifting off of the ground while wearing a large headed avatar. But can cause an offset between the users eyes and the avatars eyes.
2019-01-08 18:35:28 -08:00
Simon Walton
73d688610f
Track stats for total AvatarData bytes, traits bytes and identity bytes
2019-01-08 18:33:00 -08:00
luiscuenca
39dc25ea92
Merge branch 'master' into multiSphereAvatar04
...
# Conflicts:
# interface/src/avatar/OtherAvatar.h
# libraries/avatars-renderer/src/avatars-renderer/Avatar.h
2019-01-08 15:41:33 -07:00
SamGondelman
292071febb
fix model groupCulled
2019-01-08 14:34:19 -08:00
SamGondelman
5dd59dd9e9
correct lighting of layered shapes
2019-01-08 14:02:57 -08:00
luiscuenca
f19201fc92
Other avatar detailed collisions on motion state
2019-01-08 14:09:13 -07:00
SamGondelman
10068cc42c
merge with master
2019-01-08 12:14:32 -08:00
SamGondelman
928ea55d95
fix light crash?
2019-01-08 11:47:28 -08:00
Roxanne Skelly
910c359443
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-08 10:50:45 -08:00
SamGondelman
1b5c1d0677
working on primitiveMode and groupCulled
2019-01-08 10:02:03 -08:00
Jamil Akram
4c6b14bf72
Merge pull request #14642 from dback2/propertyRangeAudit
...
Entity property range/step audit
2019-01-08 09:42:59 -08:00
John Conklin II
ed4f2d9c10
Merge pull request #14439 from AndrewMeadows/shaped-zones
...
Case 15518: shaped zones
2019-01-08 09:06:45 -08:00
David Back
0791443c5c
Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit
2019-01-07 18:29:36 -08:00
Roxanne Skelly
d54fec4476
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-07 18:17:40 -08:00
SamGondelman
f60b272f11
fix crash
2019-01-07 17:24:07 -08:00
SamGondelman
3341d75eda
merge with master
2019-01-07 15:49:16 -08:00
SamGondelman
b609cfaa2b
renderLayer
2019-01-07 15:43:35 -08:00
David Back
84b2a7d474
Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit
2019-01-07 15:42:02 -08:00
David Back
3aa245036b
Merge branch 'master' into propertyRangeAudit
2019-01-07 15:36:18 -08:00
Sam Gondelman
db3187ec6c
Merge branch 'master' into propFix
2019-01-07 14:57:38 -08:00
Adam Smith
7e75ed5daa
Merge pull request #14586 from SamGondelman/NOverlays8
...
Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera
2019-01-07 14:53:27 -08:00
SamGondelman
791257bd0a
convert old created to quint
2019-01-07 14:17:01 -08:00
Simon Walton
c88af5c4be
Merge branch 'master' into reliable-service-min-timeout
2019-01-07 13:28:13 -08:00
SamGondelman
ff3545beab
working with texture transform fallthrough
2019-01-07 13:28:00 -08:00
SamGondelman
4210d4a7cd
write created as quint64
2019-01-07 13:24:38 -08:00
SamGondelman
fa66ed766d
one more try
2019-01-07 12:31:52 -08:00
David Rowe
683e633469
Fix play back of input recording's numeric values
2019-01-08 09:18:53 +13:00
Roxanne Skelly
37d4846722
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-07 11:56:48 -08:00
SamGondelman
5cded6938b
possible fix for texture path
2019-01-07 11:55:34 -08:00
SamGondelman
d57e3b57aa
possible fix for created to/from string
2019-01-07 11:10:36 -08:00
David Back
d25948fbd3
Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit
2019-01-07 10:36:27 -08:00
Shannon Romano
6eaec12df7
Merge pull request #14658 from Atlante45/feat/stats
...
Only keep aggregated thread stats for Avatar Mixer
2019-01-07 10:17:26 -08:00