Commit graph

69511 commits

Author SHA1 Message Date
amantley
0ebc7fc29e fixed the mode computation so that it can keep track of all long term height frequencies. This makes it unnecessary to reset the mode, because it will revert back to the highest frequency 2018-07-05 13:41:06 -07:00
amantley
6460c9e861 fixed case for 0.0 as the filter length 2018-07-03 17:11:19 -07:00
amantley
4995b57712 removed print statements and fixed rotation threshold update code 2018-07-03 14:31:36 -07:00
amantley
59dfe80940 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-03 11:47:09 -07:00
amantley
9e5763ea5c adding the recentering back into the non hmd lean code 2018-07-03 11:46:59 -07:00
amantley
3424f412aa
Merge pull request #13437 from amantley/lurchfix
Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)
2018-07-03 19:38:01 +01:00
Seth Alves
62ec693280
Merge pull request #13526 from wayne-chen/fixStillOnlySnap-case-15860
fixing still only snap in snap app
2018-07-03 11:36:25 -07:00
Stephen Birarda
3a4ce9cf5d
Merge pull request #13516 from SimonWalton-HiFi/friends-case-sensitivity
Use case-insensitive matching on friends lists in DomainGatekeeper
2018-07-03 10:29:22 -07:00
Wayne Chen
03a80ce6e3
Merge pull request #13532 from wayne-chen/removeRayPickPrintStatement
Remove ray pick print statement
2018-07-03 09:57:47 -07:00
Bradley Austin Davis
61005d456b
Merge pull request #13530 from samcake/punk
Really add safe check for targetDisplayPLugin
2018-07-03 09:41:25 -07:00
Sam Gondelman
5daf84d690
Merge pull request #13523 from SamGondelman/blur
Fix blurry tablet if overlay is drawing
2018-07-03 09:19:32 -07:00
Wayne Chen
2bbc5b6137 remove ray pick print statement - it bloats the debug window 2018-07-03 09:11:57 -07:00
Sam Gateau
96b26c94eb Really add safe check for targetDisplayPLugin 2018-07-03 16:59:40 +02:00
amantley
f216316b55 removed some comments and whitespace 2018-07-02 18:19:31 -07:00
amantley
47110d080f removed clang induced changes to MyAvatar.cpp 2018-07-02 17:06:16 -07:00
Wayne Chen
aefa52b4c9 fixing still only snap in snap app 2018-07-02 17:00:31 -07:00
Wayne Chen
d9cf838e93 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-07-02 16:56:31 -07:00
Wayne Chen
2f75e1988f Merge branch 'master' of https://github.com/wayne-chen/hifi 2018-07-02 16:56:07 -07:00
amantley
7f5f762208 fixing merge conflict 2018-07-02 15:54:21 -07:00
amantley
ed279e7331 added tweaks to the avatar animation json that speed up the transitions to better match the new step detection 2018-07-02 15:46:58 -07:00
amantley
096d0d2827 reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update 2018-07-02 15:43:57 -07:00
Simon Walton
91e8f1f0f8 Ensure 'verifiedUsername' is always lower case 2018-07-02 15:30:58 -07:00
John Conklin II
3f975cfa84
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit
Fix Mac Crashes On Shutdown
2018-07-02 15:27:26 -07:00
Bradley Austin Davis
b862694e32
Merge pull request #13505 from samcake/punk
Fixing a bug if the last session display plugin is an invalid name, resolve to default
2018-07-02 14:55:04 -07:00
SamGondelman
773efe8cf0 fix blurry tablet if overlay is drawing 2018-07-02 13:32:25 -07:00
Stephen Birarda
cd3df3f1a7
Merge pull request #13509 from birarda/bug/stuck-udt-connection
fix case where vegas congestion control would not re-send lost ACK
2018-07-02 13:09:44 -07:00
Dante Ruiz
e2757e80ea
Merge pull request #13512 from wayne-chen/passwordFieldLoginFix-case-14261
Hitting Enter Key in Password Field To Login
2018-07-02 12:55:44 -07:00
John Conklin II
f7bc79729d
Merge pull request #13515 from Zvork/shadow
Shadow on Mac bug fix
2018-07-02 12:37:52 -07:00
John Conklin II
7834bca39a
Merge pull request #13508 from wayne-chen/crashEntityAppendPoint-case-12473
Fixing crash on appending a point to an entity
2018-07-02 12:36:51 -07:00
John Conklin II
844bd3f48d
Merge pull request #13518 from zfox23/MS16390_buyFail
Fix MS16390: Correctly update UI when Buy endpoint fails
2018-07-02 12:36:19 -07:00
John Conklin II
94ab0c71b2
Merge pull request #13040 from 1P-Cusack/BugFix_EntityListException_20180427
[BugFix] EntityList UncaughtException in that.sendUpdate
2018-07-02 12:35:20 -07:00
John Conklin II
58a9bdc86f
Merge pull request #13511 from r3tk0n/mouse_menu2
Fix SpinnerSliderPreference Class, Update Mouse Sensitivity Menu
2018-07-02 12:33:35 -07:00
John Conklin II
d9a3676c7c
Merge pull request #13493 from alexiamandeville/sittingUpdate
Resolving issue where VR input for movement stops emotes
2018-07-02 12:30:50 -07:00
David Back
54664855ac
Merge pull request #13494 from dback2/zeroOutSpreads
Particle spreads backwards compatibility
2018-07-02 10:43:34 -07:00
Zach Fox
c95b359aa7 Fix MS16390: Correctly update UI when Buy endpoint fails 2018-07-02 10:23:53 -07:00
David Back
3e2e9826e9
Merge pull request #13481 from dback2/particleExplorerOptionalPropFix
Optional particle explorer properties fixes
2018-07-02 09:29:19 -07:00
Wayne Chen
3346adf14a Merge branch 'master' of https://github.com/highfidelity/hifi 2018-07-02 09:07:01 -07:00
Olivier Prat
51fe60ec45 Fixed android compilation error and removed _glUniformi call 2018-07-02 14:59:09 +02:00
Olivier Prat
1a5c382d88 Fixed on Android 2018-07-02 12:41:24 +02:00
Olivier Prat
419e8e6eb9 Forgot to put back linear filtering on single shadow map 2018-07-02 11:32:33 +02:00
Sam
1f90e86b87 fix shader shadow bug on mac 2018-07-02 11:08:14 +02:00
Sam
a6cbc44885 Merged with zvork fix 2018-07-02 10:50:37 +02:00
Sam
c1856a5e36 Make shadows work with one cascade 2018-07-02 10:46:53 +02:00
Olivier Prat
933a2eb2cf Merge branch 'master' of http://github.com/highfidelity/hifi into shadow 2018-07-02 10:01:13 +02:00
Wayne Chen
15bf2707fd Merge branch 'master' of https://github.com/wayne-chen/hifi 2018-07-01 22:10:11 -07:00
Simon Walton
abda0b2381 Use case-insensitive matching on friends lists in DomainGatekeeper 2018-06-29 18:25:06 -07:00
Stephen Birarda
bbc757a193
Merge pull request #13385 from marko8904/timestampServerUpdate
Updated time stamping server for authenticode signatures
2018-06-29 16:46:22 -07:00
Clement
ba53e7add8 Fix ACs startup crash 2018-06-29 16:29:32 -07:00
Wayne Chen
99a64f31d7 Adding Enter/Return for sign up dialog in pw field 2018-06-29 16:21:03 -07:00
r3tk0n
39f491d9d0
Update PreferencesDialog.cpp
Removing errant newline
2018-06-29 16:17:15 -07:00