Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-20 11:45:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84145 commits 25 branches 28 tags 1.2 GiB
Commit graph

4467 commits

Author SHA1 Message Date
kasenvr
5bb0c9bffc
Merge pull request #804 from daleglass/logging_improvements 
Improve logging: color, ms timestamps, PID, thread id via environment variable
 2020-10-29 20:12:18 -04:00
daleglass
6c25b9470d
Update libraries/shared/src/LogHandler.cpp 
Co-authored-by: kasenvr <52365539+kasenvr@users.noreply.github.com>
 2020-10-29 19:20:18 +01:00
Dale Glass
1124590422 Enable color by default on Unix, change to comma separators. 
Also emit a message if an unrecognized log option is used.
 2020-10-16 20:16:44 +02:00
Dale Glass
895d4d4172 Improve logging: color, ms timestamps, PID, thread id via environment variable 
Set VIRCADIA_LOG_OPTIONS to a string containing these keywords:

	color
	milliseconds
	process_id
	thread_id

The separator doesn't matter. Example:

    $ export VIRCADIA_LOG_OPTIONS="color milliseconds"
 2020-10-13 20:22:01 +02:00
kasenvr
d12cd36eb3
Merge pull request #677 from HifiExperiments/mouse 
Add option to capture mouse
 2020-10-12 13:19:36 -04:00
HifiExperiments
e028943645 CR 2020-10-09 13:33:48 -07:00
Kalila L
853c8052f4 Merge branch 'master' into pr/669 2020-10-02 15:29:51 -04:00
kasenvr
1c818bc8eb
Merge pull request #657 from daleglass/fix-build-on-qt-5.14 
Fix build on qt 5.14
 2020-09-24 17:11:42 -04:00
kasenvr
dd3152a2e4
Merge pull request #349 from daleglass/fix_warnings 
Fix warnings emitted by GCC
 2020-09-24 17:06:16 -04:00
daleglass
fffb6619b3
Update libraries/shared/src/BufferParser.h 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-24 22:17:22 +02:00
daleglass
ed4164b59e
Update libraries/shared/src/GeometryUtil.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-24 22:17:16 +02:00
HifiExperiments
e4f32f1cea add camera sensitivity slider 2020-09-19 11:23:59 -07:00
HifiExperiments
9546cebe3c CR 2020-09-09 08:32:54 -07:00
HifiExperiments
932f5dbfb3 CR 2020-09-06 22:41:17 -07:00
kasenvr
7a686d95e0
Merge pull request #671 from ctrlaltdavid/fix/gltf-blendshapes 
Fix and extend glTF blendshapes support
 2020-09-03 13:57:57 -04:00
HifiExperiments
5281f89d0d FUUUUUUUCK FINALLY 2020-09-02 11:28:43 -07:00
Kalila L
b8181d92a5 Merge branch 'master' into pr/441 2020-09-01 17:42:35 -04:00
Kalila L
4096d75bb4 Add checkbox for showing extra source logs. 2020-09-01 16:46:22 -04:00
HifiExperiments
776b1071a0 try to do it without QCursor::setPos 2020-08-31 15:44:06 -07:00
David Rowe
77dbe7a254 Rename FACESHIFT_BLENDSHAPES to BLENDSHAPE_NAMES 2020-08-29 11:21:56 +12:00
Dale Glass
5a8be4de4b Fix -Wclass-memaccess warnings 2020-08-27 19:49:48 +02:00
Dale Glass
a8ab9307d0 Add fall-through comments to fix GCC warnings 
Unfortunately the attribute can't be used since we're not on C++17 yet.
 2020-08-27 19:27:11 +02:00
Dale Glass
5327ffeec4 Fix build under Qt 5.14 and later. 
Solves "redefinition of ‘struct std::hash<QString>’",
"redefinition of ‘struct std::hash<QByteArray>'", and
a build failure in TouchscreenVirtualPadDevice.h.
 2020-08-26 00:01:29 +02:00
