Commit graph

1831 commits

Author SHA1 Message Date
Dale Glass
c03b4de419 Unnecessary copy warning 2022-06-15 00:02:54 +02:00
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
David Rowe
6e3c680487 Add Doxygen comments information 2021-05-20 09:51:51 +12:00
David Rowe
27779030c8 Perl isn't needed after all 2021-05-14 16:27:09 +12:00
David Rowe
f3ee99fe5a
Apply suggestions from code review
Co-authored-by: Kalila <69767640+digisomni@users.noreply.github.com>
2021-05-14 15:14:53 +12:00
David Rowe
2130dea965 Remove Doxygen filter that is no longer needed 2021-05-12 10:54:15 +12:00
David Rowe
bd812e58aa Change JSDoc plugin to use "/*@jsdoc" tags instead of "/**jsdoc"
So as not to clash with Doxygen.
2021-05-12 10:53:43 +12:00
David Rowe
3020123459 Set up Doxygen for Interface and domain server C++ code 2021-05-11 22:21:36 +12:00
Kalila
a3626c83f4
Merge pull request #692 from odysseus654/pr/move-connect-packet-type
The domain server should see Packet ID=1 as a (broken) attempt to connect to the domain server
2021-04-29 18:39:25 -04:00
Kalila
73acf299f8
Merge pull request #1188 from daleglass/fix_nitpick
Link to pthread last
2021-04-26 06:24:21 -04:00
Heather Anderson
51f4320911 renamed StunResponse packet type 2021-04-25 18:37:34 -07:00
Kalila
5ec026255c
Merge pull request #938 from vircadia/feature/qt-update
Update to Qt 5.15.2
2021-04-22 17:36:53 -04:00
Dale Glass
1e3af6c32c Link to pthread last 2021-04-22 23:34:23 +02:00
Kalila
bb9460f6d9
Merge pull request #1162 from ctrlaltdavid/fix/osx-dmgs
Revise OSX DMGs
2021-04-19 17:01:05 -04:00
Julian Groß
b1852eabd4 Update jsdoc entry 2021-04-15 19:45:52 +02:00
Julian Groß
ecb7c47f1a Rename fbx folder to model-serializers 2021-04-15 19:26:10 +02:00
David Rowe
19ea89a3a3 Delete unused patches 2021-04-10 10:30:20 +12:00
David Rowe
c8632f8613 Merge branch 'master' into feature/qt-update-misc 2021-04-10 09:10:26 +12:00
David Rowe
bed6f32c7a Don't include nitpick in OSX client-only build 2021-04-06 12:36:13 +12:00
David Rowe
badbb72ba3 Don't include oven or vhacd-util if client-only OSX 2021-04-06 12:06:31 +12:00
David Rowe
c45a02036a Fix nitpick icon 2021-04-06 11:51:07 +12:00
Dale Glass
43f6fd82f4 Implement thread debugging with tsan
This is enabled with the VIRCADIA_THREAD_DEBUGGING environment variable.
It's incompatible with VIRCADIA_MEMORY_DEBUGGING, so only one of those
can be enabled for a build.
2021-04-02 20:41:23 +02:00
Julian Groß
1977d4e47a Apply suggestions from code review 2021-03-01 03:55:19 +01:00
Julian Groß
5e1330b713 Merge missing file 2021-02-27 20:54:00 +01:00
Julian Groß
f56161363a Merge remote-tracking branch 'refs/remotes/vircadia/feature/qt-update'
Fix merge-conflicts
2021-02-27 20:39:11 +01:00
Julian Groß
8f473084e5 Update README and change to xz compression 2021-02-21 01:53:09 +01:00
Julian Groß
e3bab8a6b9 Update Ubuntu 18.04 amd64 Qt to 5.15.2 2021-02-21 00:22:39 +01:00
ArcadeFever
97fc83ba38 fixed typo in configure command 2021-01-30 23:25:24 -08:00
ArcadeFever
64a0ab6834 fix whitespace 2021-01-16 22:36:35 -08:00
ArcadeFever
da34fd1411 remove extra brew command 2021-01-16 22:34:55 -08:00
ArcadeFever
a7c9a90d22 fix a copy/past bug 2021-01-16 22:31:36 -08:00
ArcadeFever
559859ec1d fix typo 2021-01-16 22:29:35 -08:00
ArcadeFever
8ba0bdfb60 Update MacOSX build to QT 5.15.2 along with updated build instructions 2021-01-16 22:09:47 -08:00
David Rowe
c66f6a1a3f qt.conf file requires editing 2020-12-29 20:49:40 +13:00
David Rowe
d5530f180b Update Windows builds to Qt 5.15.2 2020-12-28 15:54:38 +13:00
David Rowe
cd4227799c Update build instructions for Qt 5.15.2 2020-12-12 10:23:20 +13:00
Kalila L
90a7c6cdac Merge branch 'master' into gha-master-ci 2020-10-29 17:32:53 -04:00
Dale Glass
7b6fbe1f69 Set OpenGL_GL_PREFERENCE to LEGACY
GLVND appears to break the entire UI on ATI video cards.

