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
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
