Commit graph

30537 commits

Author SHA1 Message Date
Fluffy Jenkins
ead359ce67 Fixed clara rubbish 2020-01-07 05:14:38 +00:00
kasenvr
0bdfdfff4a
Merge pull request #43 from ctrlaltdavid/fix/re-enable-jsdoc
Re-enable JSDoc building
2020-01-06 18:37:58 -05:00
David Rowe
1d9aec6fec Improve order of dialog contents 2020-01-05 18:24:56 +13:00
David Rowe
977d498004 Add an "Open Project Folder" button 2020-01-05 17:53:36 +13:00
David Rowe
30c63fc305 Remove "Upload" button and associated items 2020-01-05 17:11:23 +13:00
David Rowe
cd6669ec8b Comment out the "Video" button 2020-01-05 17:00:40 +13:00
David Rowe
d79c87b2d4 Change Avatar Package docs links 2020-01-05 16:59:51 +13:00
David Rowe
934311b54a Change default Avatar Packager project directory 2020-01-05 16:15:04 +13:00
David Rowe
7364ac5521 Fix scaled avatar walk speed 2020-01-04 11:43:28 +13:00
kasenvr
1d14bed3ce
Merge pull request #16 from FluffyJenkins/feature/qmlWhitelistMeow
QML Whitelisting
2019-12-30 19:51:51 -05:00
Kasen IO
0b66627eff The command line no longer launches with interface. 2019-12-29 23:48:32 -05:00
kasenvr
9dc7f54bfd
Merge pull request #38 from kasenvr/feature/quality-of-life-k2
Feature/quality of life k2
2019-12-29 18:28:58 -05:00
David Rowe
a7d2412f11 Re-enable JSDoc building 2019-12-29 16:00:47 +13:00
Kasen IO
7489505f99 Updated whitelist info and name to include QML. 2019-12-26 22:27:58 -05:00
Nex-Pro
4856dd07fc
Update interface window title
Change window title from "High Fidelity" to "Project Athena"
2019-12-25 00:20:36 +00:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Fluffy Jenkins
0f3e8d2101 Made requested changes 2019-12-18 20:08:20 +00:00
Kasen IO
d4c3504c8d Updated about dialog (old logo still there), application name, and readme.md 2019-12-14 23:12:54 -05:00
Fluffy Jenkins
82dc6d197a New feature 2019-12-14 03:02:13 +00:00
HifiExperiments
0bd5e15b47 fix non-procedural material entity crash
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-13 02:17:52 -05:00
HifiExperiments
e0a29d9367 material entities support cullFaceMode and support gltf doubleSided 2019-12-12 23:01:57 -05:00
HifiExperiments
6e961b9f2f procedural vertex shaders
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 22:49:48 -05:00
kasenvr
ca3af76081
Merge pull request #11 from MarcusLlewellyn/fixes/kasen-icon
Replace the interface icons with Kasen logo icon.
2019-12-11 10:45:55 -05:00
e098dbda7f Change interface icons to Kasen logo.
We probably don't want to continue with High Fidelity's "voxel" icon for the interface. This changes them to the Kasen logo.
Tested on:
Windows 10 Pro 1909 build 18363.476
CMake 3.16.0
Microsoft Visual Studio Community 2019 Version 16.4.0
2019-12-11 09:21:43 -06:00
kasenvr
b470a765aa
Merge pull request #9 from kasenvr/feature/quality-of-life-k2
Feature/quality of life k2
2019-12-10 21:10:06 -05:00
Kasen IO
297e039de5 Added a confirmation message + instructions to the QML. 2019-12-09 19:57:57 -05:00
Kasen IO
68443f878b Update Application.cpp
updated application name.
2019-12-09 18:06:33 -05:00
Kasen IO
5fe27cdfc9 Added github link to about 2019-12-08 23:50:09 -05:00
Kasen IO
fe66dc82f3 scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly. 2019-12-08 23:11:21 -05:00
Kasen IO
f49e64b99f Cleaned out extra commented code. 2019-12-08 21:12:20 -05:00
Kasen IO
2e36c40912 added QML + C++ system for whitelists 2019-12-07 21:37:23 -05:00
Kasen IO
6976939ff4 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-04 13:42:20 -05:00
Kasen IO
245224f0e9 Updated readme.md again + updated application title again. 2019-12-04 13:39:22 -05:00
Kasen IO
2cf453432e Updated readme.md + updated application title. 2019-12-04 11:50:01 -05:00
Kasen IO
165eb16f93 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 20:04:32 -05:00
Kasen IO
872a0b4496 Updated application version to 86. 2019-12-01 20:04:00 -05:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
DouglasWilcox
a3de25618a Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
(cherry picked from commit f9f28fc286)
2019-11-13 09:52:56 -08:00
Kalila R
a7b2c3a32c Updated application name and version. 2019-11-11 20:22:19 -05:00
Shannon Romano
10a1ee24e8
Merge pull request #16462 from zfox23/removeHomeIcon
DEV-2701: Remove the home icon from the profile app
2019-11-06 15:34:18 -08:00
Anthony Thibault
8f0ca7b6db
Merge pull request #16447 from luiscuenca/hideNeckSecondPass
DEV-2461: Head woes in 1st person part 2
2019-11-06 12:11:59 -08:00
Clément Brisset
96f53dbbf3
Merge pull request #16448 from matt-hifi/deep-codesign
"deep" codesign Interface on macOS
2019-11-06 12:08:29 -08:00
Zach Fox
ca8a61f085 DEV-2701: Remove the home icon from the profile app 2019-11-06 11:11:57 -08:00
Shannon Romano
668061e154
Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes
2019-11-06 10:35:53 -08:00
Matt Hardcastle
8dc91d640b Remove this and connection from lambda expression
Clang in Xcode 11 is more aggressive about its warnings. This resolves
one of the issue Clang noticed in order to support building w/Xcode 11.

