Commit graph

82869 commits

Author SHA1 Message Date
David Rowe
be8d97cbf7 Use new audio setting API values 2020-05-07 16:05:49 +12:00
David Rowe
f83ea58a10 Fix erroneous hard-coded audio setting string 2020-05-07 15:42:30 +12:00
David Rowe
da2aefb6b2 There are no longer so-called "high quality" overlays 2020-05-04 21:04:17 +12:00
David Rowe
5c7e6446d0 Update to build using latest OpenVR SDK package 2020-05-04 21:03:13 +12:00
David Rowe
6d5e494f43
Merge pull request #320 from ctrlaltdavid/fix/jsdoc-fixes
Miscellaneous JSdoc fixes
2020-04-28 13:49:41 +12:00
David Rowe
5e997d7b60 Fix up Vircadia URLs 2020-04-27 20:38:23 +12:00
kasenvr
c7be40d2fa
Merge pull request #306 from ctrlaltdavid/fix/record-app
Update Record app
2020-04-27 01:11:33 -04: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
kasenvr
5c2dab6ba5
Merge pull request #314 from kasenvr/kasen/core
Update master with kasen/core's latest changes
2020-04-25 14:46:01 -04:00
kasenvr
0fb1f37450
Merge pull request #277 from kasenvr/fix/api-docs-branding
API docs rebranded to Vircadia.
2020-04-21 23:46:55 -04:00
David Rowe
8cf1766df4 Update AC script URL 2020-04-20 15:43:07 +12:00
David Rowe
0f0a8ad7bf Update branding and AC script location 2020-04-20 10:42:22 +12:00
David Rowe
8c475d3e02 Add icon file as published in Community Apps repo 2020-04-20 08:45:59 +12:00
Thijs Wenker
4a8476dd0b
Merge pull request #285 from ctrlaltdavid/merge-hifi-master
Merge HiFi master
2020-04-19 22:38:29 +02:00
Kasen IO
35da6721ea Do not cache newly installed scripts in the more app. 2020-04-13 00:24:35 -04:00
David Rowe
88ee66abad Further work-arounds for "?" in URLs 2020-04-13 11:02:50 +12:00
David Rowe
0658315f51 Work around GitHub Actions Windows & OSX builds failing to download Qt
Credit: Dale Glass <dale@daleglass.net>
2020-04-13 10:40:34 +12:00
David Rowe
a1df2208de Fix distro module for Linux 2020-04-12 13:58:36 +12:00
David Rowe
927bb1985f Add support for Linux custom Qt builds
Credit: Dale Glass <dale@daleglass.net>
2020-04-12 13:43:36 +12:00
David Rowe
7ba1ccb8b2 Fix Linux cmake warning
Credit: Dale Glass <dale@daleglass.net>
2020-04-12 13:42:20 +12:00
David Rowe
1254557814 Fix Linux cmake problem
Credit: Dale Glass <dale@daleglass.net>
2020-04-12 13:24:35 +12:00
David Rowe
d5a03452e8 Switch Windows GitHub Actions builds away from self-hosted 2020-04-11 21:16:32 +12:00
David Rowe
d79c320096 Fix Linux Qt 2020-04-11 20:47:27 +12:00
David Rowe
b92bd1773a Fix copying PolyVox libraries to cmake binary directory 2020-04-11 20:24:10 +12:00
David Rowe
d99dad3fcb Fix files not removed in master merge 2020-04-11 15:40:11 +12:00
David Rowe
3504caf662 Reinstate Ubuntu 19 support 2020-04-11 10:02:26 +12:00
kasenvr
0acf959fb6
Apply suggestions from code review
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
2020-04-10 17:13:24 -04:00
David Rowe
1a4bb41f22 Fix up quazip configuration 2020-04-10 09:34:00 +12:00
David Rowe
761bc69faa Merge branch 'kasen/core' into merge-hifi-master 2020-04-09 18:57:11 +12:00
kasenvr
71358c21bf
Merge pull request #279 from thoys/fix/vs2019_v16_5_1
Fix VS2019 (Version 16.5.1) builds
2020-04-09 01:08:54 -04:00
David Rowe
a8b4f22fc6 Update new build URLs 2020-04-09 16:54:14 +12: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
Thijs Wenker
aa5413fd71 fix VS2019 (Version 16.5.1) builds 2020-04-07 16:57:05 +02:00
Kasen IO
0588fd3f4f API docs rebranded to Vircadia. 2020-04-07 02:11:29 -04:00
kasenvr
e3d4856415
Update README.md 2020-04-03 15:46:06 -04:00
kasenvr
922a34f88a
Merge pull request #255 from kasenvr/v0.86.0-k2
V0.86.0 k2 -> kasen/core
2020-04-02 17:28:35 -04:00
kasenvr
76aff7a70f
Merge pull request #253 from MarcusLlewellyn/fix/console-rebrand
Rebrand server console to Vircadia with Kasen icon.
2020-04-02 17:27:09 -04:00
05f4bfc1ca Replace hifi branded images amd icons with Vircadia 2020-04-01 18:13:36 -05:00
96047d7536 Attempt find/replace all "High Fidleity" strings with "Vircadia"
Also updates most URLs to point to Vircadia resources with the exception of the serverless domain tutorial.

Branched from `v0.86.0-k2`
2020-03-31 14:33:08 -05:00
kasenvr
243309fdc4
Merge pull request #247 from FluffyJenkins/feature/chat
Added license
2020-03-30 18:50:53 -04:00
Fluffy Jenkins
f5b287b084 Added license 2020-03-30 22:10:53 +01:00
kasenvr
439ff4b843
Merge pull request #242 from kasenvr/fix/install-docs
Update install.md
2020-03-29 18:18:05 -04:00
Kasen IO
35793dcad5 Update install.md 2020-03-29 15:37:10 -04:00
kasenvr
cd452bcc14
Merge pull request #241 from kasenvr/fix/update-build-docs
Update build docs.
2020-03-29 02:44:18 -04:00
Kasen IO
cb13363f0e Update build docs. 2020-03-28 22:38:28 -04:00
kasenvr
fc1a19f6eb
Merge pull request #240 from ctrlaltdavid/feature/relabel-goto
Relabel "GOTO" app's button to "OLD GOTO"
2020-03-28 21:05:55 -04:00
David Rowe
0bef98fd96 Relabel "GOTO" app's button to "OLD GOTO" 2020-03-29 13:34:26 +13:00
kasenvr
a0e23580f8
Merge pull request #101 from odysseus654/rpm-pr
RPM & Deb build scripts for server
2020-03-28 19:56:49 -04:00
Heather Anderson
183c966453 Tweaks done in response to Kalila's smoketest of ubuntu packaging 2020-03-28 23:52:40 +00:00
kasenvr
13f3ef20a2
Merge pull request #236 from kasenvr/fix/explore-app
Update to explore app.
2020-03-28 17:23:18 -04:00