Commit graph

4647 commits

Author SHA1 Message Date
Dale Glass
b681f99d21 Rename the crash reporting settings to force new default value
Doing this ensures the new default applies to all clients, without
having to reset the configuration.
2020-06-11 20:00:47 +02:00
Dale Glass
02eb4ccd33 Disable crash logger by default 2020-06-11 01:26:21 +02:00
kasenvr
1a46b28b71
Merge pull request #62 from HifiExperiments/blendshapes
Support blendshapes on model entities
2020-05-31 18:34:42 -04:00
kasenvr
8157be5b5a
Merge pull request #405 from kasenvr/v0.86.0-k2.1
Merge K2.1 into Master
2020-05-30 18:49:38 -04:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
Kasen IO
430d748b29 Bump packet version size up. 2020-05-07 21:33:20 -04: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
Heather Anderson
e29271d8ca rename variables from "is crash enabled" to "is crash monitor enabled" (suggested by Thijs Wenker <me@thoys.nl>)
added a debug message giving the current state of the debug monitor switch (ignoring whether Crashpad support is compiled)
2020-04-25 20:32:38 -07:00
Heather Anderson
9187a680cd
Apply suggestions from code review
Adding suggested changes from ctrlaltdavid

Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
2020-04-10 17:10:41 -07: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
Kasen IO
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04: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
Heather Anderson
7cea4fc574 separate user activity logging from crash logging, allowing people to say "no" to tracking while still sending crashes 2020-04-03 02:38:53 -07:00
kasenvr
e6bf1ffb77
Merge pull request #175 from ctrlaltdavid/fix/server-logs-filling
Fix server logs filling up with "/"s
2020-03-03 23:53:50 -05:00
David Rowe
fae237ffa7 Fix server logs filling up with /s 2020-02-19 10:46:17 +13:00
David Rowe
166c7809a9 Fix missing "no connection" dialog for invalid serverless domain URLs 2020-02-07 10:09:37 +13:00
David Rowe
82a0308a64 Save the last visited domain URL 2020-02-07 10:08:51 +13:00
David Rowe
fa30866701 Remember serverless HTTP and HTTPS domains 2020-02-06 07:02:05 +13:00
David Rowe
46173439ed Enable serverless domains via HTTP and HTTPS 2020-02-01 12:46:28 +13:00
6ac090dea5 Quick fix for the metaverse API
We did have the dfault metaverse API as metaverse.projectathena.io, but that doesn't not yet exist, and it turns out we can't just do a redirect. So for now changing it to metaverse.highfidelity.com
2020-01-14 20:33:39 -06:00
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
Ability to change Metaverse API from setting
2020-01-14 18:40:04 -06:00
HifiExperiments
bc319cb340 zone occlusion 2020-01-11 22:29:07 -08:00
HifiExperiments
ef8f085b47 support blendshapes on model entities 2020-01-05 02:37:44 -08:00
David Rowe
2dd981493e Update classes' JSDoc per @hideconstructor 2019-12-23 14:13:48 +13:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Brad Hefta-Gaub
bdce8134fc
Merge pull request #16509 from makitsune/domain-server-ports
Added environment variables to change domain server ports
2019-12-16 15:15:49 -08:00
Maki
a7851c9205 Fixed type conversions for environmental domain ports
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 23:09:18 -05:00
Maki
1ef45b703c Added environment variables to change domain server ports
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 23:09:18 -05:00
David Rowe
204215c573 Typo 2019-12-10 07:49:37 +13:00
David Rowe
3a48a97a90 AddressManager JSDoc 2019-12-10 07:34:17 +13:00
Zach Fox
04fe2988f5 Working 2019-12-05 18:50:31 -08:00
Zach Fox
c96c684400 Initial path to fixing screenshare auth race condition 2019-12-05 15:47:43 -08:00
Howard Stearns
11aa2e829f
Merge pull request #16540 from SimonWalton-HiFi/screenshare-zone
DEV-2700: Add screenshare property to zones and evaluate in avatar mixer
2019-12-02 10:17:42 -08:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
David Rowe
fafb3dd30b MaterialCache JSDoc 2019-11-26 17:43:23 +13:00
David Rowe
5eb6e9dadd Add recently added properties to caches' JSDoc 2019-11-26 17:00:13 +13:00
Simon Walton
6e23924ed9 Add screenshare zone-property - WIP 2019-11-25 13:22:35 -08:00
Howard Stearns
854d84912e
Merge pull request #16511 from howard-stearns/fix-lookupurl-helper-regex
fix handleUrl helper regex
2019-11-21 11:38:47 -08:00
Maki
96a09a894a Fixed type conversions for environmental domain ports 2019-11-20 09:13:08 +00:00
Howard Stearns
2cc39a2f32 fix handleUrl helper regex 2019-11-19 10:51:20 -08:00
Maki
cd5ea20cca Added environment variables to change domain server ports 2019-11-19 12:35:06 +00:00
David Rowe
adaa061690 Replace "AvatarIsland" with "DomainName" in AddressManager JSDoc 2019-11-19 10:32:38 +13:00
Zach Fox
8aea0dd951 Merge in Howard's 'screenshare presence' open PR 2019-11-13 10:11:16 -08:00
Kalila R
fd7ac223b0 activitylogger still disabled but does not output to console 2019-11-11 20:08:03 -05:00
Anthony J. Thibault
389f5a1d33 ARKit Blendshape hookup work 2019-10-16 10:36:39 -07:00
Clement
3b21dfcd0a CR 2019-10-10 17:49:51 -07:00
Clement
390c7b14c9 Don't post account settings after pull
Account settings would always get pushed after a pull even if they
hadn't changed
2019-10-10 15:55:19 -07:00