Commit graph

80723 commits

Author SHA1 Message Date
Andrew Meadows
1119b9f29c update local QueryAACube on deactivation 2019-09-17 15:05:37 -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
Howard Stearns
1c2df6b3d2
Merge pull request #16173 from roxanneskelly/dev444
DEV-444 - OAuth administration improvements
2019-09-17 10:21:30 -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
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
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
luiscuenca
3c043309be
Detect HMD mode properly from rig, in order to enable head IK 2019-09-12 14:03:17 -07:00
Shannon Romano
6a78ea1471
Merge pull request #16139 from jennaingersoll/api-docs
API docs formatting updates
2019-09-12 13:09:28 -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
luiscuenca
f7f0483320
Don't disable HMD leaning while seated 2019-09-12 08:41: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
Roxanne Skelly
805b13c21b Merge branch 'master' of https://github.com/highfidelity/hifi into dev444 2019-09-11 17:10:41 -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
jennaingersoll
d548afb277
Removed indent per review 2019-09-11 17:06:35 -07:00
Roxanne Skelly
9a7de10614 set file permissions on the config.json file for the domain server 2019-09-11 16:27:00 -07:00
David Rowe
fad1296180 Fix up Workload JSDoc stubs 2019-09-12 11:02:10 +12:00
MiladNazeri
fb9a6a3c78
Merge pull request #16175 from MiladNazeri/dev-551/hide-crash-menu-behind-enviornment-variables
DEV-551/hide-crash-menu-behind-environment-variable
2019-09-11 15:47:40 -07:00
Zach Fox
3cfb4db36e
Merge pull request #16177 from MiladNazeri/DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation
DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation
2019-09-11 15:35:04 -07:00
Simon Walton
639beee6cb Fix logic for reliable service address-change when new add already used 2019-09-11 15:21:49 -07:00
Roxanne Skelly
4a4f86db3f Merge branch 'master' of https://github.com/highfidelity/hifi into dev444 2019-09-11 15:15:37 -07:00
Zach Fox
3edea5bf13
Merge pull request #16178 from zfox23/noEmoteIndicatorAnimation
BUGZ-1339: Disable the Emote Indicator animation to prevent it from being 'jittery'
2019-09-11 15:10:18 -07:00
Zach Fox
a5504c3780
Merge pull request #16176 from MiladNazeri/BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode
2019-09-11 15:05:44 -07:00
Roxanne Skelly
0f242deaf2 fix crash and some UI issues 2019-09-11 14:11:43 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
2019-09-11 13:04:01 -07:00
milad
4c340746c5 removed references to the emoji destroy sound 2019-09-11 12:50:49 -07:00
MiladNazeri
a9da5b8f16
Update interface/resources/qml/hifi/audio/Audio.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-09-11 12:45:18 -07:00
MiladNazeri
d95a803324
Update interface/resources/qml/hifi/audio/Audio.qml
Co-Authored-By: Zach Fox <fox@highfidelity.com>
2019-09-11 12:44:59 -07:00
milad
275350c2fa removed sound from the out 2019-09-11 12:38:29 -07:00
milad
3cf56210b2 modified Audio.qml to handle desktop audio level meter visible 2019-09-11 12:30:24 -07:00
milad
f9c5d00efa remove source from variable name 2019-09-11 12:10:47 -07:00
milad
5ec8b0d589 added environment variable check for crash menu 2019-09-11 11:39:19 -07:00
Brad Hefta-Gaub
9784b9b6a7
Merge pull request #16169 from jherico/fix/bugz-1136
BUGZ-1167: remove unwanted binaries from bad client-only installers
2019-09-11 10:23:02 -07:00
Zach Fox
e9eb07d388 BUGZ-1339: Disable the Emote Indicator animation to prevent it from being 'jittery' 2019-09-11 10:20:59 -07:00
Brad Davis
790ac6a483 Removing debugging popups 2019-09-10 20:40:59 -07:00
Brad Davis
9be475bff8 Trying to fix client-only build 2019-09-10 18:43:34 -07:00
Roxanne Skelly
a0ad1f3a68 DEV-444 - OAuth administration improvements 2019-09-10 17:27:23 -07:00
dante ruiz
b969a9b1e0 fix tablet html loading errors 2019-09-10 16:50:50 -07:00