Commit graph

17806 commits

Author SHA1 Message Date
Anthony J. Thibault
aab974e6ae Merge branch 'master' into out-of-body-experience 2016-10-04 11:17:52 -07:00
Anthony Thibault
60aff44f33 Merge pull request #8717 from hyperlogic/bug-fix/near-grab-lag-fix
Remove frame lag and jitter from near grabbed physical objects.
2016-10-04 11:14:22 -07:00
Anthony J. Thibault
dcd425a165 Add an entityTree lock around the AvatarHoldAction::lateAvatarUpdate calls 2016-10-04 10:56:44 -07:00
Anthony J. Thibault
327fcc970b Remove frame lag from near grabbed physical objects.
In the game loop, physics occurs before avatar update.
Before this PR, when the avatar is moved during avatar update, near grabbed objects will not pick up this move until one frame later, when
the physics is run on the next update.

After this PR, near grabbed objects are adjusted to reflect any position or rotation change that occurred during the avatar update.
2016-10-03 16:01:54 -07:00
Ryan Huffman
b5eb943c1d Add hmd stats to stats event 2016-10-03 15:12:14 -07:00
Ryan Huffman
dafb5c5bab Add processor information to launch user activity event 2016-10-03 15:11:56 -07:00
samcake
0189e3aea7 Github is borked ? 2016-10-03 11:29:17 -07:00
samcake
5adedbbb8b replace the simple log by a unique log 2016-10-03 11:27:15 -07:00
samcake
0df69b8e15 Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug 2016-10-03 10:06:58 -07:00
Clément Brisset
becee3bba3 Merge pull request #8685 from thoys/ac-fixes
Assignment Client fixes
2016-09-30 11:05:58 -07:00
Anthony J. Thibault
eccd01e88f Merge remote-tracking branch 'upstream/master' into out-of-body-experience 2016-09-29 16:36:25 -07:00
Thijs Wenker
3d14a32d17 fix controller::ScriptingInterface not found warning in AC 2016-09-29 22:11:12 +02:00
Andrew Meadows
d29386c43f better tracking of avatar gravity setting 2016-09-29 11:14:19 -07:00
Brad Hefta-Gaub
38eccd32a8 add developer menu support to enable/disable dynamic texture management 2016-09-29 10:18:54 -07:00
Anthony J. Thibault
62dc250237 removed DebugDraw calls 2016-09-27 16:48:15 -07:00
Anthony J. Thibault
961d262df1 Improved body follow behavior
* follow helper lean re-centering / reconciliation now modifies bodySensorMatrix, NOT the character controller.
* The character controller now always follows the bodySensorMatrix (in world space).

This decouples the lean re-centering velocity from the velocity used to move the character controller.
We can now independently tune these things separately.
2016-09-27 16:38:48 -07:00
Anthony J. Thibault
f9a1a21b2c apply linearMoveBlend to idleToWalk transition to reduce foot sliding 2016-09-26 14:24:01 -07:00
Anthony J. Thibault
0a72805874 Tuned transition from idle to back to reduce foot sliding 2016-09-26 10:41:16 -07:00
Anthony J. Thibault
203ff95849 Animation tuning to reduce foot sliding.
* Navigation walk speed has been reduced
* Tuned IdleToWalk timescale and interp time to reduce foot sliding
* Tuned fwd, back and lateral characteristicSpeeds to better match the
  animations.  This reduces foot sliding when moving forward and backward.
* Reduced rig state machine hysteresis to 1/60th of a second.
2016-09-26 09:59:50 -07:00
Anthony Thibault
10c5da5728 Smooth transition of hands from in-body to out-of-body modes. 2016-09-24 14:28:56 -07:00
Anthony Thibault
27e6c0f872 Added debug draw path trace for left and right feet 2016-09-24 13:01:16 -07:00
Anthony J. Thibault
f4c4b3474b capsule projection and distance tests now work for non-vertical capsules 2016-09-23 16:55:38 -07:00
Howard Stearns
3f31da68fe Merge pull request #8638 from howard-stearns/uniform-story-handling
Uniform story handling
2016-09-23 16:11:41 -07:00
Anthony J. Thibault
9567ec11af Prevent character from walking when pinned against collision.
This is fixed by using the pre-action velocity from CharacterController, which does not include any motors or follow velocity.
This pre-action velocity reflects the actual rigid body velocity after collision constraints are resolved.

