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
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
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
Maia Hansen
6b5f90f641
Merge pull request #16315 from jherico/qt_5.13
...
Qt 5.13 changes
2019-10-09 15:04:07 -07:00
Brad Davis
06871a707e
Fix byteswap
2019-10-08 16:11:48 -07:00
Brad Davis
960cab9994
Qt 5.13 warnings & fixes
2019-10-08 15:40:13 -07:00
Howard Stearns
9d17c32ff4
Merge pull request #16309 from SimonWalton-HiFi/assignment-client-logging-for-paging
...
DEV-2329: Identify Alerting requirements for Assignment Client reliable operation
2019-10-08 15:35:22 -07:00
David Rowe
f224832d27
Merge branch 'master' into DOC-111
2019-10-08 20:44:13 +13:00
Simon Walton
f73a7c0883
Modified AC logging for paging requirements
2019-10-07 17:35:14 -07:00
Shannon Romano
24dc4b19ae
Merge pull request #16285 from SimonWalton-HiFi/domain-server-logging-for-paging
...
DEV-2292: Alerting requirements for domain-server failure cases
2019-10-04 14:01:56 -07:00
Simon Walton
db14cdbd22
Tweak 'critical' status for some logging
2019-10-04 09:56:35 -07:00
Simon Walton
d5d1c08da0
Adjust some of the logging
2019-10-03 16:50:24 -07:00
Simon Walton
59b41e29f4
Call out DS DS logging critical for Lilypad
2019-10-03 12:15:45 -07:00
Roxanne Skelly
fb8a0e3aee
handle urls in the form of <domain>:<port>/path
2019-10-02 16:40:27 -07:00
Roxanne Skelly
9af7b904ab
CR related fixes
2019-10-01 17:04:07 -07:00
Roxanne Skelly
0589cb360a
Merge branch 'master' of https://github.com/highfidelity/hifi into dev1836
2019-10-01 15:38:02 -07:00
Roxanne Skelly
d0cb489247
DEV-1836 - handle urls in the form 'hifi://<domain>:<port>
2019-10-01 15:34:39 -07:00
Sam Gateau
1e2cab52b9
FIx an error, bad copy paste leading to a bug
2019-09-30 12:55:04 -07:00
Sam Gateau
8c9cf7bddd
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2019-09-27 19:01:19 -07:00
Howard Stearns
f513b65e9d
Merge pull request #16256 from SimonWalton-HiFi/supress-repeated-socket-logging
...
BUGZ-1543: Suppress repeated socket logging
2019-09-27 12:45:17 -07:00
