Brad Hefta-Gaub
f710afbfd1
CR feedback
2015-09-09 17:26:01 -07:00
Brad Hefta-Gaub
d62945c6bf
fix degenerative url scheme case
2015-09-09 17:13:16 -07:00
Ryan Huffman
08ce09a89b
Merge pull request #5758 from birarda/master
...
fix for supression of packet from unknown nodes
2015-09-09 16:16:39 -07:00
Andrew Meadows
155d9e422a
Merge pull request #5587 from howard-stearns/decouple-avatar-updates
...
Decouple Avatar Update
2015-09-09 15:36:19 -07:00
Stephen Birarda
f06e4eaae9
fix suppression of packet from unknown node
2015-09-09 15:20:35 -07:00
Brad Hefta-Gaub
0023016447
Merge pull request #5757 from ZappoMan/breakdanceToy
...
added some debugging to breakdance toy
2015-09-09 14:56:08 -07:00
Brad Hefta-Gaub
62bf6c7c6f
added some debugging to breakdance toy
2015-09-09 14:55:39 -07:00
Brad Hefta-Gaub
ec93fc1b05
added some debugging to breakdance toy
2015-09-09 14:24:52 -07:00
Ryan Huffman
da5bdd5641
Merge pull request #5752 from birarda/master
...
make all AssetClient packets reliable
2015-09-09 12:50:47 -07:00
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
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
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
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
Brad Davis
75a05ff15d
Reduce logging spam in omniTools/magBalls
2015-09-08 20:56:54 -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
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
Eric Levin
e9ea42f9ad
Merge pull request #5740 from ZappoMan/boombox
...
add a boom box entity script
2015-09-08 16:16:41 -07:00
ericrius1
717cbf3d5b
handControllerGrab.js is active by default
2015-09-08 16:13:17 -07:00
Brad Hefta-Gaub
ca6c413221
tweak THE_SONG
2015-09-08 16:02:10 -07:00
Brad Hefta-Gaub
8c4d7b98fd
fix header comment
2015-09-08 16:01:07 -07:00
Brad Hefta-Gaub
fe90af0e07
Merge pull request #5737 from ericrius1/grabChanges
...
hydraGrab is now called handControllerGrab.js now grabs entities based on how they want to be grabbed (th…
2015-09-08 15:59:28 -07:00
Seth Alves
ab82d12f96
Merge pull request #5694 from birarda/protocol
...
Asset Transfer Protocol and UDT in networking layer
2015-09-08 15:57:41 -07:00
ericrius1
572b120bf0
removed print statements
2015-09-08 15:57:31 -07:00
Stephen Birarda
c670c9a0d5
fix for AnimNodeLoader use of Resource loaded
2015-09-08 15:31:37 -07:00
Howard Stearns
26f63a44fc
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 15:30:22 -07:00
Stephen Birarda
e1a31f4dbe
put back TextureCache headers
2015-09-08 15:23:26 -07:00
