Commit graph

80980 commits

Author SHA1 Message Date
Zach Fox
610e0c3d82
Merge pull request #16205 from zfox23/changeAboutCopyright
v85: BUGZ-1485: Fix Copyright date in About dialog
2019-09-17 14:55:11 -04:00
Zach Fox
60f4189eb3 BUGZ-1485: Fix Copyright date in About dialog 2019-09-17 11:36:12 -07:00
Sam Gateau
b53fbde089
Merge pull request #16204 from samcake/orange
BUGZ-1497: Replacing key combination to trigger a frame capture
2019-09-17 11:34:14 -07:00
Seth Alves
3ece763a8e code review 2019-09-17 10:52:55 -07:00
Howard Stearns
1c2df6b3d2
Merge pull request #16173 from roxanneskelly/dev444
DEV-444 - OAuth administration improvements
2019-09-17 10:21:30 -07:00
amer cerkic
05a8c7853c added file info. moved pragma 2019-09-17 10:03:54 -07:00
Seth Alves
58cf51058b code review 2019-09-17 09:43:32 -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
Seth Alves
af14245d45 provide a way to get at _sensorResetMat from outside class 2019-09-17 09:43:18 -07:00
milad
e442687e47 Merge branch 'master' of github.com:highfidelity/hifi 2019-09-17 09:18:25 -07:00
amerhifi
46f654114a for real, changing location 2019-09-17 08:03:51 -07:00
amerhifi
065df442f3 changing work location 2019-09-17 08:01:05 -07:00
amerhifi
66725f5f1b working on swapping default devices on system change 2019-09-17 07:50:22 -07:00
Sam Gateau
3d199ff444 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-16 21:34:56 -07:00
luiscuenca
481917ae8a
Rotate avatar with camera and diagonal rotation 2019-09-16 18:26:19 -07:00
Sam Gateau
18226e64f8 Add a read lock where we think it s needed and banging my head on the problem 2019-09-16 18:06:43 -07:00
Sam Gateau
60045f4783 Replacing key combination to trigger a frame capture 2019-09-16 17:48:30 -07:00
Andrew Meadows
f2534078a9 add trace stats for workload region sizes 2019-09-16 15:37:46 -07:00
amerhifi
e689531410 added unique identifier to device for comparison. Because a default device had a different name, but same underlying device. So comparing with device name is not necessarily the same device. Possibly fixed select issue with multiple devices same name 2019-09-16 15:31:44 -07:00
Shannon Romano
dd0b527d63
Merge pull request #16185 from huffman/fix/hifi-log-login
BUGZ-1441: Update logo on login popup
Build failure is on Android not communicated to Docker.
2019-09-16 13:15:58 -07:00
amerhifi
92d1f7bdcb removed clang formatting issues :" 2019-09-16 13:09:14 -07:00
amerhifi
aa6cf466d9 fixing jenkins warning. Added pseudo device and fixed issues with names 2019-09-16 11:52:04 -07:00
amerhifi
68cd8cc8a6 getting wrapper to correctly detect default and fixed clang formatting changes by vs19 2019-09-16 10:32:22 -07:00
Roxanne Skelly
ac472a54d3 Merge branch 'master' of https://github.com/highfidelity/hifi into dev444 2019-09-16 10:27:25 -07:00
Sam Gateau
3ec812d5c3 Cleaner way maybe 2019-09-13 18:45:16 -07:00
milad
cd8c0992d6 Merge branch 'master' of github.com:highfidelity/hifi into dev-515/deleteLocalEntitiesParenetedToDomainEntityOnDomainChange 2019-09-13 16:14:27 -07:00
luiscuenca
5adf3e8c25
Expose API some parameters for live configuration 2019-09-13 14:10:11 -07:00
amerhifi
0de7628d48 fix typo 2019-09-13 13:19:32 -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
amerhifi
bdfb82c072 finishing up the wrapper code implementation. 2019-09-13 13:13:54 -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
amerhifi
4fb31ad479 rebuilding the lost file :(. also undoing the postbuild script changes that were part on my last test 2019-09-13 12:29:46 -07:00
amerhifi
cc11bd9552 created new AudioWrapper 2019-09-13 11:24:41 -07:00
danteruiz
8491a37923 fixing WebEntities html 2019-09-13 09:57:51 -07:00
Sam Gateau
f76b6da96e Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-13 09:34:59 -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
Sam Gateau
802326d4da Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-12 17:01:37 -07:00
Sam Gateau
68b754fc0c Changes driven by the alpha mode 2019-09-12 17:01:16 -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
Ryan Huffman
5370e67507 Update logo on login popup 2019-09-12 14:48:21 -07:00