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 |
|
luiscuenca
|
d630fe9dbd
|
Add menu checkbox to toggle collisions with other avatars
|
2019-01-04 16:38:48 -07:00 |
|
Ryan Huffman
|
b680e9c52a
|
Update avatar packager with CR feedback
|
2019-01-04 09:59:17 -08:00 |
|
Thijs Wenker
|
c95da0a595
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
# Conflicts:
# interface/src/Application.cpp
|
2019-01-03 22:17:54 +01:00 |
|
Seth Alves
|
78aff6e95c
|
grab js api; send grab information through trait system
|
2019-01-03 08:17:52 -08:00 |
|
Ryan Huffman
|
c21d037800
|
Fix marketplace uploader not working with projects larger than 128MB
|
2018-12-27 17:51:27 -08:00 |
|
Ryan Huffman
|
b717188ed0
|
Update avatar project styling
|
2018-12-22 21:57:09 -08:00 |
|
Stephen Birarda
|
e3e400c86f
|
Merge pull request #14549 from birarda/bug/no-initial-send
fix for initial send of non-instanced trait
|
2018-12-07 12:02:08 -08:00 |
|
Brad Hefta-Gaub
|
9428f1de33
|
Merge pull request #14529 from SimonWalton-HiFi/avatar-mixer-downloads-fst
Don't fetch avatars' .fst files from within the AvatarData class
|
2018-12-07 12:01:58 -08:00 |
|
birarda
|
51fd742722
|
fix for initial send of non-instanced trait
|
2018-12-07 11:17:44 -08:00 |
|
Stephen Birarda
|
fb3cdabd87
|
Merge pull request #14527 from birarda/bug/entity-traits-handler-deadlock
fix for deadlock between setAvatarEntityData and sendChangedTraitsToMixer
|
2018-12-06 17:28:45 -08:00 |
|
Simon Walton
|
e03104cad5
|
Merge remote-tracking branch 'upstream/master' into avatar-mixer-downloads-fst
Remove the code that was fixed in the conflicting PR - it's
now fixed in the new location.
|
2018-12-05 17:58:38 -08:00 |
|
Antonina Savinova
|
2dcfea5f7c
|
Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak
Fix minor avatar-mixer memory leaks
|
2018-12-05 10:29:29 -08:00 |
|
Simon Walton
|
f3236e0843
|
Remove FST joint members from AvatarData
|
2018-12-04 10:45:32 -08:00 |
|
Simon Walton
|
eb097af796
|
Remove all .fst downloads from AvatarData and its derived classes
|
2018-12-03 17:42:39 -08:00 |
|
Simon Walton
|
9315c546d3
|
Initial version - move updateJoints() to derived class
|
2018-12-03 16:26:47 -08:00 |
|
birarda
|
c959dd7024
|
release avatar entity and traits locks sooner to avoid deadlock
|
2018-12-03 14:57:38 -08:00 |
|
Clement
|
181f2b4263
|
Fix Agent crash on shutdown
|
2018-11-28 18:40:52 -08:00 |
|
Simon Walton
|
e10936ec34
|
Delete network query resources for failed queries
|
2018-11-26 18:26:25 -08:00 |
|
Howard Stearns
|
66ae01e0c3
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-12 12:55:20 -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 |
|
luiscuenca
|
dceeadd99a
|
change transit speed
|
2018-11-05 19:35:37 -07:00 |
|
John Conklin II
|
db87fe9696
|
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix
Fix avatars remain stuck in place for other users intermittently
|
2018-10-29 15:03:43 -07:00 |
|
luiscuenca
|
056fe338e1
|
Apply transit logic if avatar instance is client side
|
2018-10-27 07:15:31 -07:00 |
|
luiscuenca
|
767f4e9d6d
|
Return server position
|
2018-10-26 17:16:43 -07:00 |
|
luiscuenca
|
62e4b3fead
|
Avatar mixer gets the updated position
|
2018-10-26 16:02:17 -07:00 |
|
Simon Walton
|
b6f259fc42
|
Fix incorrect merge-resolution
|
2018-10-24 13:17:45 -07:00 |
|
Simon Walton
|
e22e0ecb04
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-24 10:39:23 -09:00 |
|
Luis Cuenca
|
fac9188dfb
|
Merge pull request #14187 from luiscuenca/transitAddAnimation
Add animations to Avatar Transit
|
2018-10-24 10:51:21 -07:00 |
|
Simon Walton
|
0a78eeaf1a
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-23 15:56:56 -07:00 |
|
Kerry Ivan Kurian
|
3cf000a71b
|
Merge pull request #14232 from kkurian/log-resource-requests-2
Display resource-access events in marketplace item tester
|
2018-10-23 15:18:30 -07:00 |
|
Stephen Birarda
|
b789fa96f8
|
Merge pull request #14192 from Atlante45/fix/traits-race
Prevent race on internal client traits members
|
2018-10-23 14:53:11 -07:00 |
|
Zach Fox
|
493262052c
|
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
|
2018-10-22 13:59:52 -07:00 |
|
Zach Fox
|
7be5d5674d
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-22 13:59:35 -07:00 |
|
Luis Cuenca
|
e1c760b566
|
Merge branch 'master' into transitAddAnimation
|
2018-10-20 15:30:23 -07:00 |
|
luiscuenca
|
f8d67d124f
|
Hold flickering fixed and refactor
|
2018-10-20 15:22:25 -07:00 |
|
Brad Hefta-Gaub
|
23ddb7dea6
|
Merge pull request #14207 from Atlante45/fix/white-spheres
Remove pending avatars data structure
|
2018-10-20 12:09:51 -07:00 |
|
Brad Hefta-Gaub
|
c6fff83805
|
Merge pull request #14145 from ctrlaltdavid/M17223
JSDoc fixes
|
2018-10-19 16:16:19 -07:00 |
|
Simon Walton
|
0b2ee35907
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-18 14:13:39 -07:00 |
|
Zach Fox
|
2f37a2b1a1
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-18 11:12:26 -07:00 |
|
Kerry Ivan Kurian
|
3b15548ea3
|
Display resource-access events in marketplace item tester
Includes refactoring marketplace item tester into a single-page app.
|
2018-10-18 01:04:47 -07:00 |
|
Sam Gondelman
|
3f117cd3e0
|
Merge branch 'master' into scriptvec3
|
2018-10-17 13:57:21 -07:00 |
|
Brad Hefta-Gaub
|
0e0542ec6e
|
Merge pull request #13890 from sethalves/grab-properties-1
move grab pseudo-properties (userData) into first-class EntityItemProperties
|
2018-10-17 13:29:20 -07:00 |
|
Simon Walton
|
0b77eb5e9c
|
Control UUID inclusion in avatar data with new param
Increase estimate of avatars to be sent; remove start/end segment
in avatar identity writes.
|
2018-10-16 14:25:38 -07:00 |
|
Clement
|
3bfc5011f5
|
Remove _pendingAvatars struct
|
2018-10-12 17:57:48 -07:00 |
|
Clement
|
1bcbda7ad6
|
Prevent race on internal client traits members
|
2018-10-11 16:16:24 -07:00 |
|
luiscuenca
|
de1b6e717f
|
Cancel animation on chained trasits
|
2018-10-11 11:35:56 -07:00 |
|
Simon Walton
|
6f659db3b5
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-08 15:18:29 -07:00 |
|
Sam Gondelman
|
67662df760
|
Merge branch 'master' into scriptvec3
|
2018-10-08 12:59:34 -07:00 |
|
John Conklin II
|
dc7a5c0867
|
Merge pull request #14147 from birarda/bug/large-traits
suppress traits larger than INT16_MAX bytes
|
2018-10-08 10:27:52 -07:00 |
|