Commit graph

85005 commits

Author SHA1 Message Date
Dale Glass
2a07f5fd5a Nice colored unsupported distro messages 2021-06-20 14:22:28 +02:00
Dale Glass
f90d872752 Formatting cleanup 2021-06-20 14:22:28 +02:00
Dale Glass
586de4d712 More formatting fixes 2021-06-20 14:22:28 +02:00
Dale Glass
3f8159b3c4 Formatting fix 2021-06-20 14:22:28 +02:00
Dale Glass
3ebcced301 Fix build -- screenshare is not found 2021-06-20 14:22:28 +02:00
Dale Glass
f7af9a8b2a Fix build - missing variable 2021-06-20 14:22:28 +02:00
Dale Glass
1b999acb2f Add more explanatory comments 2021-06-20 14:22:28 +02:00
Dale Glass
506fd9563a Handle empty environment variables as false 2021-06-20 14:22:28 +02:00
Dale Glass
2a8278f522 Temp changes 2021-06-20 14:22:28 +02:00
Dale Glass
50dfa73244 Concatenate Windows paths correctly 2021-06-20 14:22:28 +02:00
Dale Glass
6611d6ef5b Fix quazip cmake portfile to work with system Qt 2021-06-20 14:22:28 +02:00
Dale Glass
758ebd7f9d Fix environment variable cmake syntax 2021-06-20 14:22:28 +02:00
Dale Glass
ca489bd420 Simplify system Qt path 2021-06-20 14:22:28 +02:00
Dale Glass
1e63916940 Disable almost all the code in SetupQt.cmake for system qt
We're already using the standard find_package method to setup Qt
for the most part, so none of the manipulations of SetupQt should
be needed for system Qt.
2021-06-20 14:22:28 +02:00
Dale Glass
2b05c32436 Don't depend on screenshare on Android 2021-06-20 14:22:28 +02:00
Dale Glass
6cd8eca159 Take into account that Windows executables have an extension 2021-06-20 14:22:28 +02:00
Dale Glass
efd15dc43a Make hifi_vcpkg.py use ~/vircadia-files too
Makes it consistent with the change made for Qt
2021-06-20 14:22:28 +02:00
Dale Glass
b88f380c87 Update documentation on Qt in Linux 2021-06-20 14:22:28 +02:00
Dale Glass
474cd6b1c7 Improve Qt handling in CMake
Support 3 options:

	* VIRCADIA_USE_SYSTEM_QT is set -- use system's Qt
	* VIRCADIA_QT_PATH is set -- use Qt found in that dir
	* Otherwise -- use downloaded Qt package

This removes these variables:
	* VIRCADIA_USE_QT_VERSION
	* VIRCADIA_USE_PREBUILT_QT
	* HIFI_QT_BASE
2021-06-20 14:22:28 +02:00
Kalila L
0625dbe53c Some URL updates. 2021-06-17 19:45:56 -04:00
Kalila
78ab7a628d
Merge pull request #1245 from digisomni/digisomni-patch-1
Add basic MSIX instructions to INSTALLER.md.
2021-06-17 19:34:17 -04:00
Kalila
d01385f9bf
Merge pull request #1243 from vircadia/dependabot/npm_and_yarn/screenshare/normalize-url-4.5.1
Bump normalize-url from 4.5.0 to 4.5.1 in /screenshare
2021-06-17 17:15:36 -04:00
Kalila
7bbce4a0c0
Update INSTALLER.md
Add basic MSIX instructions.
2021-06-16 00:22:50 -04:00
Kalila L
1215ced6fa CR. 2021-06-15 15:02:03 -04:00
Kalila L
1411d55364 Add ability for 'handleLookupString' to have spaces. 2021-06-15 00:31:28 -04:00
Kalila L
51e6468abd Rename 'URL_SCHEME_HIFI' -> 'URL_SCHEME_VIRCADIA'. 2021-06-11 17:04:16 -04:00
dependabot[bot]
a827b7c239
Bump normalize-url from 4.5.0 to 4.5.1 in /screenshare
Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
- [Commits](https://github.com/sindresorhus/normalize-url/commits)

---
updated-dependencies:
- dependency-name: normalize-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-11 07:52:34 +00:00
David Rowe
28c408de98 Typo 2021-06-05 18:23:37 +12:00
David Rowe
2402a5e333 Merge remote-tracking branch 'upstream/webapp' into dev/webrtc-datachannel
# Conflicts:
#	domain-server/src/DomainServer.h
2021-06-05 14:27:18 +12:00
David Rowe
4681475269 Merge branch 'master' into dev/webrtc-datachannel 2021-06-05 14:21:29 +12:00
Kalila
d8a0d13812
Merge pull request #1206 from odysseus654/pr/drop-script-debugging
drop remaining references to QScriptEngineDebugger
2021-06-03 18:01:40 -04:00
Kalila
a408294943
Merge pull request #1227 from vircadia/docs/update-macos-installer-docs
Update MacOS packaging instructions.
2021-06-03 17:27:38 -04:00
Kalila
c2b7f73e59
Merge pull request #1207 from daleglass/fix-draco-on-gcc11
Fix draco compilation on gcc11
2021-06-03 17:08:55 -04:00
Kalila
cab8a26def
Merge pull request #1239 from ctrlaltdavid/dev/webrtc-signaling
Conditionally include WebRTCSignalingServer.h
2021-06-02 19:44:30 -04:00
David Rowe
1dcee6cc1d Conditionally include WebRTCSignalingServer.h 2021-06-02 23:00:19 +12:00
Kalila
229164c5b9
Merge pull request #1219 from ctrlaltdavid/dev/webrtc-signaling
WebRTC Signaling Channel
2021-06-02 05:44:03 -04:00
Kalila
6ce944abd1
Update INSTALLER.md 2021-06-01 12:25:45 -04:00
Kalila
f6f7a18669
Merge pull request #1236 from digisomni/fix/api-docs-updates
Some APIDocs metadata fixes.
2021-06-01 12:24:13 -04:00
David Rowe
645dc265ab Fix non-WebRTC domain server builds 2021-06-01 15:41:25 +12:00
David Rowe
c28f4749ed Doxygen tidying 2021-06-01 09:34:38 +12:00
David Rowe
63ec933290 Code tidying 2021-06-01 09:34:17 +12:00
David Rowe
e6c49cf407 Fix data channel ID 2021-06-01 09:32:28 +12:00
Kalila L
8b66c22655 Statically generate canonical link tag instead. 2021-05-31 06:39:52 -04:00
Kalila L
2a6e0f0efc Add JSDoc canonical link tag; add CNAME file in root. 2021-05-31 06:01:36 -04:00
Kalila L
7ccdbdea64 Some APIDocs metadata fixes. 2021-05-31 05:43:12 -04:00
David Rowe
6c37628468 Add WebRTC data channel 2021-05-31 12:29:48 +12:00
Heather Anderson
259cd20b87 Ensuring minimal documentation for classes declared in script-engine 2021-05-29 22:50:39 -07:00
Kalila
b3f55b473f
Merge pull request #1231 from vircadia/fix/gren-config
Add URL for .grenrc.js repository
2021-05-28 18:43:50 -04:00
David Rowe
aa1c32ec53 Rename new domain server environment variable 2021-05-29 09:25:15 +12:00
Kalila
84c90bfd7d
Add URL for .grenrc.js reposi 2021-05-28 16:24:20 -04:00