I first attempted to remove `this` completes, but VS complained that
`QObject::disconnect` was being called without `this`. This change
satisfies both Clang and VS.

A second attempt added this back and then called `disconnect` directly.
This also generated a Clang warning.

This version resolves the issue by removing the error handler. This also
resolves a memory leak caused by the error handler.
2019-11-06 09:13:40 -08:00
amerhifi
343807a9f5 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-05 10:17:04 -08:00
Zach Fox
683c3f1300 An experiment with the top bar. Will you notice? 2019-11-05 09:33:11 -08:00
amer cerkic
b10f2a86c2 removed extra spaces 2019-11-04 15:44:15 -08:00
amer cerkic
81881acafc fixing a few spacing issues 2019-11-04 15:08:06 -08:00
amer cerkic
b2ab33116f removing double calls to switch devices, handling default changes from scripting interface instead 2019-11-04 15:03:53 -08:00
luiscuenca
de2d2de938
Head woes in 1st person part 2 2019-11-04 13:33:00 -07:00
Sam Gateau
a4696992e8 Renaming the env variable to enable Material Proecural Shaders 2019-11-04 11:15:37 -08:00
Anthony J. Thibault
101ec9d753 Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes
These blendshapes are not present in ARKit and are not used by any of our procedural
face animations (talking, blinking etc).  This change should have been part of #16400 but
was accidently left out.
2019-11-04 09:49:24 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
Anthony J. Thibault
4b34311a0a Hooked up seated version of aim offset animation 2019-10-31 16:23:29 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes
Extended avatar blendshape support for ARKit compatiblity
2019-10-31 12:33:50 -07:00
Zach Fox
68819addd5 Attempt to fix DEV-2615 and DEV-2618 with more menu scripting interface guards 2019-10-31 11:29:46 -07:00
Maia Hansen
de5570ced8
Merge pull request #16421 from amerhifi/dev-2571new
case DEV-2771: Audio client shutdown lock
2019-10-31 09:50:56 -07:00
amerhifi
52e0f54d0c addressing comments 2019-10-31 07:21:16 -07:00
amer cerkic
4b4b722875 fixed issues related to context switching and selection with hmd 2019-10-30 16:27:19 -07:00
Shannon Romano
8d6434fbca
Merge pull request #16367 from ctrlaltdavid/DOC-199
DOC-199: AudioScope JSDoc
2019-10-30 13:45:13 -07:00
amer cerkic
39e1092660 working on hmd fix 2019-10-30 11:34:41 -07:00
Shannon Romano
9948a181dc
Merge pull request #16392 from kitely/load-avatar-entities-after-skeleton
In Bookmarks, attach avatar entities after the skeleton is loaded
2019-10-30 09:29:51 -07:00
Shannon Romano
2b25dd30d2
Merge pull request #16424 from RebeccaStankus/consoleText
Specified color on text edit for console
2019-10-30 09:15:27 -07:00
Oren Hurvitz
7953e3889f Wait for the avatar skeleton to finish loading before adding the avatar entities 2019-10-30 12:12:26 +02:00
Rebecca Stankus
9c0003515a Specified color on text edit for console 2019-10-29 15:46:16 -07:00
amerhifi
ddfbb55e19 fixed old ui filtering of audio devices 2019-10-29 15:36:43 -07:00
Shannon Romano
8fc135d972
Merge pull request #16423 from hyperlogic/bug-fix/third-person-look-at-fix-2
DEV-2302: Fix for head not turning in third person look at camera mode
2019-10-29 13:41:13 -07:00
Brad Hefta-Gaub
206e519b5e
Merge pull request #16390 from kitely/fix-walk-speed
Fixed the sprint speeds of Desktop vs HMD
2019-10-29 13:04:45 -07:00
Anthony Thibault
4341da03c5
Merge pull request #16419 from luiscuenca/lookAtFixes
DEV-2285: Fix look at update and allow to release control
2019-10-29 12:56:22 -07:00
Anthony J. Thibault
e753010411 Fix for head not turning in third person look at camera mode
If MyAvatar::setSkeletonModelURL() is called with the same url that has already been loaded the
SkeletonModel::skeletonLoaded signal will not be triggered.  In this case the MyAvatar local variable
MyAvatar::_skeletonModelLoaded will be set to false and never re-set to true.  This, in turn,
caused MyAvatar::updateHeadLookAt() to skip setting the proper blend values that would turn the head.

