Commit graph

81660 commits

Author SHA1 Message Date
HifiExperiments
2eb0ec18fc fix non-procedural material entity crash 2019-12-11 00:42:59 -08:00
HifiExperiments
b73a608094 procedural vertex shaders 2019-11-15 00:22:40 -08:00
Brad Hefta-Gaub
f88f5ddded
Merge pull request #16496 from highfidelity/fix-realtime-unfocused
DEV-2760 - Fix Realtime Unfocused to be 60hz
2019-11-14 17:37:19 -08:00
Maia Hansen
df7ad31de3
Merge pull request #16361 from AndrewMeadows/colossal-cave-redux
DEV-1811 redux: apply entity deletion rules
2019-11-14 12:10:23 -08:00
Brad Hefta-Gaub
56b1be4958
Fix Realtime Unfocused to be 60hz 2019-11-14 10:21:55 -08:00
Andrew Meadows
ec872bfcf8 remove unused variable 2019-11-14 09:59:43 -08:00
Andrew Meadows
7692e858a1 use EntityItemID rather than QUuid 2019-11-14 09:59:43 -08:00
Andrew Meadows
9dd0105ba5 only one copy of entityIDs instead of two 2019-11-14 09:59:43 -08:00
Andrew Meadows
dbeea4038d remove unused argument 2019-11-14 09:59:43 -08:00
Andrew Meadows
b5ca93a019 remove redundant checks in 'if' clause 2019-11-14 09:59:43 -08:00
Andrew Meadows
b231dadba5 add check for local-entity when changing phys properties 2019-11-14 09:59:43 -08:00
Andrew Meadows
28f51f6204 add comments 2019-11-14 09:59:43 -08:00
Andrew Meadows
de44cdaf25 remove unnecessary check in if clause 2019-11-14 09:59:43 -08:00
Andrew Meadows
0f2d9027e1 fix indentation 2019-11-14 09:59:43 -08:00
Andrew Meadows
039f7cae13 avoid Qt container in another spot 2019-11-14 09:59:43 -08:00
Andrew Meadows
3546bab19a use std::vector<> instead of QVector<> 2019-11-14 09:59:43 -08:00
Andrew Meadows
fb090d1388 force delete OtherAvatar entities when necessary 2019-11-14 09:59:43 -08:00
Andrew Meadows
4159bc4862 abide by domain-entity hierarchy deletion rules 2019-11-14 09:59:43 -08:00
Andrew Meadows
4e6a647718 don't restrict edit properties of myAvatarEntity 2019-11-14 09:59:43 -08:00
Andrew Meadows
9d92546a8b revert the revert of PR-16307 2019-11-14 09:59:43 -08:00
Shannon Romano
ba60f5e96d
Merge pull request #16494 from hyperlogic/bug-fix/revert-safe-landing-fix
Revert safe landing "fix"
2019-11-14 09:52:14 -08:00
Anthony Thibault
929e829801 Revert "Speculative fix for infinite loop in SafeLanding"
This reverts commit 52acfc9333.
2019-11-13 17:17:37 -08:00
Anthony Thibault
487515d956 Revert "bug fix from code review comment"
This reverts commit e81b21ac59.
2019-11-13 17:17:17 -08:00
Shannon Romano
e1fc666b0f
Merge pull request #16479 from hyperlogic/bug-fix/safe-landing-deadlock
Speculative fix for infinite loop in SafeLanding
2019-11-13 14:47:41 -08:00
Anthony Thibault
a06905e6d0
Merge pull request #16488 from hyperlogic/bug-fix/android-t-pose
Bugfix for t-pose avatar when moving
2019-11-13 14:07:36 -08:00
Anthony J. Thibault
e81b21ac59 bug fix from code review comment 2019-11-13 10:40:00 -08:00
Brad Hefta-Gaub
1f2deed941
Merge pull request #16477 from samcake/zorro
DEV-2711: Fix crash when highlighting custom pipeline shapes
2019-11-13 09:50:16 -08:00
Brad Hefta-Gaub
0dd764cd29
Merge pull request #16487 from amerhifi/resetAudio
case DEV-2709: reset QAudioDevInfo on switch
2019-11-13 09:48:33 -08:00
Anthony J. Thibault
b92badbe76 Updated avatar-animation-optimized-ik.json from latest avatar-animation.json 2019-11-13 08:23:27 -08:00
Anthony J. Thibault
b4c4d81bd1 Merge branch 'master' into bug-fix/android-t-pose 2019-11-13 08:21:19 -08:00
amerhifi
3939c7e6fd adding qaudio reset on switch. 2019-11-12 17:07:43 -08:00
amerhifi
d7fbd1e2d4 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-12 16:57:47 -08:00
Anthony Thibault
7736582f3b
Merge pull request #16486 from DouglasWilcox/HMD_strafe_transition_bug
Fix HMD strafe locomotion animation.
2019-11-12 15:49:15 -08:00
Anthony J. Thibault
365b132c30 Bugfix for t-pose avatar when moving
The android specific optimized IK animation graph was out of date, it was referencing
animations that have been deleted, hence the t-pose.  This PR updates and renames the
android/optimized ik animation graph to the latest.
2019-11-12 15:33:41 -08:00
DouglasWilcox
f9f28fc286 Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states. 2019-11-12 14:15:19 -08:00
Shannon Romano
d0dceb15c2
Merge pull request #16481 from amerhifi/master
case dev-2663: Adding safeguard in case device list is empty
2019-11-12 13:28:53 -08:00
amerhifi
89d494cf81 Merge branch 'master' of https://github.com/amerhifi/hifi 2019-11-12 09:35:47 -08:00
amer cerkic
35065cf4d8 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-11 16:15:41 -08:00
Shannon Romano
5f2f647dfb
Merge pull request #16480 from kencooke/audio-hrtf-attn-improved
DEV-2330: Improved attenuation zones
2019-11-11 13:17:36 -08:00
amer cerkic
3a764169ba adding new device to list if default not found 2019-11-11 11:13:44 -08:00
amer cerkic
549e181be0 adding safeguard in case device list is empty 2019-11-11 11:00:33 -08:00
Shannon Romano
75ba65c2c9
Merge pull request #16467 from DouglasWilcox/rand_settles_and_by_momentum
Different settle transition depending on momentum
2019-11-11 10:48:57 -08:00
Ken Cooke
ddd11305de Improved HRTF algorithm to expose parametric occlusion/lowpass effect 2019-11-09 09:57:16 -08:00
Ken Cooke
63eb905712 Redefine audio zone attenuation coefficient of 1.0 to mean "silent at any distance"
instead of extreme rate of falloff with distance.
2019-11-09 09:32:00 -08:00
Anthony J. Thibault
52acfc9333 Speculative fix for infinite loop in SafeLanding
This PR containts two fixes.

