Commit graph

2297 commits

Author SHA1 Message Date
r3tk0n
12d7e35722 Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release. 2019-04-15 10:56:07 -07:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
2019-04-10 12:29:40 -07:00
Sam Gateau
c33efdf9e0
Merge pull request #15282 from kitely/fix-ray-local-entities
Case 21883: Fix safe landing code improperly finding local entities
2019-04-10 12:28:07 -07:00
SamGondelman
27338c3639 fix cauterization of entities that are children of MyAvatar's head 2019-04-08 19:48:11 -07:00
Wayne Chen
3f85e064b8
initialize transform outside of switch statement 2019-04-04 14:46:06 -07:00
Wayne Chen
c18b00ebec adding precheck procedure 2019-04-04 13:55:35 -07:00
Wayne Chen
819bf9212c fixing typo 2019-04-04 13:47:13 -07:00
Wayne Chen
ec4ad02192 more code feedback 2019-04-04 13:26:34 -07:00
Wayne Chen
4f738a5b42 code review feedback/formatting issues 2019-04-04 12:03:48 -07:00
r3tk0n
283ec97bb9 Fix desktop movement. 2019-04-03 16:09:13 -07:00
r3tk0n
8b670110a9 Fix omitted return in MyAvatar::scaleMotorSpeed 2019-04-03 13:06:22 -07:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
r3tk0n
ac2971894b Fix sprint mode scalar. 2019-04-03 11:42:40 -07:00
r3tk0n
ec37ad7dc6 Address Wayne and Angus' comments on github. 2019-04-03 09:38:14 -07:00
Shannon Romano
cf7eeb7355
Merge pull request #15285 from danteruiz/avatar-fading
Case 21415: Avatars stay behind after they disconnect
2019-04-01 18:04:42 -07:00
r3tk0n
4fb7bbabe1 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-01 14:52:21 -07:00
Wayne Chen
0d83e622ff Revert "Attempt to add acceleration curve." (#23)
This reverts commit 9ea476ea89.
2019-04-01 13:47:49 -04:00
danteruiz
b9d04c6ebb adding entity to a faded list 2019-03-28 16:42:29 -07:00
Anthony Thibault
65507cfe11
Merge pull request #15180 from luiscuenca/flowCppFixes
Fix Flow touch and scale issues
2019-03-28 11:11:08 -07:00
Oren Hurvitz
32406b8399 Fixed Safe Landing interaction with Local entities.
Local entities are collisionless, so they shouldn't affect Safe Landing since it specifies that it only wants
to find COLLIDABLE entities. However, due to the requirement to support legacy behavior, picks for COLLIDABLE
entities *do* intersect Local entities. In order to prevent this, we have to explicitly request only intersections
with Domain or Avatar entities.

For more information about this, see this Pull Request:
https://github.com/highfidelity/hifi/pull/15282
2019-03-28 18:54:14 +01:00
Sam Gondelman
0a28090aa4
Merge pull request #15213 from MiladNazeri/Fix/avatarDominantHandChanged
Updated engine code to not emit if dominant hand isn't actually changed
2019-03-27 10:53:00 -07:00
Shannon Romano
d464415e0b
Merge pull request #15255 from AndrewMeadows/fix-owningAvataID
Case 21897: fix bug where AvatarEntities vanish after going to serverless and back
2019-03-27 09:11:36 -07:00
David Rowe
cf4370ed3a Merge branch 'master' into M21222 2019-03-26 09:44:48 +13:00
David Rowe
b78ae80ae6 Address review comments and add further examples 2019-03-26 09:40:47 +13:00
Andrew Meadows
cd2dbbb955 fix logic typo 2019-03-25 11:52:52 -07:00
r3tk0n
3ac42e69e3 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-25 11:27:31 -07:00
Andrew Meadows
55b3b5034a always update OwingAvatarID of AvatarEntities 2019-03-22 15:47:13 -07:00
r3tk0n
4301d74df5 Fix flying bug. 2019-03-21 16:53:53 -07:00
r3tk0n
108e8b9994 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-21 15:17:56 -07:00
r3tk0n
7a8dfe0aaf Fix run speeds. 2019-03-21 15:06:21 -07:00
Andrew Meadows
206792f851 don't queue AvatarEntity messages when not in domain 2019-03-21 15:00:11 -07:00
r3tk0n
543d53ecde Add ability to toggle strafing. 2019-03-21 13:12:15 -07:00
Andrew Meadows
9d11e44b4b update AvatarEntity trait when parentID changes 2019-03-20 11:37:16 -07:00
milad
6ed4937dc0 Updated engine code to not emit if dominant hand isn't actually changed 2019-03-18 10:12:32 -07:00
SamGondelman
83bac723ef fix wearable duplication on domain switch 2019-03-15 13:38:25 -07:00
r3tk0n
38fe22e4f7 Fix compiler error for Linux. 2019-03-14 16:27:40 -07:00
luiscuenca
c14b135f2b Fix flow touch and scale issues 2019-03-13 15:42:04 -07:00
David Rowe
277ef56f49 Fill in JSDoc for new flow functions 2019-03-14 10:24:19 +13:00
David Rowe
7445d73857 Merge branch 'master' into M21222
# Conflicts:
#	libraries/avatars/src/AvatarData.h
2019-03-13 16:14:14 +13:00
r3tk0n
6ce955d915 Fix hand-relative movement after hand dominance notion swap. 2019-03-11 18:19:43 -07:00
r3tk0n
39342b9771 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-11 16:27:05 -07:00
r3tk0n
ce2e0c7b81 Merge branch 'project-freeloco' of https://github.com/r3tk0n/hifi into project-freeloco 2019-03-11 16:25:13 -07:00
r3tk0n
cbd841a14d Update gearing system. 2019-03-11 16:22:48 -07:00
David Rowe
24c7c8be19 Update JSDoc per merge from master 2019-03-09 12:03:59 +13:00
luiscuenca
df32b61eaf remove unused variable 2019-03-08 16:01:18 -07:00
luiscuenca
bfcb1a8391 Make methods thread safe 2019-03-08 15:57:25 -07:00
luiscuenca
4858f64810 get the colliding joints 2019-03-08 14:36:47 -07:00
luiscuenca
cb6f573b35 Merge branch 'master' into flowAPIExtra 2019-03-08 12:43:02 -07:00
luiscuenca
a977bb6dc8 remove unuse variable 2019-03-08 12:39:57 -07:00
David Rowe
4779a6b156 Merge branch 'master' into M21222 2019-03-09 07:57:53 +13:00