Rather then try to make MyAvatar::_skeletonModelLoaded handle all the possible edge cases. It has
been removed.  All conditionals that used to use it have been replased with _skeletonModel->isLoaded().
2019-10-29 12:38:06 -07:00
amerhifi
7d5dcbfc77 space cleanup 2019-10-29 11:58:04 -07:00
Rebecca Stankus
b8d6a2cf0b Added extra attempt to parent interactive window content on creation 2019-10-29 11:20:14 -07:00
amerhifi
884cbd7de9 working on moving display plugin lookup to audiodevices 2019-10-29 09:26:48 -07:00
luiscuenca
ab6631fae3
Fix look at update and allow to release control 2019-10-28 17:51:29 -07:00
Zach Fox
bda1e3f696
Merge pull request #16398 from RebeccaStankus/grayEmoteWindow
Gray emote window
2019-10-28 11:37:17 -07:00
Oren Hurvitz
70c3bb2748 Emit an event when failing to load an avatar.
Previously, MyAvatar only emitted an event (onLoadComplete) if the load succeeded.
Now it also emits an event (onLoadFailed) if the load failed.
2019-10-27 10:55:31 +02:00
Oren Hurvitz
62e5b50e24 Fixed the sprint speeds of Desktop vs HMD (they were flipped) 2019-10-27 09:33:59 +02:00
Anthony J. Thibault
9325ea588a Re-added removed jsdoc comments for removed AvatarInput jsapi.
With a comment that these properties/functions have been removed.
2019-10-26 09:20:51 -07:00
HifiExperiments
deb5aacfad fix materialcachescriptinginterface 2019-10-25 18:16:08 -07:00
Amer
42234b119f
Merge pull request #16381 from amerhifi/amer-dev471-re
case Dev 471: HMD default audio behavior
2019-10-24 16:23:14 -07:00
Shannon Romano
15f27e53cb
Merge pull request #16372 from ctrlaltdavid/DEV-2055
DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value
2019-10-24 15:20:34 -07:00
Rebecca Stankus
9a8fda2705 Feedback changes 2019-10-24 12:07:34 -07:00
Rebecca Stankus
f8102be74d Added a timeout to update the content holder parent after interactive window has finished loading 2019-10-24 12:07:25 -07:00
Rebecca Stankus
8e8c157567 Debugging stuff 2019-10-24 12:07:20 -07:00
Rebecca Stankus
83a6155592 Added tons of logging to debug interactive window 2019-10-24 12:06:49 -07:00
Anthony J. Thibault
dc7b611e8e documentation and warning fixes 2019-10-24 09:53:11 -07:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
Anthony J. Thibault
d43d12dfa7 Merge branch 'master' into feature/arkit-blendshapes 2019-10-23 21:45:10 -07:00
Anthony Thibault
edb181bd16
Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI
DEV-2285: Improve eyes look at
2019-10-23 20:42:27 -07:00
Anthony J. Thibault
f28d317914 Clean up reamining issues 2019-10-23 16:43:10 -07:00
Shannon Romano
3268fa7a9f
Merge pull request #16386 from luiscuenca/fixStrafingError
DEV-2475: Fix head twitching when strafing
2019-10-23 14:48:57 -07:00
Zach Fox
a6bcbe4c66 DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial 2019-10-23 14:32:03 -07:00
luiscuenca
bb0849d3a0
Move changes to Head and remove leftover code 2019-10-23 14:23:29 -07:00
Shannon Romano
fb7589eff9
Merge pull request #16347 from ctrlaltdavid/DOC-195
DOC-195: Keyboard JSDoc
2019-10-23 14:01:03 -07:00
Zach Fox
1b24f61dd9
Merge pull request #16395 from zfox23/menuInstanceCheck
DEV-2498: Fix a crash in MenuScriptingInterface
2019-10-23 13:42:45 -07:00
David Rowe
423074463d Typo 2019-10-24 09:17:13 +13:00
David Rowe
a949f327d2 Merge branch 'master' into DOC-199 2019-10-24 09:14:08 +13:00
amer cerkic
179f5e0873 fixed context switching issue with hmd. included additional output info for other audio crash issues 2019-10-23 12:56:43 -07:00
luiscuenca
9849205ca0
Add perf timer to code block 2019-10-23 12:32:16 -07:00