This should prevent the character f
2016-09-23 15:22:52 -07:00
Chris Collins
be33524990 Merge pull request #8636 from zzmp/clean/audio-config
strip unused audio settings, hide the rest
2016-09-23 15:08:48 -07:00
howard-stearns
a5fb0c9bd5 Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling 2016-09-23 13:16:36 -07:00
Zach Pomerantz
d0f4a29031 Merge branch 'master' of github.com:highfidelity/hifi into fix/local-audio-injection 2016-09-23 13:12:39 -07:00
Zach Pomerantz
a9318d052b Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config 2016-09-23 13:11:52 -07:00
Brad Davis
f33d3a3b36 Migrate logging functionality to shared library 2016-09-23 12:04:58 -07:00
Brad Davis
a7f0ba24ed Dynamic texture memory management 2016-09-23 12:04:42 -07:00
Anthony J. Thibault
b68dbab994 Fix for incorrect hand offset when backing into collision.
We know properly account for the offset of the head due to clamping from a small maxHipsOffset.
This means the hands should look more natural when you are out-of-body and are moving your hand controllers.
2016-09-23 11:47:44 -07:00
Anthony J. Thibault
98ffea2fb9 Merge branch 'master' into out-of-body-experience 2016-09-22 18:08:23 -07:00
howard-stearns
c4ed84f9a6 remove obsolete file 2016-09-22 16:49:38 -07:00
howard-stearns
17549348b4 less busy hotspotting, and make use of restricted feed (by protocol) 2016-09-22 16:48:16 -07:00
howard-stearns
4357bb391d Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling 2016-09-22 14:54:15 -07:00
Andrew Meadows
06ff984f90 sky-hook for walking up steps 2016-09-22 09:48:59 -07:00
Howard Stearns
8e9b743515 rollover images 2016-09-21 19:15:01 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Zach Pomerantz
e2ff738fc3 strip unused audio settings
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
2016-09-21 17:35:27 -07:00
Zach Pomerantz
9e2ec27b29 always play audio injectors locally 2016-09-21 17:20:51 -07:00
Ken Cooke
b14f43b11e Merge pull request #8610 from zzmp/test/audio-jitter
add audio jitter simulator testing tool
2016-09-21 16:43:36 -07:00
Howard Stearns
660343f8c6 Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling 2016-09-21 16:31:50 -07:00
howard-stearns
41b20dc69d single feed with snapshot and concurrency, no radio buttons, mini-card
has two hotspots that bring up different kinds of cards, and anywhere
 else on the minicard takes you "there".
2016-09-21 16:00:29 -07:00
Anthony J. Thibault
1f7dc25f12 MyAvatar.addThrust() works again. 2016-09-21 11:48:54 -07:00
Clément Brisset
f26fbca699 Merge pull request #8623 from ZappoMan/improvedPreview
Improved preview
2016-09-20 19:05:26 -07:00
Anthony J. Thibault
4c99848f29 disable vertical re-centering behavior 2016-09-20 17:05:01 -07:00
Anthony J. Thibault
4afd60f22a Flying behavior now works again 2016-09-20 16:01:39 -07:00
Andrew Meadows
7258835f3f restore orientation from physics to Avatar 2016-09-20 09:14:11 -07:00
Andrew Meadows
59e6ca8f8d avatar follows HMD using velocity motor 2016-09-20 08:29:55 -07:00
Andrew Meadows
8dd5c9b92b fix kinematic motion for ground and hover 2016-09-20 08:29:55 -07:00