Dale Glass
61a159034c Fix build under Qt 5.14 and later. 
Solves "redefinition of ‘struct std::hash<QString>’",
"redefinition of ‘struct std::hash<QByteArray>'", and
a build failure in TouchscreenVirtualPadDevice.h.
 2020-08-25 23:32:24 +02:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
Dale Glass
bc2c6a280d Fix illegal instruction in libaudio.dylib on OSX 
This file gets included by AudioHRTF_avx512.cpp, which contains code
that should only be getting executed on CPUs with the appropriate support.

Unfortunately, when that file is compiled with -mavx512f, GCC also generates
AVX instructions in the code that initializes the value of SQUARE_ROOT_OF_2,
and this crashes on CPUs without AVX because it runs unconditionally.

Avoid the issue entirely by just making it a constant so no code needs to
be run.
 2020-06-25 19:31:46 +02:00
Heather Anderson
b6e1c9e3af added "c++ crash" to crash menu 2020-06-19 18:26:26 -07:00
kasenvr
5f15e8df04
Merge pull request #418 from Misterblue/fix/includes-for-VS-build 
Include <stdexcept> for building on Windows10 with Visual Studio 2019
 2020-06-04 17:30:15 -04:00
Robert Adams
ee1d46af94 Include <stdexcept> so building on Windows10 with Visual Studio 2019 works. 2020-06-04 09:35:45 -07:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
kasenvr
1a46b28b71
Merge pull request #62 from HifiExperiments/blendshapes 
Support blendshapes on model entities
 2020-05-31 18:34:42 -04:00
kasenvr
4cca7f6f75
Merge pull request #281 from HifiExperiments/parenting2 
Improve performance of MyAvatar::simulate when you have lots of descendants
 2020-05-31 14:47:22 -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
motofckr9k
95a64b2f2c Change standard log file names from "hifi-.." to "vircadia-.." 2020-05-13 22:59:51 +02:00
daleglass
affcc6f918
Merge pull request #300 from thoys/feature/gha_vircadia 
GitHub Actions (with artifact uploading)
 2020-05-08 17:17:45 +02:00
HifiExperiments
405d557725
Merge branch 'master' into blendshapes 2020-05-07 13:38:59 -07:00
HifiExperiments
8017e30ab9
Merge branch 'master' into blendshapes 2020-05-07 13:27:22 -07:00
HifiExperiments
3bf690571c
Merge branch 'master' into zoneOcclusion 2020-05-07 13:13:20 -07: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
David Rowe
2d070e630b Merge branch 'master' into fix/jsdoc-fixes 
# Conflicts:
#	interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
#	interface/resources/qml/hifi/commerce/checkout/Checkout.qml
#	interface/resources/qml/hifi/commerce/purchases/Purchases.qml
#	interface/src/Application.cpp
 2020-04-26 20:38:43 +12:00
Thijs Wenker
5fa8571c0b shared seems to require linking with CoreFoundation and OpenGL on OSX 2020-04-23 00:58:48 +02: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
HifiExperiments
9b1635f9cc improve performance of MyAvatar::simulate when you have lots of entity descendants 2020-04-07 15:56:32 -07:00
HifiExperiments
6eacc5c8c2 Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion 2020-04-03 14:37:14 -07:00
HifiExperiments
c062cb75ae Merge remote-tracking branch 'upstream/kasen/core' into blendshapes 2020-04-03 14:35:21 -07:00
David Rowe
1a4266a64a Review JSDoc updates from recent commits 2020-01-20 14:33:06 +13:00
Dale Glass
d0dc041275 Another default operator= and copy constructor 2020-01-19 11:24:51 +01:00
Dale Glass
68d10a2fe1 Make default copy constructors explicit 
Recent versions of gcc generate a warning without this
 2020-01-19 00:20:49 +01:00
David Rowe
ec1e6bc7d3 Merge branch 'DOC-55-C' into api-docs 2020-01-14 18:04:32 +13:00
David Rowe
b9a1b78531 Merge branch 'DOC-68' into api-docs 
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
 2020-01-14 18:02:23 +13:00