Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 19:08:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85079 commits 25 branches 0 tags 1.1 GiB
Commit graph

4506 commits

Author SHA1 Message Date
HifiExperiments
e4f32f1cea add camera sensitivity slider 2020-09-19 11:23:59 -07:00
HifiExperiments
9546cebe3c CR 2020-09-09 08:32:54 -07:00
HifiExperiments
932f5dbfb3 CR 2020-09-06 22:41:17 -07:00
kasenvr
7a686d95e0
Merge pull request #671 from ctrlaltdavid/fix/gltf-blendshapes 
Fix and extend glTF blendshapes support
 2020-09-03 13:57:57 -04:00
HifiExperiments
5281f89d0d FUUUUUUUCK FINALLY 2020-09-02 11:28:43 -07:00
Kalila L
b8181d92a5 Merge branch 'master' into pr/441 2020-09-01 17:42:35 -04:00
Kalila L
4096d75bb4 Add checkbox for showing extra source logs. 2020-09-01 16:46:22 -04:00
HifiExperiments
776b1071a0 try to do it without QCursor::setPos 2020-08-31 15:44:06 -07:00
David Rowe
77dbe7a254 Rename FACESHIFT_BLENDSHAPES to BLENDSHAPE_NAMES 2020-08-29 11:21:56 +12:00
Dale Glass
5a8be4de4b Fix -Wclass-memaccess warnings 2020-08-27 19:49:48 +02:00
Dale Glass
a8ab9307d0 Add fall-through comments to fix GCC warnings 
Unfortunately the attribute can't be used since we're not on C++17 yet.
 2020-08-27 19:27:11 +02:00
Dale Glass
5327ffeec4 Fix build under Qt 5.14 and later. 
Solves "redefinition of ‘struct std::hash<QString>’",
"redefinition of ‘struct std::hash<QByteArray>'", and
a build failure in TouchscreenVirtualPadDevice.h.
 2020-08-26 00:01:29 +02:00
Dale Glass
61a159034c Fix build under Qt 5.14 and later. 
Solves "redefinition of ‘struct std::hash<QString>’",
"redefinition of ‘struct std::hash<QByteArray>'", and
a build failure in TouchscreenVirtualPadDevice.h.
 2020-08-25 23:32:24 +02:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
Dale Glass
bc2c6a280d Fix illegal instruction in libaudio.dylib on OSX 
This file gets included by AudioHRTF_avx512.cpp, which contains code
that should only be getting executed on CPUs with the appropriate support.

Unfortunately, when that file is compiled with -mavx512f, GCC also generates
AVX instructions in the code that initializes the value of SQUARE_ROOT_OF_2,
and this crashes on CPUs without AVX because it runs unconditionally.

Avoid the issue entirely by just making it a constant so no code needs to
be run.
 2020-06-25 19:31:46 +02:00
Heather Anderson
b6e1c9e3af added "c++ crash" to crash menu 2020-06-19 18:26:26 -07:00
kasenvr
5f15e8df04
Merge pull request #418 from Misterblue/fix/includes-for-VS-build 
Include <stdexcept> for building on Windows10 with Visual Studio 2019
 2020-06-04 17:30:15 -04:00
Robert Adams
ee1d46af94 Include <stdexcept> so building on Windows10 with Visual Studio 2019 works. 2020-06-04 09:35:45 -07:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
kasenvr
1a46b28b71
Merge pull request #62 from HifiExperiments/blendshapes 
Support blendshapes on model entities
 2020-05-31 18:34:42 -04:00
kasenvr
4cca7f6f75
Merge pull request #281 from HifiExperiments/parenting2 
Improve performance of MyAvatar::simulate when you have lots of descendants
 2020-05-31 14:47:22 -04:00
Dale Glass
407b2a4f22 Remove all uses of QString::null 
It's deprecated and produces a warning on Qt 5.14
 2020-05-17 18:00:02 +02:00
motofckr9k
95a64b2f2c Change standard log file names from "hifi-.." to "vircadia-.." 2020-05-13 22:59:51 +02:00
daleglass
affcc6f918
Merge pull request #300 from thoys/feature/gha_vircadia 
GitHub Actions (with artifact uploading)
 2020-05-08 17:17:45 +02:00
