Commit graph

33406 commits

Author SHA1 Message Date
Simon Walton
4f11e46b5e Don't move Connection class to changed address until it's used 2019-09-24 16:39:59 -07:00
Shannon Romano
48c55d05c7
Merge pull request #16210 from Atlante45/feat/account-settings
DEV-544: Add account settings to the AccountManager
2019-09-23 13:00:23 -07:00
Clement
1924dad51b CR changes 2019-09-20 13:30:08 -07:00
Shannon Romano
bd488f0196
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
2019-09-20 13:03:03 -07:00
Anthony Thibault
fecef584c9
Merge pull request #16226 from danteruiz/fix-snap-html-issue
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
2019-09-20 12:39:01 -07:00
Shannon Romano
22dffa5ce8
Merge pull request #16217 from Atlante45/fix/flush-timer
BUGZ-489: Make sure the flush timer is not spawned too early
2019-09-20 12:35:39 -07:00
Sabrina Shanman
460eaf523a
Merge pull request #16202 from AndrewMeadows/trace-stats-for-workload
DEV-594: add trace stats for workload region sizes
2019-09-20 10:37:45 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings 2019-09-19 17:30:01 -07:00
Clement
282aa70db3 Sync settings on logout/shutdown 2019-09-19 13:45:34 -07:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00
Sam Gateau
6fe2b7a3d1
Merge pull request #16218 from AndrewMeadows/fix-avatar-entities-in-void
BUGZ-1457: scripted edits of avatar entites should succeed when in the void
2019-09-19 13:15:39 -07:00
Zach Fox
80414a6f1c DEV-613: Remove unnecessary audio injector logging 2019-09-19 11:17:39 -07:00
luiscuenca
6d98537a20
Clean up code and refactor avatar-animation.json 2019-09-19 10:45:20 -07:00
Shannon Romano
a5fdf5bb40
Merge pull request #16214 from hyperlogic/bug-fix/additive-blend-scale-fix
Fix additive blending on avatars with non identity scale.
2019-09-19 09:04:28 -07:00
Andrew Meadows
ab419ddd23 beware null sessionID 2019-09-19 08:25:01 -07:00
Clement
527b27b32d Make sure the flush timer is not spawned too early 2019-09-18 17:05:05 -07:00
Shannon Romano
e7001c3f1b
Merge pull request #16157 from sethalves/vive-pro-groundwork
DEV-605: Vive pro groundwork
2019-09-18 16:36:12 -07:00
Anthony J. Thibault
41978aa4a4 Fix additive blending on avatars with non identity scale.
Some avatars that have non 1.0 scale values were incorrectly being scaled during additive blends, this fixes that.
2019-09-18 14:42:57 -07:00
Clement
86196cfd62 Add account settings to the AccountManager 2019-09-17 18:48:14 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus 2019-09-17 17:15:16 -07:00
Andrew Meadows
434f5ff300 fix comment 2019-09-17 15:57:20 -07:00
Andrew Meadows
5ad0dd20ac update QueryAACube of unowned moving physical entities 2019-09-17 15:43:53 -07:00
Andrew Meadows
54d3ceda28 update QueryAACube of kinematic things with known parentage 2019-09-17 15:31:16 -07:00
Andrew Meadows
1119b9f29c update local QueryAACube on deactivation 2019-09-17 15:05:37 -07:00
Seth Alves
8875453585 remove old/unused eyetracker code 2019-09-17 09:43:32 -07:00
Seth Alves
a288c0a52d remove old/unused eyetracker code. 2019-09-17 09:43:21 -07:00
Seth Alves
5c570d28a0 remove old/unused eyetracker code 2019-09-17 09:43:20 -07:00
Seth Alves
943348ba51 input action channels for eyes and eyelids and fingers. connect eyelid input actions to blendshapes. 2019-09-17 09:43:20 -07:00
Seth Alves
7fa24efca0 add a way to query Rig to see if a joint has been overridden by a script 2019-09-17 09:43:20 -07:00
Seth Alves
b64ff70d6c add show-lookat-targets DebugDraw. remove old/unused eyetracker code. 2019-09-17 09:43:19 -07:00
Seth Alves
954aeb5e25 AxisValue action channels now have a 'valid' flag, like Poses do 2019-09-17 09:43:19 -07:00
Seth Alves
73e6be9c37 allow drawing DebugDraw spheres with a specific size 2019-09-17 09:43:19 -07:00
Seth Alves
64e4ff88e6 findClosestApproachOfLines will find where two lines get the closest to each other 2019-09-17 09:43:18 -07:00
Andrew Meadows
f2534078a9 add trace stats for workload region sizes 2019-09-16 15:37:46 -07:00
Maia Hansen
9811f54c94
Merge pull request #16189 from AndrewMeadows/ess-with-simulation-fallout-001
BUGZ-1459: don't rely on final simulation update for kinematic entities
2019-09-13 13:16:05 -07:00
Shannon Romano
79d845d127
Merge pull request #16190 from danteruiz/fix-html
BUGZ-1398: HMD Tablet Apps blocked by Web access error
2019-09-13 12:35:29 -07:00
danteruiz
8491a37923 fixing WebEntities html 2019-09-13 09:57:51 -07:00
Shannon Romano
bb7813631d
Merge pull request #16183 from luiscuenca/allowLeaningWhileSeated
BUGZ-1435: Re-enable head IK when seated on HMD
2019-09-13 09:03:17 -07:00
MiladNazeri
b8e3873e96
Merge pull request #16182 from MiladNazeri/BUGZ-1452/entity-link-property-right-button-disable
Bugz 1452/entity link property right button disable
2019-09-13 08:08:29 -07:00
Andrew Meadows
bc119d6c85 don't expect final kinematic simulation update 2019-09-12 17:02:19 -07:00
Shannon Romano
36bc538354
Merge pull request #16181 from SimonWalton-HiFi/connection-addr-change-logic
BUGZ-1432: Fix logic for address-change to address already being used
builds failing, now android is failing for nothing related to this PR
2019-09-12 15:54:55 -07:00
luiscuenca
3c043309be
Detect HMD mode properly from rig, in order to enable head IK 2019-09-12 14:03:17 -07:00
Maia Hansen
53aed1e6bf
Merge pull request #16171 from sabrina-shanman/bug_oven_draco
(BUGZ-1446) Fix oven error when baking FBX mesh with no indices
2019-09-12 12:37:49 -07:00
Simon Walton
2d68cfa5e7 Use unique_lock::unlock() instead of unique_lock::release()
... which actually has the opposite effect
2019-09-12 12:04:24 -07:00
sabrina-shanman
00f7b75f34 Fix draco errors being added to wrong part of list 2019-09-12 10:45:35 -07:00
Shannon Romano
fa8c959699
Merge pull request #16133 from ctrlaltdavid/DOC-59
DOC-59: Assets JSDoc
2019-09-11 17:19:45 -07:00
jennaingersoll
c439358626
Merge pull request #16180 from ctrlaltdavid/DOC-163
DOC-163: Fix up Workload JSDoc stubs
2019-09-11 17:16:09 -07:00
milad
e56d0066a3 Merge branch 'master' of github.com:highfidelity/hifi into BUGZ-1452/entity-link-property-right-button-disable 2019-09-11 17:08:39 -07:00
milad
12b980d99d about to test if this new right click disable is working 2019-09-11 17:08:35 -07:00