Brad Hefta-Gaub
6866c288b0
Merge pull request #5754 from ZappoMan/breakdanceToy
...
fix breakdance toy
2015-09-09 12:42:10 -07:00
Brad Hefta-Gaub
427ed8807b
fix breakdance toy
2015-09-09 12:41:59 -07:00
Anthony J. Thibault
c1d7287652
AnimController node now takes absolute rotation vars, instead of relative.
2015-09-09 12:24:32 -07:00
Howard Stearns
ed2ed525b2
Tear down animGraph when turning off the avatar update thread. Otherwise, big time deltas accumulate.
2015-09-09 12:15:48 -07:00
David Rowe
01d7e68dbb
Terminate DDE earlier during shut-down and always at start-up
2015-09-09 11:29:57 -07:00
Howard Stearns
83d14d3380
Protect avatarLock.
2015-09-09 11:11:06 -07:00
Howard Stearns
3f5744712f
Remove optional "parent" argument.
...
GenericThread used to accept an optional "parent" argument, defaulting to nullptr.
This was odd, because the moveToThread() in GenericThread::initialize() would
become a no-op if the instance ever inits QObject(someNonNullParentQObject).
(The only clue would be a log message "QObject::moveToThread: Cannot move objects with a parent",
and things would end up in the same thread that created the instance.)
As it turns out, all the subclasses of GenericThread do not init
GenericThread(parent), so things worked as expected.
2015-09-09 11:04:17 -07:00
Stephen Birarda
2849d80274
use the exact payload size where possible
2015-09-09 10:39:53 -07:00
Howard Stearns
5572840133
Convert isHMD reference.
2015-09-09 10:39:36 -07:00
Howard Stearns
73a5714d66
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-09 10:37:11 -07:00
Howard Stearns
f081631075
Explicit cast.
2015-09-09 10:36:52 -07:00
Stephen Birarda
e7e1f5fe5c
make all of AssetClient packets reliable
2015-09-09 10:35:31 -07:00
Howard Stearns
24f1387579
Consistently use brace initialization in class headers.
2015-09-09 10:34:08 -07:00
Howard Stearns
f818ac2b74
Merge pull request #5744 from hyperlogic/tony/enable-lean-flag
...
Added a flag to enable and disable lean.
2015-09-09 10:18:12 -07:00
James Pollack
da90b7ff08
remove logging around bubble leave entity
2015-09-09 09:53:47 -07:00
James Pollack
0ac4da285c
Update bubblewand to not use overlays by default.
2015-09-09 09:48:39 -07:00
Anthony J. Thibault
146836452f
Merge remote-tracking branch 'andrew/europium' into tony/ik-and-controllers
2015-09-09 09:40:55 -07:00
Howard Stearns
74c92af8e0
Merge pull request #5741 from AndrewMeadows/brokenCapsules
...
fix for bad bounding capsules for avatars
2015-09-09 09:33:57 -07:00
Ryan Downe Karpf
9c71d5fd4d
Merge pull request #5750 from ZappoMan/boombox
...
lower volume
2015-09-09 09:30:29 -07:00
Brad Hefta-Gaub
b0329a58a6
lower volume
2015-09-09 09:29:31 -07:00
Brad Hefta-Gaub
86aa14a351
Merge pull request #5749 from jherico/marge
...
Reduce logging spam in omniTools/magBalls
2015-09-09 09:20:22 -07:00
Seth Alves
7b656d5ead
make a couple variable names better
2015-09-09 03:30:09 -07:00
Anthony J. Thibault
39aef6edc9
AnimController fix for crash if underPoses vector was empty.
2015-09-08 21:42:42 -07:00
Brad Davis
75a05ff15d
Reduce logging spam in omniTools/magBalls
2015-09-08 20:56:54 -07:00
Anthony J. Thibault
75ecf0020d
WIP commit, added AnimController node.
2015-09-08 20:34:21 -07:00
Seth Alves
4a65f1fc6d
Merge branch 'master' of github.com:highfidelity/hifi into octree-shared-pointers
2015-09-08 19:20:27 -07:00
Seth Alves
babe6179c3
Merge branch 'octree-shared-pointers' of github.com:sethalves/hifi into octree-shared-pointers
2015-09-08 19:19:59 -07:00
Seth Alves
4fa1818807
remove a line that leaked over from other branch
2015-09-08 19:19:49 -07:00
Andrew Meadows
e86e760118
remove debug stuff and nerfed constriants
2015-09-08 19:14:31 -07:00
Andrew Meadows
381828dac3
remove hackery for bad length units in AnimSkeleton
2015-09-08 19:02:16 -07:00
Andrew Meadows
ee265aba4a
add AnimInverseKinematics class
2015-09-08 18:20:22 -07:00
Andrew Meadows
3d661095dc
fix some bugs in RotationConstraints
2015-09-08 18:20:03 -07:00
Andrew Meadows
b6cef3d1a9
fix Qt includes
2015-09-08 18:19:33 -07:00
Andrew Meadows
00c446d1b0
sort includes
2015-09-08 18:19:18 -07:00
Andrew Meadows
c3e16d33c1
add InverseKinematics type
2015-09-08 18:18:50 -07:00
Brad Hefta-Gaub
ae8c3a19ed
Merge pull request #5746 from imgntn/bubblewand_hotfix_1
...
Run cleanup when createWand.js ends; Don't delete bubbles on collision (for now)
2015-09-08 18:18:36 -07:00
Leonardo Murillo
841b5dc47a
Merge pull request #5747 from ZappoMan/fixDefaultScripts
...
fix issue with default scripts
2015-09-08 19:09:45 -06:00
Brad Hefta-Gaub
ece8addf81
fix issue with default scripts
2015-09-08 18:08:30 -07:00
Seth Alves
9c4fdfd653
merge from upstream
2015-09-08 18:01:07 -07:00
James Pollack
66b6d5178f
Cleanup wand when createWand.js script ends
2015-09-08 17:25:39 -07:00
Andrew Meadows
614c0be59a
HACK so legless avatars don't drag their knuckles
2015-09-08 17:09:37 -07:00
Seth Alves
e06461ea15
Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements
...
AnimDebugDraw Improvements
2015-09-08 17:07:51 -07:00
Howard Stearns
ad411d1bae
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 16:54:22 -07:00
Howard Stearns
eb67254e54
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 16:54:14 -07:00
Brad Hefta-Gaub
0612ee498d
Merge pull request #5742 from ericrius1/defaultGrab
...
handControllerGrab.js is active by default
2015-09-08 16:49:03 -07:00
Anthony J. Thibault
387d50c217
Added a flag to enable and disable lean.
...
This should help improve our idle and walk animations, because
animation on the "lean" joint was being lost, even when we did
not require procedural leaning.
2015-09-08 16:35:06 -07:00
Brad Davis
ec566a63fc
Merge pull request #5736 from ZappoMan/breakdanceToy
...
Breakdance Toy - better positioning on puppet
2015-09-08 16:29:29 -07:00
Howard Stearns
2c856e4b08
Work around animation cache misbehavior wrt threads.
2015-09-08 16:22:06 -07:00
Ryan Huffman
0e1945fd3c
Merge pull request #5743 from birarda/master
...
put DomainServerConnectionToken back in NON_SOURCED
2015-09-08 16:20:18 -07:00
Stephen Birarda
a3feff1bd4
put DomainServerConnectionToken back in NON_SOURCED
2015-09-08 16:19:15 -07:00