HifiExperiments
405d557725
Merge branch 'master' into blendshapes 2020-05-07 13:38:59 -07:00
HifiExperiments
8017e30ab9
Merge branch 'master' into blendshapes 2020-05-07 13:27:22 -07:00
HifiExperiments
3bf690571c
Merge branch 'master' into zoneOcclusion 2020-05-07 13:13:20 -07:00
Thijs Wenker
8a76753135 Merge branch 'master' of https://github.com/kasenvr/project-athena into feature/gha_vircadia 2020-05-07 11:07:28 +02:00
David Rowe
2d070e630b Merge branch 'master' into fix/jsdoc-fixes 
# Conflicts:
#	interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
#	interface/resources/qml/hifi/commerce/checkout/Checkout.qml
#	interface/resources/qml/hifi/commerce/purchases/Purchases.qml
#	interface/src/Application.cpp
 2020-04-26 20:38:43 +12:00
Thijs Wenker
5fa8571c0b shared seems to require linking with CoreFoundation and OpenGL on OSX 2020-04-23 00:58:48 +02:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
HifiExperiments
9b1635f9cc improve performance of MyAvatar::simulate when you have lots of entity descendants 2020-04-07 15:56:32 -07:00
HifiExperiments
6eacc5c8c2 Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion 2020-04-03 14:37:14 -07:00
HifiExperiments
c062cb75ae Merge remote-tracking branch 'upstream/kasen/core' into blendshapes 2020-04-03 14:35:21 -07:00
David Rowe
1a4266a64a Review JSDoc updates from recent commits 2020-01-20 14:33:06 +13:00
Dale Glass
d0dc041275 Another default operator= and copy constructor 2020-01-19 11:24:51 +01:00
Dale Glass
68d10a2fe1 Make default copy constructors explicit 
Recent versions of gcc generate a warning without this
 2020-01-19 00:20:49 +01:00
David Rowe
ec1e6bc7d3 Merge branch 'DOC-55-C' into api-docs 2020-01-14 18:04:32 +13:00
David Rowe
b9a1b78531 Merge branch 'DOC-68' into api-docs 
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
 2020-01-14 18:02:23 +13:00
HifiExperiments
c45ee33e97 review comment 2020-01-13 17:44:32 -08:00
HifiExperiments
bc319cb340 zone occlusion 2020-01-11 22:29:07 -08:00
HifiExperiments
b40a468b4c fix EOF 2020-01-06 18:31:35 -08:00
HifiExperiments
ef8f085b47 support blendshapes on model entities 2020-01-05 02:37:44 -08:00
Seth Alves
82bddeb5a7 fix linux build 2020-01-03 10:27:43 -08:00
David Rowe
2dd981493e Update classes' JSDoc per @hideconstructor 2019-12-23 14:13:48 +13:00
David Rowe
8255a50cde Update MeshProxy and Entities.getMeshes() JSDoc 2019-12-20 13:34:21 +13:00
David Rowe
1ebc6a575e Model API JSDoc 2019-12-20 13:33:48 +13:00
David Rowe
34958ddb71 Address some JSDoc issues identified by makitsune 2019-12-18 08:01:20 +13:00
David Rowe
845d388cbf Fix AvatarEntityMap string values to be primitives, not objects 2019-11-28 13:56:33 +13:00
Seth Alves
ea2c6b4dfb fix linux build 2019-11-22 11:35:23 -08:00
Sabrina Shanman
518d6a530a
Merge pull request #16507 from highfidelity/master 
Merge master into instancing
 2019-11-18 13:54:33 -08:00
Sam Gateau
6370059a96
Merge pull request #16483 from AndrewMeadows/debug-workload-selection 
Add tools for debugging entity workload proxies
 2019-11-18 11:02:00 -08:00
Andrew Meadows
9d92546a8b revert the revert of PR-16307 2019-11-14 09:59:43 -08:00
Andrew Meadows
cf08a4162a add workload job to help debug entity proxies 2019-11-12 10:35:16 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master 
Merge master into instancing
 2019-11-08 10:10:50 -08:00
Shannon Romano
d30f30191f
Merge pull request #16457 from jennaingersoll/doc-193 
DOC-193 Clarified legacy vs current camera modes
 2019-11-06 10:59:32 -08:00
