Stephen Birarda
a286f4e7d0
Merge pull request #5772 from Atlante45/protocol
...
Asset server node JSON stats
2015-09-11 09:35:39 -07:00
Ryan Huffman
9ab603e9a5
Merge pull request #5773 from birarda/master
...
fail asset request if hash does not match
2015-09-11 09:09:56 -07:00
Brad Davis
2f679a3526
Merge pull request #5779 from ZappoMan/entityScriptCrashes
...
Make sure all entity script callbacks happen on the Entities script engine thread
2015-09-11 08:34:08 -07:00
Atlante45
449d6a04d8
CR
2015-09-11 14:21:56 +02:00
Atlante45
8c1fb67825
Lock nodeHash mutex for node lookup
2015-09-11 14:21:55 +02:00
Atlante45
0037a1f4a7
Win build fix
2015-09-11 14:21:55 +02:00
Atlante45
15f7745bcc
JSON stats reliable and ordered
2015-09-11 14:21:54 +02:00
Atlante45
08e0a8d705
AssetServer JSON stats
2015-09-11 14:21:53 +02:00
Atlante45
5808658958
Make NodeJSONStats reliable
2015-09-11 14:21:53 +02:00
Brad Hefta-Gaub
92a5a999c6
quiet some debug
2015-09-10 19:52:44 -07:00
Brad Hefta-Gaub
ee30fe4a56
quiet some debug
2015-09-10 19:48:41 -07:00
Howard Stearns
0870c5ed87
Merge pull request #5768 from hyperlogic/tony/ik-and-controllers
...
AnimInverseKinematics and AnimController node
2015-09-10 15:38:53 -07:00
Stephen Birarda
973fd80c1d
fail asset request if hash does not match
2015-09-10 15:24:37 -07:00
Seth Alves
a6a61d7e2f
Merge pull request #5770 from birarda/master
...
repair to packing of octree query from headless viewer
2015-09-10 14:53:27 -07:00
Stephen Birarda
f58804a30e
repair to packing of query data from headless viewer
2015-09-10 14:35:44 -07:00
Brad Hefta-Gaub
8eacdbf1c4
first cut at making sure entity scripts are called on the entities script engine thread
2015-09-10 13:02:02 -07:00
Brad Hefta-Gaub
5a4a75f4cc
Merge pull request #5767 from jherico/lisa
...
Eliminate excessive debug logging from procedural setup
2015-09-10 12:25:41 -07:00
Anthony J. Thibault
9a9838fd0d
Clean up of AnimNodeLoader after merge from master.
2015-09-10 11:47:41 -07:00
Anthony J. Thibault
663e37da66
Merge branch 'master' into tony/ik-and-controllers
2015-09-10 11:37:47 -07:00
Anthony Thibault
e8ede3ad00
Merge pull request #5731 from ChristophHaag/master
...
build fixes
2015-09-10 11:36:45 -07:00
Anthony J. Thibault
3149baeefc
Merge branch 'master' into tony/ik-and-controllers
2015-09-10 11:04:31 -07:00
Brad Davis
48bd54f81b
Eliminate excessive debug logging from procedural setup
2015-09-10 10:57:37 -07:00
Brad Hefta-Gaub
f45e182d33
fix CR feedback, add examples
2015-09-10 09:06:56 -07:00
Anthony J. Thibault
09b2d8e4a4
Seed AnimGraph with hand controller position and orientation.
2015-09-09 18:16:57 -07:00
Brad Hefta-Gaub
ede0a39b5b
prevent Script.include() from including the same file multiple times
2015-09-09 17:54:09 -07:00
Brad Hefta-Gaub
626fcb867b
CR feedback
2015-09-09 17:27:39 -07:00
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
Anthony J. Thibault
ad49d0dd59
AnimInverseKinematics: update _maxTargetIndex correctly.
2015-09-09 16:09:38 -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
Anthony J. Thibault
756eb54a0a
AnimNodeLoader support for InverseKinematics node.
2015-09-09 15:28:21 -07:00
Stephen Birarda
f06e4eaae9
fix suppression of packet from unknown node
2015-09-09 15:20:35 -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
Anthony J. Thibault
c1d7287652
AnimController node now takes absolute rotation vars, instead of relative.
2015-09-09 12:24:32 -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
73a5714d66
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-09 10:37:11 -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
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
Anthony J. Thibault
39aef6edc9
AnimController fix for crash if underPoses vector was empty.
2015-09-08 21:42:42 -07:00
Anthony J. Thibault
75ecf0020d
WIP commit, added AnimController node.
2015-09-08 20:34:21 -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
