Commit graph

1870 commits

Author SHA1 Message Date
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
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