Commit graph

4480 commits

Author SHA1 Message Date
Kalila
ba54dd755c
Merge pull request #1034 from vircadia/v2021.1.0-rc
merge V2021.1.0 rc into master
2021-02-22 00:16:36 -05:00
Julian Groß
937e0a55db Merge remote-tracking branch 'refs/remotes/HifiExperiments/fixBillboard' 2021-02-20 12:12:59 +01:00
HifiExperiments
852edec9e7 entities with billboardMode != none use local rotation so parent rotation doesn't affect them 2021-02-18 22:15:12 -08:00
HifiExperiments
30c4779eeb name all the threads 2021-02-13 20:17:28 -08:00
HifiExperiments
f46f1b2219 Merge branch 'master' into alignment 2021-02-11 18:07:23 -08:00
HifiExperiments
b296fff197 add text alignment property 2021-02-10 21:45:53 -08:00
HifiExperiments
ae26416c59
Merge branch 'master' into billboard 2021-02-09 22:57:10 -08:00
HifiExperiments
4554aa338b
Update BillboardMode.cpp 2021-01-30 00:28:25 -08:00
HifiExperiments
19cd0fa6ad CR 2021-01-29 22:31:17 -08:00
Kalila
af8ce1ba3d
Merge pull request #937 from daleglass/skip_repeated_log_entries
Skip repeated log entries
2021-01-28 17:22:51 -05:00
HifiExperiments
2a27fc4de2 billboarding for model entities 2021-01-13 22:31:21 -08:00
Dale Glass
aab5b22e25 Skip duplicated log entries
This helps with log flooding. Successive repeated log messages will be skipped and counted,
the count will be output when a different message is logged.

A new option of 'keep_repeats' has been added to VIRCADIA_LOG_OPTIONS to disable this.
2021-01-09 19:39:32 +01:00
Phil Palmer
2179c153de VR fixes for: couldn't sit on the floor, wrong walk directions.
- Divided the option "Avatar leaning behavior" into two options that work more usefully: "Allow my avatar to stand" and "Allow my avatar to lean" (PreferencesDialog.cpp).  Made the necessary fixes so that the avatar can be set to stand only when the user is standing (more details below).
- The logic controlling the direction of MyAvatar's action motor is now centralised in calculateScaledDirection (was previously split between there and updateMotors).  calculateScaledDirection now returns a velocity in world space.
- CharacterController::FollowHelper now uses separate follow timers for rotation, horizontal and vertical (previously followed all three based on the longest of their follow times).  Where appropriate, FollowHelper can now snap immediately to the desired rotation/horizontal/vertical independently (see FOLLOW_TIME_IMMEDIATE_SNAP).
- FollowHelper::FollowType has therefore moved to CharacterController::FollowType.
- MyAvatar::FollowHelper::postPhysicsUpdate: If MyAvatar is not allowed to stand when the user is sitting, this now avoids recentring the body based on the head height.
- Removed Q_PROPERTY(MyAvatar::SitStandModelType, as the sitting/standing/leaning model uses different enums now (see setAllowAvatarStandingPreference, setAllowAvatarLeaningPreference).
- Removed Q_PROPERTY(bool isSitStandStateLocked which is no longer used, because we now always track the user's real-world sit/stand state, regardless of what we're doing with it.
- MyAvatar::FollowHelper::shouldActivateHorizontal: If MyAvatar is not allowed to lean, this now returns true to recentre the footing if the head is outside the base of support.
- MyAvatar::FollowHelper::shouldActivateHorizontalCG: If MyAvatar is not allowed to lean, this now always returns true to recentre the footing.  Rearranged to avoid computing values that weren't used depending on the conditions.  Resolved some duplicated code.
- MyAvatar::setUserRecenterModel previously set HMDLeanRecenterEnabled based on the chosen mode, but it got reset when getting out of a sit.  Now HMDLeanRecenterEnabled is only controlled by the scripts.
- Added Rig::getUnscaledHipsHeight (like getUnscaledEyeHeight).  Refactored a little to avoid duplicated code.  Added DEFAULT_AVATAR_HIPS_HEIGHT which is the value that Rig::getUnscaledHipsHeight returns when using the default avatar.
- Fix for recentring not behaving as requested by the user after getting up from click-to-sit (always behaving like 'Auto') : MyAvatar::endSit now passes false to centerBody for 'forceFollowYPos'.
- Fix for incorrect vertical position of the avatar and viewpoint after changing lean recentre mode while not standing in the real world: MyAvatar::setAllowAvatarStandingPreference now calls centerBody with false for 'forceFollowYPos'.
- computeHipsInSensorFrame: The code now matches the comments in that it only skips the dampening of the hips rotation if the centre-of-gravity model is being used.
2020-12-22 14:22:27 -05:00
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