Commit graph

38720 commits

Author SHA1 Message Date
Ken Cooke
1a1b34296c Compiler fixes 2016-02-05 15:44:31 -08:00
Ken Cooke
721fa9d43a HRTF-based audio spatialization engine 2016-02-05 15:24:09 -08:00
Andrew Meadows
09bdccb18c Merge pull request #7032 from hyperlogic/tony/standing-jump
MyAvatar: Standing Takeoff and In-Air Animations
2016-02-05 13:45:52 -08:00
Brad Hefta-Gaub
f738f2b6f6 Merge pull request #7035 from howard-stearns/fix-mouth-movement
fix-mouth-movement
2016-02-05 12:08:23 -08:00
Howard Stearns
47694b90ee Fix inverted boolean that was preventing other people's avatars from mouth-animating. 2016-02-05 11:47:21 -08:00
Anthony J. Thibault
f13e31c7fc CharacterController: removed unnecessary code. 2016-02-05 10:53:58 -08:00
Anthony J. Thibault
bfeace78f7 AnimInverseKinematics: warning fixes 2016-02-04 18:51:48 -08:00
Anthony J. Thibault
51189cfc50 AnimInverseKinematics: opened up UpLeg and Leg constraints
This improves the quality of the jump animations, while IK is enabled.
2016-02-04 17:56:41 -08:00
Anthony J. Thibault
8ca8550f26 MyAvatar: Standing Takeoff and In-Air Animations
Now there are two sets of of jump takeoff and in-air animations.
* Run - Used when the character jumps or falls with a small forward velocity.
* Standing - Used when the character jumps or falls in-place or backward.

CharacterController
* increased takeoff duration to 250 ms
* increased takeoff to fly duration to 1100 ms
* added standing jump and in-air animations
* added 250 milisecond delay between ground and hover, to prevent going into hover when walking over cracks.
* take-off to in-air transitions now use the new snapshotPrev interp type for a smoother tweening.
2016-02-04 17:56:07 -08:00
Andrew Meadows
725f9e29a3 Merge pull request #7026 from hyperlogic/tony/fly-like-an-eagle
MyAvatar: Use head to turn while flying in HMD mode
2016-02-04 17:52:47 -08:00
Brad Hefta-Gaub
817245accc Merge pull request #7025 from jherico/qml
QML Work
2016-02-04 16:03:39 -08:00
Bradley Austin Davis
dc0e038535 Add drive selection to the file dialog 2016-02-04 13:51:43 -08:00
Bradley Austin Davis
64597f9d9f Fixing save dialog issues saving new files 2016-02-04 13:32:52 -08:00
Eric Levin
294a7ee9ad Merge pull request #7027 from birarda/avatars-property
move two AvatarList invokable methods from AvatarManager to AvatarHashMap
2016-02-04 11:41:52 -08:00
Anthony J. Thibault
a8e092272c AnimStateMachine: added new State parameter interpType
interpType defines how the interpolation between two states is performed.

   * SnapshotBoth: Stores two snapshots, the previous animation before interpolation begins and the target state at the
     interTarget frame.  Then during the interpolation period the two snapshots are interpolated to produce smooth motion between them.
   * SnapshotPrev: Stores a snapshot of the previous animation before interpolation begins.  However the target state is
     evaluated dynamically.  During the interpolation period the previous snapshot is interpolated with the target pose
     to produce smooth motion between them.  This mode is useful for interping into a blended animation where the actual
     blend factor is not known at the start of the interp or is might change dramatically during the interp.
