Commit graph

2109 commits

Author SHA1 Message Date
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
Kasen IO
335f0c86dd Reduce scope of PR. 2020-05-17 22:13:57 -04: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
Thijs Wenker
dcb575a178
Merge pull request #86 from MarcusLlewellyn/opus-plugin
Add support for the Opus audio plugin.
2020-01-31 01:04:47 +01:00
Dale Glass
e396747377 Add Opus to list of codecs 2020-01-09 16:43:12 +01:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Zach Fox
2b7d66c710 Slight optimization; comments 2019-12-06 10:32:45 -08:00
Zach Fox
c96c684400 Initial path to fixing screenshare auth race condition 2019-12-05 15:47:43 -08:00
Howard Stearns
323007eb2c ignore anonymous screenshare zone entry 2019-11-26 12:11:38 -08:00
Zach Fox
8aea0dd951 Merge in Howard's 'screenshare presence' open PR 2019-11-13 10:11:16 -08: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
Shannon Romano
15394f7a6b
Merge pull request #16284 from roxanneskelly/dev653
DEV-653 - give warning not to change address for cloud domains
2019-10-04 11:54:30 -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
Roxanne Skelly
38afa6b5c2 Move to correct place 2019-10-03 16:47:09 -07:00
Roxanne Skelly
8940d990ec DEV-2044 - add notification that temporary domains won't show up in
domain list
2019-10-03 16:17:08 -07:00
Simon Walton
b458098409 Add case of failure to update ICE with metaverse 2019-10-03 12:38:29 -07:00
Simon Walton
59b41e29f4 Call out DS DS logging critical for Lilypad 2019-10-03 12:15:45 -07:00
Roxanne Skelly
04f13cd17e DEV-653 - give warning not to change address for cloud domains 2019-10-03 12:05:10 -07:00
Clement
0401015441 Connect aboutToQuit 2019-09-30 15:18:47 -07:00
Atlante45
a4c857315a Add shutdown annotations for crash reporting 2019-09-30 14:54:17 -07:00
Roxanne Skelly
434c63b7e3 BUGZ-1381 - domain server creates blank/undefined group when adding
groups
2019-09-25 14:14:29 -07:00
Clement
1ca30b688d Put flush timer on right thread without parenting 2019-09-20 15:39:35 -07:00
Clement
527b27b32d Make sure the flush timer is not spawned too early 2019-09-18 17:05:05 -07:00
Roxanne Skelly
9a7de10614 set file permissions on the config.json file for the domain server 2019-09-11 16:27:00 -07:00
Roxanne Skelly
0f242deaf2 fix crash and some UI issues 2019-09-11 14:11:43 -07:00
Roxanne Skelly
a0ad1f3a68 DEV-444 - OAuth administration improvements 2019-09-10 17:27:23 -07:00
Howard Stearns
5ff0c5800e do not unzip or parse entities-backup on message thread 2019-08-29 12:56:14 -07:00
Roxanne Skelly
de1aa68cff oopse 2019-07-30 11:30:23 -07:00
Roxanne Skelly
b4fee1140c BUGZ-319 - Add 'Installed By' username to installed content section on
settings.
2019-07-29 16:25:51 -07:00
Roxanne Skelly
701c457ad4 Fix issue where reset of server was prematurely causing the drop of
an ajax connection which was causing an error popup.
2019-07-26 16:57:05 -07:00
Roxanne Skelly
03b146cfb2 fix issue with .json.gz files failing to upload properly 2019-07-26 13:55:59 -07:00
Roxanne Skelly
908cb8156b fix coding standards issue 2019-07-26 09:40:17 -07:00
Roxanne Skelly
b770ff7b79 BUGZ-829 - error handling for web uploaded model files 2019-07-25 18:14:11 -07:00
Roxanne Skelly
130e68c9b5 DEV-168 - make interface-installed content sets display info on web
installed content section
2019-07-25 14:37:41 -07:00
Roxanne Skelly
22e71115dd DEV-168 - add filename reporting for installed/restored backup content 2019-07-25 11:46:05 -07:00
Roxanne Skelly
5afae43051 CR fix 2019-07-24 16:05:34 -07:00
Roxanne Skelly
fe4334d6c4 BUGZ-829 fix a few nits 2019-07-24 15:33:13 -07:00
Roxanne Skelly
783c61500e BUGZ-829 DEV-168 - domain backup/content management improvements
BUGZ-829 - improve error reporting during restore of content

DEV-168 - show last installed archive information
2019-07-24 12:52:06 -07:00
Howard Stearns
335119cb58 log wakeup (on client and report to DS) during connection on Windows 2019-07-08 16:50:36 -07:00
Roxanne Skelly
c5883a8d67 CR fixes 2019-06-24 14:58:06 -07:00
Roxanne Skelly
e39ccff873 BUGZ-812 - Log system info on domain connect or connect refusal 2019-06-24 11:59:57 -07:00
Roxanne Skelly
0576e6ae3e remove newline for sysinfo to make splunk queries easier 2019-06-19 15:10:02 -07:00
Roxanne Skelly
2ed5e8aefb add OS type to connect message 2019-06-19 13:53:38 -07:00
Simon Walton
b95515933f
Merge pull request #15708 from SimonWalton-HiFi/stun-on-iface-change
Force new IP port on local address change
2019-06-19 10:12:36 -07:00
Simon Walton
cfcea359b2 Handle local address changes for servers 2019-06-14 16:51:59 -07:00
Roxanne Skelly
1b31b8cff8 CR fixes 2019-06-14 13:23:33 -07:00
Roxanne Skelly
5b6911efa4 log username with "haven't heard from" messages
remove rebind on silent domain checkin
2019-06-14 10:45:18 -07:00
Roxanne Skelly
6e6bd18baa Undo Visual Studio mis-formatting 2019-06-12 11:43:43 -07:00