1) Tightening up the locks in the SafeLanding class to prevent race conditions.
By inspection there are cases where variables are read and modified outside of locks.

2) A check to help prevent an infinite loop in the _sequenceNumber std::distance calculation.
This is the main issue, in some cases backtrace is reporting the main thread as deadlocked.
The stacktrace points to an issue with the std::distance() calculation.
If the EntityQueryInitialResultsComplete is delayed signficantly, there could be a rare
case where the _sequenceNumber map grows large enough for the wraparound less then operator
will no longer function correctly. This will cause the std::distance calculation to never complete.
I've added a guard to prevent this from happening and some logs to help diagnose this issue in the future.
2019-11-08 14:22:04 -08:00
dooglifeSF
055d5cdf9b Simplify boolean statements, revise several settle anims 2019-11-08 13:46:38 -08:00
dooglifeSF
02045a9fdf add random versions of full sized settle 2019-11-08 11:57:06 -08:00
Shannon Romano
2a30f0fcba
Merge pull request #16472 from Nex-Pro/patch-1
Update WindowScriptingInterface.h
2019-11-08 11:44:09 -08:00
Sam Gateau
8175b9486f Fix crash when highlighting custom pipeline shapes 2019-11-08 11:18:02 -08:00
Brad Hefta-Gaub
757d77ac5d
Merge pull request #16473 from thoys/fix/quest/handControllersFix
Oculus Quest: Fix for the hand controllers in the latest version
2019-11-08 11:00:23 -08:00