Sam Gateau
819c942056
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-09-19 09:01:19 -07:00
Sam Gateau
a87db2636c
SOme stuff workbetter
2019-09-18 18:25:42 -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
Shannon Romano
0be972062d
Merge pull request #16207 from hyperlogic/bug-fix/sitting-bug-fixes
...
Sit bug fixes
2019-09-18 16:20:51 -07:00
Zach Fox
d5ff3cd871
Merge pull request #16213 from zfox23/goToTopBar
...
DEV-576: Allow users to type HiFi locations into the SimplifiedUI top bar just like GOTO
2019-09-18 17:56:13 -04:00
Zach Fox
f92c5d0882
DEV-576: Allow users to type HiFi locations into the SimplifiedUI top bar just like GOTO
2019-09-18 14:39:11 -07:00
Zach Fox
8a8af6b14a
Merge pull request #16212 from zfox23/updateEmojiSearchField
...
DEV-521: Update Emoji window's search field to display emoji's name during hover
2019-09-18 17:38:01 -04:00
Zach Fox
59184edc89
DEV-521: Update Emoji window's search field to display emoji's name during hover
2019-09-18 13:37:46 -07:00
Sam Gateau
e801eab7bf
Merge pull request #16208 from AndrewMeadows/ess-with-simulation-fallout-002
...
BUGZ-1487: bug fix for inability to pick entities after unowned kinematic motion
2019-09-18 13:25:22 -07:00
Sam Gateau
381fc5146f
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-09-17 18:08:09 -07:00
Sam Gateau
c0660329a3
Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family
2019-09-17 18:06:08 -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
Anthony J. Thibault
1157d59f67
Sit bug fixes
...
* You should not be able to move after being seated, even if you switch seats.
* You should not be able to jump out of the chair by holding the space bar.
* Fixed small issue with the sitting to standing transition being delayed. (causing the user to look
like there were sitting in mid-air) This was due to a missing transition in the animation.json
2019-09-17 13:40:43 -07:00
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
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
Sam Gateau
3d199ff444
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2019-09-16 21:34:56 -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
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
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
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
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
luiscuenca
4aa85baf75
Restate disable leaning when seated
2019-09-12 14:07:56 -07:00
