Commit graph

1730 commits

Author SHA1 Message Date
Dale Glass
984f11ddf4 Replace deprecated Qt collection functions 2022-06-15 00:02:01 +02:00
Dale Glass
f326aa22a6 Whitespace 2022-06-15 00:00:57 +02:00
Julian Groß
37d2142582 Update PR CI builds 2022-03-30 19:53:58 +02:00
Julian Groß
f1f2714ce7 Update master build and deploy 2022-03-21 19:09:46 +01:00
96932a6946 Update metaverse server URL 2022-02-21 23:17:33 +01:00
Julian Groß
e943636fa8 Update jsdoc 2022-02-19 17:59:44 +01:00
1ab6f171fe Replaced the rest of metaverse addresses 2022-02-10 16:41:05 +01:00
c6f1e6410e Updated some URLs, rebranded documentation and changed default metaverse server address 2022-02-09 23:57:24 +01:00
Alezia Kurdis
43b5e83000
Delete vircadia-logo-1880.png
Replaced by : brand-logo-512.png
2022-02-06 12:59:59 -05:00
Alezia Kurdis
b10d7afcc6
Delete vircadia.png
Replaced by brand.png
2022-02-06 12:59:04 -05:00
Alezia Kurdis
f97b1dfe87
Ressources rebranding for Overte
Ressources rebranding for Overte
(mostly images, icon, model updated with Overte brand)
some file has been edited to replace some files (they had vircadia in the name)
Most of this has not been tested. (cause I don't build)
2022-02-06 12:51:05 -05:00
df68f5c8eb Merge branch 'master' into remove-hifiac 2022-01-23 14:03:02 +01:00
4e399edaa7 Merge remote-tracking branch 'origin/master' into remove-hifiac 2022-01-18 21:29:33 +01:00
Julian Groß
05e8a4fd5c Update qt-builder readme with additional info 2021-12-20 01:58:37 +01:00
Kalila
03b5b83b67
Merge pull request #1339 from odysseus654/pr/make_shared
Housekeeping: use of std::make_shared / QSharedPointer::create.
2021-12-09 17:14:04 -05:00
David Rowe
c03312319d Merge branch 'master' into dev/webapp-master-update
# Conflicts:
#	libraries/networking/src/NodeList.h
#	libraries/shared/src/shared/WebRTC.h
2021-10-03 12:51:47 +13:00
Dale Glass
3349d02cef
Merge pull request #1349 from JulianGro/use_GLVND
Set GL preference to GLVND
2021-09-25 20:31:11 +02:00
Julian Groß
babee7c527 Set GL preference to GLVND 2021-09-17 21:04:12 +02:00
Heather Anderson
bcce9a2091 convert explicit shared pointer creation (using "new") to make_shared where possible/appropriate 2021-09-11 15:15:04 -07:00
Heather Anderson
ab4d70760e review and cleanup of "#include <QtCore/QSharedPointer>" 2021-09-10 21:40:54 -07:00
David Rowe
b1050dc83a Merge branch 'master' into dev/webapp-master-update 2021-09-01 21:52:04 +12:00
Dale Glass
567ff291fe
Merge pull request #943 from daleglass/cmake-build-in-build-dir
Cmake: build in build dir
2021-07-22 23:26:21 +02:00
David Rowe
74c2788a14 Merge branch 'master' into dev/rename-hifisockaddr-webapp
# Conflicts:
#	assignment-client/src/AssignmentClient.cpp
#	domain-server/src/DomainServer.cpp
#	libraries/networking/src/DomainHandler.cpp
#	libraries/networking/src/LimitedNodeList.cpp
#	libraries/networking/src/LimitedNodeList.h
#	libraries/networking/src/SockAddr.cpp
#	libraries/networking/src/SockAddr.h
#	libraries/networking/src/udt/Socket.cpp
#	libraries/networking/src/udt/Socket.h
#	tools/ice-client/src/ICEClientApp.cpp
2021-07-21 15:03:29 +12:00
Kalila
42ffb5709c
Merge pull request #1270 from daleglass/use_qt_endl
Replace uses of endl on Qt classes with Qt::endl
2021-07-15 22:18:36 -04:00
Dale Glass
cf75200231 Have cmake be verbose about whether NPM has been detected 2021-07-11 19:26:51 +02:00
Dale Glass
c95de72174 Fix copying jsdoc to interface
Take the jsdoc from tools/jsdoc and copy it to interface.

A subtle issue was found: It turns out that for cmake it matters
what gets parsed first, especially if you rely on setting a variable
in one project and reading it in another.

This can result in things like builds that fail the first time, then
work after re-running cmake.

Generation of jsdoc and screenshare were moved above interface,
because they're a dependency of it.
2021-07-11 19:26:51 +02:00
daleglass
60164dbf08 Whitespace review fixes
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2021-07-11 19:26:51 +02:00
Dale Glass
70895df49e Generate nitpick resources with qt5_add_binary_resources
Also, it appears there was a bug where nitpick depended on interface's
resources rather than its own.
2021-07-11 19:26:51 +02:00
Dale Glass
3f20f6ec66 Generate all files in the build dir, don't touch source dir
This makes it so that RCC files and jsdoc are both generated into
the build directory.
2021-07-11 19:26:51 +02:00
David Rowe
6a17143df8 Rename "HifiSockAddr" to "SockAddr" 2021-07-06 13:23:57 +12:00
David Rowe
6ced4384bb Quiet Doxygen output 2021-07-05 10:37:51 +12:00
David Rowe
3ebb75acf5 Undo documentation improvements 2021-07-05 10:24:59 +12:00
Dale Glass
be6a67b5eb Replace uses of endl on Qt classes with Qt::endl
This fixes a whole bunch of warnings
2021-07-03 19:08:03 +02:00
David Rowe
87baa0dc8d Remove extraneous Doxygen set-up instruction 2021-07-01 19:12:02 +12:00
David Rowe
b7fdd5bb1f Remove extraneous Doxygen set-up instruction 2021-07-01 19:08:38 +12:00
David Rowe
4d375c029f Merge remote-tracking branch 'upstream/webapp' into dev/webrtc-packet 2021-07-01 12:14:52 +12:00
Kalila
b86e4b98a9
Merge pull request #1249 from digisomni/fix/docs-links-dev
Update user docs links "docs.vircadia.dev" -> "docs.vircadia.com".
2021-06-27 05:55:13 -04:00
David Rowe
d6061289ec Merge branch 'master' into dev/webapp-master-update 2021-06-27 09:51:41 +12:00
David Rowe
2a9ab98e41 Miscellaneous tidying and fixes 2021-06-26 22:07:48 +12:00
David Rowe
5a5cb6488c Multiplex UDP and WebRTC sockets in a QUdpSocket-style NetworkSocket 2021-06-26 22:07:01 +12:00
Kalila L
90aaa85089 Update user docs links "docs.vircadia.dev" -> "docs.vircadia.com". 2021-06-21 12:01:37 -04:00
Dale Glass
f90d872752 Formatting cleanup 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
David Rowe
4681475269 Merge branch 'master' into dev/webrtc-datachannel 2021-06-05 14:21:29 +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
Kalila
f1b4c8e62d
Merge pull request #1218 from daleglass/fix-qt5.15-on-gcc11
Add patch for building Qt 5.15 on gcc11
2021-05-20 17:17:02 -04:00
David Rowe
d0eccfda49 Fix typo in Doxygen ReadMe 2021-05-21 07:15:06 +12:00
Dale Glass
15effecd17 Add patch for building Qt 5.15 on gcc11
gcc11 is requires #include <limits> in places previous versions didn't.
2021-05-20 00:18:46 +02:00