It was set to GLVND due to an understanding that this was a no-op setting, but it turns
out the documentation in OpenGL_GL_PREFERENCE is confusing, and it looks like LEGACY
is the setting that was being used after all.

An additional point of interest is that debian/rules contained OpenGL_GL_PREFERENCE=GLVND,
and this was done back in the High Fidelity days. It's uncertain whether this was correct
or not, though.
2020-10-13 20:13:45 +02:00
kasenvr
76093185b7
Merge pull request #763 from daleglass/fix-opengl-cmake-warning
Set GL preference to GLVND
2020-10-08 19:03:34 -04:00
kasenvr
ca80d79991
Merge branch 'master' into fix/update-api-docs 2020-10-02 15:33:28 -04:00
Dale Glass
1c44bc96d9 Set GL preference to GLVND
This should be a no-op, besides generating less build warnings,
since:

"CMake 3.11 and above prefer to choose GLVND libraries."

And 3.11 is a few years old at this point
2020-09-27 20:37:12 +02:00
Dale Glass
125841afc9 Remove the HiFiAC codec
This is a proprietary codec and it's uncertain who can use it, and
under what conditions. At this point, Opus is stable and a suitable
replacement.
2020-09-27 20:17:15 +02:00
Kalila L
0cb6261d11 Catch stragglers. 2020-09-22 20:25:19 -04:00
Kalila L
154a95ac86 Update all scripts, script-archive scripts still broken. 2020-09-22 19:24:58 -04:00
Kalila L
7b7038fae1 Bunch of URL updates later... 2020-09-21 00:54:49 -04:00
Kalila L
9a35323295 Update entities API docs to show entity properties at top. 2020-09-18 16:27:42 -04:00
David Rowe
2ed37d0c47 Fix upload target location and path 2020-09-17 09:02:00 +12:00
David Rowe
9395caa7d0 Rework GitHub Actions builds for merges to master 2020-09-17 09:01:27 +12:00
Julian Groß
dce34b8d90 Change strings, comments and folders to Vircadia 2020-07-09 16:03:07 +02:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
Dale Glass
407b2a4f22 Remove all uses of QString::null
It's deprecated and produces a warning on Qt 5.14
2020-05-17 18:00:02 +02:00
Thijs Wenker
8a76753135 Merge branch 'master' of https://github.com/kasenvr/project-athena into feature/gha_vircadia 2020-05-07 11:07:28 +02: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
Thijs Wenker
0ebe33b447 change upload server 2020-04-19 22:50:52 +02:00
Thijs Wenker
25932d3ab5 the new build upload script 2020-04-19 22:50:51 +02: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
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
Kasen IO
0588fd3f4f API docs rebranded to Vircadia. 2020-04-07 02:11:29 -04:00
Kasen IO
fff819f56c Fix sidebar not showing on first load. 2020-03-27 16:07:59 -04:00
David Rowe
1112367b06 Handle localStorage not being available 2020-02-02 20:57:56 +13:00
Kasen IO
eaa6151ff3 == to === 2020-01-31 13:53:46 -05:00
Kasen IO
d8ba64785f Fix tabs 2020-01-31 13:24:24 -05:00
Kasen IO
0eac20d830 toggle works + viewport restriction removed. 2020-01-30 13:12:46 -05:00
Kasen IO
a8000f876b menu show/hide button added. 2020-01-30 12:17:09 -05:00
Kasen IO
d3e2f7204b init 2020-01-30 11:30:31 -05:00
Kasen IO
b10ffc667f remove non codeblock bg for code, add weight to all for visibility. 2020-01-24 10:42:46 -05:00
Kasen IO
6ec6b39530 code comments brighter, code blocks now have padding for readability. 2020-01-24 10:14:55 -05:00
Kasen IO
4f56a847d7 Bugfix for init val. 2020-01-24 08:16:13 -05:00
Kasen IO
2eca2cf10e Theme + button bg matches sidebar. 2020-01-23 22:52:34 -05:00
Kasen IO
d373826d03 Fixed theme selection loading bug. 2020-01-23 18:37:15 -05:00
Kasen IO
717c20fc84 Fixed persistence bug. 2020-01-23 16:04:31 -05:00
Kasen IO
615c01d058 Disabled dev mode on Vue, fixed persistence, updated styles. 2020-01-23 15:52:22 -05:00
Kasen IO
3c1665df02 Updated some colors. 2020-01-23 13:54:01 -05:00
Kasen IO
53d05f9fee Night mode set to default + toggle implemented. 2020-01-23 13:47:59 -05:00
Kasen IO
78bf9e9a2f Vue.JS + Vuetify init + test. 2020-01-23 02:55:50 -05:00
6ac090dea5 Quick fix for the metaverse API
We did have the dfault metaverse API as metaverse.projectathena.io, but that doesn't not yet exist, and it turns out we can't just do a redirect. So for now changing it to metaverse.highfidelity.com
2020-01-14 20:33:39 -06:00
0fbaada57b
Merge pull request #54 from sethalves/fix-linux-build-0
fix linux build
2020-01-14 18:44:01 -06:00
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
Ability to change Metaverse API from setting
2020-01-14 18:40:04 -06:00
David Rowe
195f8867d8 Disable API docs old analytics 2020-01-14 12:48:16 +13:00
David Rowe
60e2c2b520 API docs rebranding 2020-01-09 10:38:58 +13:00
Seth Alves
82bddeb5a7 fix linux build 2020-01-03 10:27:43 -08:00
David Rowe
f7336d9141 Fix @hideconstructor JSDoc tag hiding classes' properties 2019-12-23 14:12:50 +13:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Brad Hefta-Gaub
42b69332f7
Merge pull request #16564 from ctrlaltdavid/DOC-239
DOC-239: Rates JSDoc
2019-12-13 10:36:39 -08:00
Brad Davis
1ac7215ac8 Fix GA S3 upload path 2019-12-10 12:44:49 -08:00
David Rowe
73ad5d1d31 Fix some JSDoc typos noticed in passing 2019-12-10 13:34:32 +13: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
697f445edd Merge remote-tracking branch 'upstream/master' into ga/master_build 2019-12-04 08:44:12 -08:00
Brad Davis
8844620116 Change s3 key prefix 2019-12-03 12:06:51 -08:00
Brad Davis
f39088fb0b Github Actions master builds 2019-12-03 10:56:04 -08:00
Simon Walton
c38fe5b2aa Another dummy statement 2019-12-01 23:25:14 -08:00
Simon Walton
0d52462578 Dummy Dockerfile statement 2019-11-30 00:18:25 -08:00
Simon Walton
c88479610d Use correct path for hifi.conf; copy DS resources to image 2019-11-27 15:19:22 -08:00
jennaingersoll
c9bdd54b1d
Merge pull request #16541 from ctrlaltdavid/DOC-233
DOC-233: MaterialCache JSDoc
2019-11-27 14:56:42 -08:00
Simon Walton
35fe7fe00c Build from updated base docker image; copy over supervisor hifi.conf 2019-11-27 12:25:18 -08:00
Anthony J. Thibault
764b6a9adf code review feedback 2019-11-26 10:52:21 -08:00
David Rowe
fafb3dd30b MaterialCache JSDoc 2019-11-26 17:43:23 +13:00
Simon Walton
30f3525932
Merge branch 'master' into linux-actions-builds 2019-11-22 18:02:48 -08:00
Anthony J. Thibault
320095f765 Added animedit avatar-animation.json graph editor tool 2019-11-22 15:40:44 -08:00
Seth Alves
ea2c6b4dfb fix linux build 2019-11-22 11:35:23 -08:00
Simon Walton
9e5c0a7afc Copy quazip lib to build dir; built server-console 2019-11-21 15:02:08 -08:00