David Rowe
71cee734ec
Merge branch 'master' into fix/interface-console
...
# Conflicts:
# README.md
2020-12-18 19:44:20 +13:00
Kalila
89d1346644
Merge pull request #919 from ArcadeFever/fix/upgrade-android-oculus-sdk-23.0.0.1-and-1.37.0
...
Upgraded Oculus Mobile and Platform SDKs to latest (1.37.0 and 23.0.0)
2020-12-17 20:24:37 -05:00
Kalila
f1c9614076
Merge pull request #917 from JulianGro/gles
...
Fix building with GLES 3.2 on Linux
2020-12-17 20:23:26 -05:00
David Rowe
fd1ea3cf04
Update Windows builds to OpenSSL 1.1.1h
2020-12-18 10:05:21 +13:00
Julian Groß
dcd26c8ad6
Add comment about FILENAME being missing from ANDROID
2020-12-15 21:19:49 +01:00
Julian Groß
4e18382089
Work around android not building with set glad32es.zip filename
2020-12-15 13:53:17 +01:00
ArcadeFever
65fb1320cc
Upgraded Oculus SDKs to latest
2020-12-15 00:04:59 -08:00
Julian Groß
3485efd808
Fix failing builds
2020-12-15 05:00:58 +01:00
Julian Groß
5e17639bed
Fix building with GLES
2020-12-15 02:43:39 +01:00
David Rowe
e8a2de86bb
Update GitHub links
2020-12-12 20:32:02 +13:00
Dale Glass
8e2245c530
Update hash
2020-11-14 19:00:53 +01:00
Dale Glass
2194a20d34
Upgrade to latest TBB
2020-11-14 18:55:24 +01:00
David Rowe
b664fea758
Merge branch 'master' into fix/interface-console
2020-11-11 20:31:33 +13:00
Kalila L
90a7c6cdac
Merge branch 'master' into gha-master-ci
2020-10-29 17:32:53 -04:00
David Rowe
f523416f75
Don't create "Console" Start Menu item
2020-10-26 10:09:25 +13:00
David Rowe
857bf7decc
Don't show "Console" options in Interface-only installer
2020-10-19 09:53:59 +13:00
David Rowe
c33fb5df84
Fix cmake warning when bypassing signing
2020-10-18 16:35:17 +13:00
David Rowe
5f283e45b5
Fix use of the BYPASS_SIGNING flag
2020-10-18 15:55:59 +13:00
Kalila L
6e7e7f5c55
Correct applying of shortcut names.
2020-10-03 03:58:32 -04:00
Kalila L
5e43b3a550
Fix sandbox and console names on PR builds.
2020-10-02 20:52:03 -04:00
Kalila L
aa20fbb0d9
Fix double application of "Vircadia"
2020-10-02 16:48:54 -04:00
Kalila L
11d847b74b
Merge branch 'master' into feature/update-shortcut-names
2020-10-02 15:24:18 -04:00
Kalila L
8cd129469b
Update a few more links, not all links have endpoints though.
2020-09-28 04:47:21 -04:00
David Rowe
0f1c5f895f
Fix bypassing signing installer
2020-09-17 09:01:43 +12:00
kasenvr
370c2700be
Merge pull request #640 from kasenvr/feature/package-startup-interface
...
Add ability to package Interface with a custom startup location (also tacks on some build docs updates)
2020-09-12 22:17:25 -04:00
kasenvr
60e6d99aff
Merge branch 'master' into feature/package-startup-interface
2020-09-01 17:40:37 -04:00
Kalila L
ca15adc0da
Update OSX folder icons to Vircadia.
2020-08-25 03:25:00 -04:00
Kalila L
bb3ea1014a
Update shortcut names to include "Vircadia"
2020-08-24 23:47:36 -04:00
Kalila L
7481925611
Add default timestamp server, remove obsolete comment.
2020-08-24 22:54:16 -04:00
Kalila L
db13ea7614
Merge branch 'master' into pr/303
2020-08-23 17:32:18 -04:00
Kalila L
a2bd06993f
Add option to build an Interface to go to specified address by default.
2020-08-23 01:49:32 -04:00
David Rowe
04653c2746
Fix default Interface and Sandbox startup
2020-08-07 10:34:07 +12:00
David Rowe
8061c5ab8d
Default not to start up Sandbox after install
2020-08-06 22:30:06 +12:00
Kasen IO
5caec39cc6
Disable having the console be set to auto start with the PC as a default checked state.
2020-08-06 01:28:58 -04:00
David Rowe
8dd8ebcbaf
Merge branch 'master' into feature/eye-tracking-option
...
# Conflicts:
# plugins/openvr/src/ViveControllerManager.cpp
2020-07-11 08:14:13 +12:00
David Rowe
5ce60a9ab7
Include deveoper guidelines doc in Vive PRO Eye's SRanipal package
2020-06-27 07:24:38 +12:00
David Rowe
0f324ee9ae
Merge branch 'v2020.2.2-rc' into feature/openvr-linux
...
# Conflicts:
# plugins/openvr/CMakeLists.txt
# plugins/openvr/src/ViveControllerManager.cpp
2020-06-19 16:27:53 +12:00
kasenvr
13451bd275
Merge pull request #384 from JulianGro/rebrand
...
Rebranding stuff
2020-06-18 17:12:47 -04:00
David Rowe
ec81ac8750
Merge branch 'master' into feature/openvr-linux
2020-06-16 08:30:29 +12:00
David Rowe
4e57d53dde
Merge branch 'master' into feature/vive-pro-eye-tracking
2020-06-14 10:51:25 +12:00
motofckr9k
3d05cdd61e
Merge remote-tracking branch 'refs/remotes/kasen/master'
...
Conflicts:
BUILD_WIN.md
CODING_STANDARD.md
LICENSE
cmake/installer/installer-header.bmp
cmake/installer/installer.ico
cmake/installer/uninstaller-header.bmp
interface/resources/images/about-vircadia.png
interface/resources/images/vircadia-logo.svg
interface/resources/qml/LoginDialog.qml
interface/resources/qml/dialogs/TabletLoginDialog.qml
interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
interface/src/Application.cpp
pkg-scripts/athena-server.spec
scripts/system/more/app-more.js
scripts/system/more/css/styles.css
scripts/system/more/more.html
2020-06-10 02:49:13 +02:00
kasenvr
585fb1939f
Merge pull request #429 from daleglass/upgrade_opus
...
Use newer opus to fix illegal instruction in libopusCodec.so
2020-06-07 22:54:53 -04:00
Kasen IO
db1ff76ba5
Update installer/uninstall icons.
2020-06-07 17:15:11 -04:00
Dale Glass
7dd5a2773c
Use newer opus to fix illegal instruction in libopusCodec.so
...
This will build the very latest Opus available (May 30 2020). The absolute
minimum version of Opus is commit 927de8453c502586c03e25c169ec08f2a93ebc02,
released on April 21, 2020.
This incorporates a fix for xiph/opus#154
2020-06-07 12:51:38 +02:00
Kasen IO
cefda3f7f2
Update packaging parameters for Vircadia.
2020-06-01 22:48:38 -04:00
David Rowe
343c6a4027
Fix Linux targeting
2020-05-23 19:46:26 +12:00
David Rowe
b72d5bf80c
Build OpenVR plugin on Linux
2020-05-23 14:53:43 +12:00
motofckr9k
d406b81b47
Big rebrand
2020-05-22 20:35:27 +02:00
David Rowe
7634478aba
Merge branch 'master' into feature/vive-pro-eye-tracking
2020-05-22 08:52:08 +12:00
kasenvr
a9b56b5f3a
Merge pull request #335 from kasenvr/feature/openvr-update
...
Update to latest OpenVR SDK
2020-05-20 14:03:05 -04:00
Thijs Wenker
eb1bf12494
Fix linux PR builds
2020-05-18 14:07:38 +02:00
David Rowe
63ba8400f7
Merge branch 'master' into feature/vive-pro-eye-tracking
2020-05-16 11:23:38 +12:00
daleglass
8846e0e517
Merge pull request #317 from sethalves/fix-glm-warning
...
Don't let Linux build of glm with clang-9 fail due to stray semicolon
2020-05-13 22:37:41 +02:00
David Rowe
42036b2746
Merge branch 'master' into feature/openvr-update
2020-05-09 07:25:40 +12:00
David Rowe
5c7e6446d0
Update to build using latest OpenVR SDK package
2020-05-04 21:03:13 +12:00
Seth Alves
da6b59f3f2
Don't let Linux build of glm with clang-9 fail due to stray semicolon
2020-04-26 21:54:05 +00:00
Seth Alves
10830cf68c
recover from rebase errors
2020-04-26 14:50:43 -07:00
Seth Alves
2fdbd0ab78
update urls for vive eye and hand tracking libraries, fix cmake for same
2020-04-26 12:27:18 -07:00
Seth Alves
a0031c6f10
eye and hand tracking for htc vive pro
2020-04-26 12:24:45 -07:00
Thijs Wenker
53bb62756f
fix more links
2020-04-19 22:50:51 +02:00
Thijs Wenker
466e1a7ce3
- disable osx GHA build for now
...
- fix tbb issue, the repo moved to another location which changed the hash of the source
2020-04-19 22:50:50 +02:00
Thijs Wenker
3ea3330bea
enable tbb for osx
2020-04-19 22:50:49 +02:00
Thijs Wenker
98e79fd698
update zlib port
2020-04-19 22:50:49 +02:00
Thijs Wenker
48ee437c00
cmake -D VCPKG_BUILD_TYPE could be set to either release debug or release in order to build vcpkg in a specific build type, otherwise it will build with debug and release
2020-04-19 22:50:49 +02:00
Thijs Wenker
997eb14ddc
release mode proof portfiles
2020-04-19 22:50:48 +02:00
a8c8c775f3
Re-enable and update code signing in installer template
2020-04-18 12:32:08 -05:00
David Rowe
88ee66abad
Further work-arounds for "?" in URLs
2020-04-13 11:02:50 +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
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
1a4bb41f22
Fix up quazip configuration
2020-04-10 09:34:00 +12: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
acbc8a889f
Fix updated TBB library hash in vcpkg portfile
2020-03-18 19:15:33 -05:00
Dale Glass
39f23b52c3
Force dynamic build on Linux, fixes #151
2020-02-05 23:30:04 +01: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
a0fd53ae24
Change installer name from Beta to Alpha
2020-01-17 14:58:40 -06:00
Thijs Wenker
26bebba8dd
fix opus library linking in cmake
...
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2020-01-13 12:27:24 -06:00
d030d82355
Cosmetic change for TargetOpus.cmake
2020-01-10 12:17:22 -06:00
4e41c0710d
Fix VCPKG Opus CONTROL failure on Linux
...
VCPKG on Linux really, really does not like the "Homepage:" line.
2020-01-09 16:43:11 +01:00
3d8d359c35
Initial work on Opus audio plugin
...
This commit is made up of changes to VCPKG and CMake to include the Opus libraries, as well as a skeleton project for an Opus audio plugin.
2020-01-09 16:43:11 +01:00
77e49421bc
Fix installer failing when signing certifcate is not available.
...
This commit comments out the code signing portion of the installer for now. Also a few minor cosmetic changes
2020-01-05 18:44:17 -06:00
97a5149b89
Merge remote-tracking branch 'upstream/kasen/core' into Winstall-brand
2019-12-30 15:58:03 -06:00
Dale Glass
ec86a1a57f
Move to kasenvr repos
...
The highfidelity github repos will probably be going away on
Jan 15, 2020.
2019-12-30 20:24:15 +01:00
986cb05f7b
Fix typo
...
Tomato, Tohmahto, Athena, Athenay
2019-12-29 17:40:51 -06:00
12633e8ee0
Change how analytics was disable
...
Rather than comment out the body od the GoogleAnalytics macro, it now has each invokation of the macro commented our.
2019-12-26 17:21:43 -06:00
f614f6f290
Stuff I forgot in last commit for NSIS
2019-12-22 15:44:25 -06:00
b512eec6f8
Make changes to NSIS installer
...
Changes names to Project Athena.
Disables downloading of compaign packages.
Disables slideshow during install.
2019-12-22 15:44:02 -06:00
a547f4c771
Change installer images
2019-12-22 14:42:59 -06:00
9b542736f7
Remove Google Analytics from installer
2019-12-22 14:23:28 -06:00
kasenvr
b572b6595e
Merge pull request #19 from daleglass/kasen/core
...
Change asset URLs to Athena S3 bucket.
2019-12-18 14:34:11 -05:00
Dale Glass
ac5a70fca0
Change asset URLs to Athena S3 bucket.
...
This uses a variable that can be overriden with an environment variable.
This makes it easy for the community to create alternate asset hosts.
Due to vcpkg using a clean environment, variables can't be easily passed
to cmake scripts run by vcpkg. This was worked around by writing the data
that needs to be passed into temporary files and reading it from the
vcpkg ports.
2019-12-18 17:36:01 +01:00
51332b8437
Fix the fix for SDL2
2019-12-16 18:22:01 -06:00
669c01c5a3
Update SDL2 CONTROL file to fix linux build
2019-12-16 17:21:16 -06:00
Simon Walton
16b6c6305b
Fix formatting issues in cmake file
2019-12-10 09:46:35 -08:00
12e5712f41
Upgrade vcpkg port files for SDL2 from 2.0.8 to 2.0.10. Fixes patch errors.
...
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2019-12-08 09:46:58 -06:00
Simon Walton
82ed358323
Merge remote-tracking branch 'upstream/master' into linux-actions-builds
...
Also merge in Linux PR build
2019-12-05 16:19:12 -08:00
Brad Davis
f39088fb0b
Github Actions master builds
2019-12-03 10:56:04 -08:00
Kasen IO
0b46c53df1
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 19:59:59 -05:00
