Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 08:43:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84980 commits 21 branches 28 tags 1.2 GiB
Commit graph

1701 commits

Author SHA1 Message Date
ksuprynowicz
4e399edaa7 Merge remote-tracking branch 'origin/master' into remove-hifiac 2022-01-18 21:29:33 +01: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
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
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
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
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
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
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