Commit graph

80699 commits

Author SHA1 Message Date
David Rowe
78b7c04457 Fix white space in generated API docs 2019-09-20 08:09:51 +12:00
David Rowe
dff37a71eb Fix JSDoc markup HTML issues 2019-09-17 16:26:09 +12:00
David Rowe
43a0ed48fd Fix JSDoc template HTML issues 2019-09-17 16:25:34 +12: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
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
jennaingersoll
d548afb277
Removed indent per review 2019-09-11 17:06:35 -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
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
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
Zach Fox
51ef37fd27
Merge pull request #16172 from MiladNazeri/bugz-1370/clappingNoiseWhileDescendingAfterFlying
[BUGZ-1370] :: Clapping Noise While Descending After Flying
2019-09-10 16:40:12 -07:00
sabrina-shanman
65d85138cc TIL that std::vector<bool> is a bit field
https://howardhinnant.github.io/onvectorbool.html
2019-09-10 16:31:30 -07:00
Brad Davis
967e7db0bb Don't break sandbox builds 2019-09-10 16:29:45 -07:00
milad
d32438586a added flag for flying 2019-09-10 16:06:50 -07:00
sabrina-shanman
384b7fd629 Fix FBXBaker failing when an unbaked mesh is empty
Error early for all model bakers for draco errors
2019-09-10 15:22:54 -07:00
Zach Fox
f6f3c67b1c
Merge pull request #16170 from zfox23/copyToClipboardProtection
BUGZ-1445: Protect against engine not returning a valid CPU/GPU object in Help -> About
2019-09-10 14:04:44 -07:00
Zach Fox
a324f8b4cd
Merge pull request #16168 from zfox23/DEV-555
DEV-555: Ensure 'href' entity property supports relative paths (coordinates and named paths)
2019-09-10 13:51:00 -07:00
Zach Fox
50ba55a988 Protect against engine not returning a valid CPU/GPU object 2019-09-10 13:03:40 -07:00
Brad Davis
a49fe4844b BUGZ-1167: remove unwanted binaries from bad client-only installers 2019-09-10 12:31:15 -07:00
Zach Fox
b39e527b5b DEV-555: Ensure 'href' entity property supports relative paths (coordinates and named paths) 2019-09-10 11:57:02 -07:00
Zach Fox
4246d89eac
Merge pull request #16167 from zfox23/BUGZ-1451
BUGZ-1451: Update links in controller reference
2019-09-10 11:36:05 -07:00
Zach Fox
e52d65a7bc BUGZ-1451: Update links in controller reference 2019-09-10 11:31:51 -07:00
Maia Hansen
3e8a91e3ec
Merge pull request #16161 from samcake/yellow
BUGZ-1321: Address race condition on accessing a resource of the OpenGLDisplayPlugin before it s garanteed to be allocated
2019-09-10 11:19:04 -07:00
sabrina-shanman
5171b660ae Give better error message when draco part of model baking fails 2019-09-09 17:32:27 -07:00
Howard Stearns
c78087b1f1
Merge pull request #16163 from Atlante45/fix/challenge-timer-crash
BUGZ-1416: Always stop challenge timer from the right thread
2019-09-09 17:13:51 -07:00
Clement
3b734b2222 Always stop challenge timer from the right thread 2019-09-09 16:01:45 -07:00
Sam Gateau
a290723583 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-09 13:43:52 -07:00
Sam Gateau
3c34443f24 where possible (in OpenGLDisplayPLugin) remove the need for the eye specific function and keep it in the HMD display plugin for the case of the POinter drawcall 2019-09-09 13:43:32 -07:00
Sabrina Shanman
3c35433f86
Merge pull request #16159 from sabrina-shanman/oven_stall
(BUGZ-143) Fix Oven not finishing when Re-bake originals checked
2019-09-09 13:12:49 -07:00
Shannon Romano
826fb061a4
Merge pull request #16158 from luiscuenca/offsetRotationMMDFix
BUGZ-1394: Fix avatars with rotation offsets
2019-09-09 11:47:43 -07:00
Sam Gateau
760eac6f83 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-09 11:33:27 -07:00
Sam Gateau
3509a797a1 Avoiding to rely on the display plugin resource in the getHUDOperator to avoid a case of unallocated resource 2019-09-09 11:33:05 -07:00
Zach Fox
eb286d992e
Merge pull request #16160 from RebeccaStankus/emojiDoubleClickSound
Emoji app duplicates sound on opening from toolbar
2019-09-09 11:27:26 -07:00
sabrina-shanman
01b29c3aac Fix DomainBaker not finishing when Re-bake originals checked and
.baked.fbx present
2019-09-09 10:43:08 -07:00