Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 04:49:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81735 commits 22 branches 28 tags 1.2 GiB
Commit graph

30466 commits

Author SHA1 Message Date
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01: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
Marcus Llewellyn
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