Commit graph

75383 commits

Author SHA1 Message Date
NissimHadar
4edd072b3b Removed whitespace 2019-01-21 16:49:54 -08:00
raveenajain
2393db5e12 collision logic 2019-01-21 16:24:32 -08:00
NissimHadar
084d55a414 Gabriel Calero's fix. 2019-01-21 13:26:44 -08:00
raveenajain
3f2aa56187 feedback changes 2019-01-21 13:24:07 -08:00
NissimHadar
a693e0b6f9 Gabriel Calero's fix. 2019-01-21 13:08:37 -08:00
NissimHadar
fb09856c11 Gabriel Calero's fix. 2019-01-21 12:56:13 -08:00
SamGondelman
5b1ea24d20 glsl initializer lists are 4.2 2019-01-21 12:35:48 -08:00
Simon Walton
c3a8c71f60 Add TabletMenu to list of pages that trigger the QmlCommerce bridge 2019-01-21 12:27:14 -08:00
Shannon Romano
c9e53e067d
Merge pull request #14652 from jherico/feature/quest_move_interface
Migrate android build location to accommodate Quest builds
2019-01-21 11:09:51 -08:00
Wayne Chen
4d61a65bbf
wrapping request nonce and userID with conditional 2019-01-21 09:48:12 -08:00
raveenajain
379f98b26d just using change 2019-01-18 18:20:28 -08:00
Anthony Thibault
5dbd62cc67 code review feedback 2019-01-18 17:52:53 -08:00
raveenajain
d2e37d0c90 my and other avater changes, if setting toggled can pass through other avatar 2019-01-18 16:50:44 -08:00
Andrew Meadows
9a854291af supress spurious not important AvatarEntity updates 2019-01-18 15:36:38 -08:00
Adam Smith
da7cd6b2f7
Merge pull request #14691 from SamGondelman/multifrustum
Case 20394: Fix multi-frustum view updating
2019-01-18 15:23:58 -08:00
Sam Gondelman
17ac4138b6
typos 2019-01-18 13:43:56 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter
Limit upstream bandwidth to the Avatar Mixer
2019-01-18 13:32:03 -08:00
Antonina Savinova
a3e82c1869
Merge pull request #14734 from Atlante45/fix/ess-log-spam
Add ESS to the Agent's node interest set
2019-01-18 13:29:23 -08:00
Jeff Clinton
09b16d2d7a
Merge pull request #14735 from SamGondelman/snap
Case 20724: Fix Snap app settings issue
2019-01-18 13:00:18 -08:00
Shannon Romano
11b8ae6d44
Merge pull request #14710 from sethalves/mouse-grab-with-traits
case 15962: case 20481: Mouse grab with traits
2019-01-18 11:56:41 -08:00
SamGondelman
d6f0fbd17b fix snap app issue 2019-01-18 10:48:20 -08:00
Brad Davis
a3e9ad9bc2 Revert target SDK to 26 due to splash screen bug: https://tinyurl.com/yb9ll4cd 2019-01-18 10:30:02 -08:00
Anthony Thibault
e68a8794ce Remove unused variable 2019-01-17 16:18:43 -08:00
Anthony Thibault
0ab13f1e48
Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp
Change Avatar App design for avatar collisions
2019-01-17 16:06:17 -08:00
Brad Davis
f552f8d78a Working on fixing build problems 2019-01-17 15:48:30 -08:00
Shannon Romano
c764f5182f
Merge pull request #14717 from roxanneskelly/Case20277
Case20277 - Ignoring user causes loading orb to appear at /0,0,0
2019-01-17 15:36:31 -08:00
Shannon Romano
0370268f56
Merge pull request #14723 from SimonWalton-HiFi/connection-parented-to-socket
Make Connection class a Qt-child of Socket class
2019-01-17 15:35:29 -08:00
Clement
74b83d9961 Add ESS to the Agent's node interest set 2019-01-17 15:23:40 -08:00
Anthony Thibault
286f23d512 Updated protocol version and fixed bugs 2019-01-17 15:19:54 -08:00
Wayne Chen
238f020392
remove trailing whitespace 2019-01-17 14:20:47 -08:00
Wayne Chen
2859784e17
Merge branch 'master' into oculusLoginFeature 2019-01-17 14:20:00 -08:00
Andrew Meadows
74f9a415d3 move _cauterizationNeedsUpdate back to MyAvatar 2019-01-17 13:58:34 -08:00
Andrew Meadows
e22024b0dd revert attempted fix for non-zero velocity for hats 2019-01-17 13:34:36 -08:00
Seth Alves
4fbc257be0 don't cauterize head-children when they are grabbed 2019-01-17 13:34:36 -08:00
Seth Alves
c8e9bff03a fix releaseGrab call on grabbed entity when a nearGrab ends 2019-01-17 13:34:36 -08:00
Seth Alves
2bf7ac2745 fix bug that was introducing a local velocity to an entity when it was parented to a moving avatar 2019-01-17 13:34:36 -08:00
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
19e4a7389b
Merge pull request #14676 from wayne-chen/updateLoginUserLogging
case 20654: Updating user activity logging for login experience
2019-01-17 12:59:12 -08:00
SamGondelman
59fafa1f5c only do entitlements check once 2019-01-17 11:47:12 -08:00
Wayne Chen
123f2d71e5 dismissing login dialog on popup if bad linking 2019-01-17 11:38:42 -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
Brad Davis
1879cd3b3c Fixing repository order 2019-01-17 11:11:07 -08:00
Wayne Chen
79ffc311e1 code cleanup + adding password error 2019-01-17 10:19:40 -08:00
Wayne Chen
ef63213d28 fixing linking account problems on oculus/steam, changing callback 2019-01-16 21:07:54 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature 2019-01-16 17:24:22 -08:00
Wayne Chen
673c4ad434 fixing error message spacing 2019-01-16 17:22:00 -08:00
Wayne Chen
3ad0f60dd5 fixing error message spacing 2019-01-16 17:20:01 -08:00
Wayne Chen
116a15afe8 removing oculus userID to server - no need 2019-01-16 17:15:40 -08:00
Wayne Chen
6d10d9d043 Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature 2019-01-16 17:08:24 -08:00