ingerjm0
499a0a8067 Clean up code per review 2019-11-05 14:14:46 -08:00
ingerjm0
faa4c97f8a Revisions per review 2019-11-05 14:04:01 -08:00
ingerjm0
27d4bfdd01 DOC-193 #comment Documented legacy vs current camera modes, along with code samples to re-enable legacy code 2019-11-05 12:20:51 -08:00
sabrina-shanman
88b6472ced Fix build warning 2019-11-05 10:57:55 -08:00
sabrina-shanman
da5f80c139 Use std::vector types in ShapeInfo 2019-11-05 10:57:55 -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
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master 
Merge master into instancing
 2019-10-31 17:39:15 -07:00
Sam Gateau
465e8c3e18 Prototyping the slim mesh generation 2019-10-31 12:58:15 -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
Oren Hurvitz
35082a730e Changed the desktop sprint speed to 2.0. 
This change will not actually be felt by users, because the speed was already effectively 2.0
(because the sprint speeds for Desktop and HMD were reversed).
 2019-10-27 09:35:16 +02:00
Anthony J. Thibault
d43d12dfa7 Merge branch 'master' into feature/arkit-blendshapes 2019-10-23 21:45:10 -07:00
Anthony J. Thibault
03f88f696d Renamed LipsTogether to MouthClose and bug fixes. 2019-10-21 19:37:57 -07:00
Anthony J. Thibault
92f1b59cc8 Full legacy API and FST support 2019-10-18 16:30:32 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
Anthony J. Thibault
389f5a1d33 ARKit Blendshape hookup work 2019-10-16 10:36:39 -07:00
Anthony J. Thibault
6efd74a339 WIP adding blendshapes to input system 2019-10-16 10:36:38 -07:00
Anthony J. Thibault
da0911e01b Delete legacy blendshape code 
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
 2019-10-16 10:36:37 -07:00
Anthony J. Thibault
8411e6b033 Blendshape script API work 
* Moved hasScriptedBlendshapes, hasProceduralBlinkFaceMovement, hasProceduralEyeFaceMovement, hasAudioEnabledFaceMovement to AvatarData
  so they are accessable via agent scripts.
* Marked setForceFaceTrackerConnected as depricated.
* Updated jsdoc comments
 2019-10-16 10:36:35 -07:00
Brad Hefta-Gaub
51669e1ac3
Revert "DEV-1811: apply deletion rules to linked entities" 2019-10-11 11:06:10 -07:00
Maia Hansen
07b916f0b7
Merge pull request #16307 from AndrewMeadows/colossal-cave 
DEV-1811: apply deletion rules to linked entities
 2019-10-10 13:24:43 -07:00
Brad Davis
960cab9994 Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
Andrew Meadows
5a81ed73fe don't allow null Physics::sessionUUID 2019-10-07 14:38:36 -07:00
Andrew Meadows
aef8ac6bf0 make SpatialParentFinder base class pure virtual 2019-10-07 14:38:36 -07:00
Brad Davis
243120b95c Even better frame capture 2019-10-04 14:57:39 -07:00
Atlante45
a4c857315a Add shutdown annotations for crash reporting 2019-09-30 14:54:17 -07:00
Brad Davis
403499bf32 Cleaning up android build warnings 2019-09-27 09:19:52 -07:00
Shannon Romano
bd488f0196
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera 
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
 2019-09-20 13:03:03 -07:00
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings 2019-09-19 17:30:01 -07:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00
Clement
527b27b32d Make sure the flush timer is not spawned too early 2019-09-18 17:05:05 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus 2019-09-17 17:15:16 -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
luiscuenca
7c7c3cd223
merge master 2019-09-11 14:07:19 -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
luiscuenca
2f33e37eb6
Angles instead dot product and fix API 2019-09-10 18:10:02 -07:00
luiscuenca
189ddf39e2
Merge branch 'master' into addLookAtThirdCamera 2019-09-06 14:29:51 -07:00
luiscuenca
ff8f2c5c16
Add new LookAt camera 2019-09-05 17:04:39 -07:00
Brad Davis
0511f87bad BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U 2019-09-05 11:43:43 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
Bradley Austin Davis
07ee9e901f
Merge pull request #16099 from jherico/fix/wake_crash 
BUGZ-1264: Support platform independent sleep/wake notifications
 2019-08-26 16:20:50 -07:00
Brad Davis
e1bf3f2540 PR feedback 2019-08-26 11:51:33 -07:00
Brad Davis
dfd78a2662 Support platform independent sleep/wake notifications 2019-08-24 13:16:48 -07:00
Simon Walton
d9558e35c3 Fix typo in last commit; remove useless call of getGuessedLocalAddress; logging tweak 2019-08-23 13:19:31 -07:00