2016-02-04 10:32:58 -08:00
James B. Pollack
3c9043987f Merge pull request #7019 from birarda/absolute-paths
allow absolute path to entity-server persist file
2016-02-04 08:53:21 -08:00
James B. Pollack
8b09cf3b82 Merge pull request #7024 from birarda/audio-mute-crash
fix for audio-mixer mute env crash
2016-02-04 08:53:10 -08:00
Eric Levin
2af6c08057 Merge pull request #7022 from imgntn/mastertoys
Fix userData for pistol in toybox reset scripts
2016-02-03 17:47:21 -08:00
Eric Levin
32fc973698 Merge pull request #7010 from imgntn/cellscience
Decrease Cell Science Volume
2016-02-03 17:46:56 -08:00
Stephen Birarda
816fe52c5b mark getAvatarBySessionID as virtual 2016-02-03 17:31:38 -08:00
Stephen Birarda
058bba7b55 move avatar invokables from AvatarManager to AvatarHashMap 2016-02-03 17:13:35 -08:00
Anthony J. Thibault
d2068678f4 MyAvatar: bumped up size of head, w.r.t. head cauterization.
This is to avoid some issues where face is visible when looking straight down.
Specifically, with the Albert avatar.
2016-02-03 16:08:11 -08:00
Anthony J. Thibault
027a2166f5 MyAvatar: Use head to turn while flying in HMD mode 2016-02-03 15:44:06 -08:00
Bradley Austin Davis
60d97c45af Support save file dialog 2016-02-03 14:51:10 -08:00
Bradley Austin Davis
8f85abfec8 Support 'naked' selection globs in file dialog 2016-02-03 14:51:07 -08:00
Bradley Austin Davis
320c4d27b5 Force Qt (rather than OS) rendering in a number of places 2016-02-03 14:51:05 -08:00
Bradley Austin Davis
0a99086617 Moving to QML based dialogs 2016-02-03 14:51:02 -08:00
Bradley Austin Davis
c1d45b0c78 Remove declarative form creation from WindowScriptingInterface 2016-02-03 14:50:59 -08:00
Andrew Meadows
63df34541d Merge pull request #6802 from huffman/agent-simulation
Fix Agents bidding on simulation ownership
2016-02-03 13:45:12 -08:00
Stephen Birarda
ea9d84bdc4 handle downloading of absolute persist file contents 2016-02-03 13:18:29 -08:00
Andrew Meadows
861082964e Merge pull request #7017 from hyperlogic/tony/fly
MyAvatar: Improved Jump / InAir / Fly behavior
2016-02-03 12:22:30 -08:00
Andrew Meadows
00f30201a7 Merge pull request #7003 from sethalves/save-held-adjustments
automatically save adjustments to offsets of equipped items
2016-02-03 12:21:17 -08:00
Brad Hefta-Gaub
839ce50bde Merge pull request #7018 from jherico/qml
QML fixes
2016-02-03 11:59:27 -08:00
Ryan Huffman
77b86e654e Merge pull request #7006 from birarda/final-overrides
fix the last of the current override warnings for OS X
2016-02-03 11:26:46 -08:00
Stephen Birarda
93530fca72 fix the last of the current override warnings for OS X 2016-02-03 11:08:41 -08:00
Stephen Birarda
0e20392e66 remove debug for mute environment packet 2016-02-03 11:07:16 -08:00
Stephen Birarda
26abca92ae don't move the re-used mute environment packet 2016-02-03 10:55:07 -08:00
Seth Alves
ad2a7bfc3c code review 2016-02-03 10:54:08 -08:00
Andrew Meadows
cd56d635e1 Merge pull request #7012 from sethalves/adjust-palm-position
base palm position on finger joint rather than an offset from hand joint
2016-02-03 10:34:39 -08:00
Anthony J. Thibault
fff603e4e2 Removed comment 2016-02-03 10:21:27 -08:00
James B. Pollack
51b335c902 reduce cellscience volume 2016-02-03 09:53:14 -08:00
Ryan Huffman
963c71a476 Fix ES rejecting unowned entity physics updates 2016-02-03 09:28:49 -08:00
samcake
4d62df2996 Merge pull request #7011 from zzmp/fix/render-connect-warnings
Only connect render config if dirty signal present
2016-02-02 17:46:22 -08:00
samcake
940ef40b69 Merge pull request #6999 from zzmp/refactor/render-init-file
Migrate stencil and overlay jobs to use plumbers
2016-02-02 17:45:17 -08:00
James B. Pollack
61daed5376 fix userdata for pistol 2016-02-02 17:39:43 -08:00
Zach Pomerantz
aa10af2851 Revert "Move DrawStencil to use ShapePlumber"
This reverts commit 671f27e5bc.
2016-02-02 17:10:21 -08:00
Seth Alves
6503fd6d46 Merge pull request #7009 from PhilipRosedale/calibrateNoBumper
calibrate hydras using either the 1 or 2 button on each hand
2016-02-02 17:04:55 -08:00
Seth Alves
30e97c2a76 run attachedEntitiesManager.js by default, but without a UI 2016-02-02 16:34:06 -08:00
Stephen Birarda
2c1623ed42 use extension with preceeding period 2016-02-02 16:07:14 -08:00
Stephen Birarda
8ab15770b8 use absolutePath for absolute persist path 2016-02-02 15:52:12 -08:00