Andrew Meadows
1500a36f72
oops forgot to uncomment constraint initialization
2015-09-11 16:49:49 -07:00
Stephen Birarda
6da388f2af
cleanup UDT_CONNECTION_DEBUG, add time for node timeout
2015-09-11 16:38:14 -07:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Howard Stearns
140ecc8e2c
Get rid of implicit int->bool cast.
2015-09-11 16:28:41 -07:00
Andrew Meadows
e85cdad8c7
remove DependencyManager fetch of backpointer
2015-09-11 16:27:50 -07:00
Brad Davis
e458eb7ae9
Merge pull request #5734 from sethalves/octree-shared-pointers
...
octree uses shared pointers
2015-09-11 16:00:04 -07:00
Sam Gateau
cf1f5b8771
Work in progress
2015-09-11 15:25:33 -07:00
Andrew Meadows
d01c5d1ae5
fix crash bug
2015-09-11 15:01:31 -07:00
Ryan Huffman
a5ba86514c
Remove log message
2015-09-11 14:01:08 -07:00
Ryan Huffman
b564ceb76f
Add network error to AssetRequest
2015-09-11 14:01:08 -07:00
Ryan Huffman
42b4c7d423
Update AssetClient to handle disconnections from a node
2015-09-11 14:01:08 -07:00
Ryan Huffman
3ae323cb2e
Move pending requests in AssetClient to include node sent to
2015-09-11 14:01:08 -07:00
Ryan Huffman
4ed3e36181
Update AssetClient::create* methods to not block on invokeMethod
2015-09-11 14:01:08 -07:00
Andrew Meadows
c589f0e58e
fix logic around rendering of hand targets
2015-09-11 13:42:17 -07:00
Atlante45
8ee56b59c9
Update AssetServer stats with units
...
Also removed array for better layout
2015-09-11 22:33:58 +02:00
Andrew Meadows
2ba446d309
fix IK and constriants
2015-09-11 13:22:12 -07:00
Andrew Meadows
b0520acea9
remove warning about out-of-order-init
2015-09-11 13:22:11 -07:00
Andrew Meadows
ebadebbc87
render wireframe sphere for debug finger tip
2015-09-11 13:22:11 -07:00
Andrew Meadows
334fdeefd5
remove old incorrect comment
2015-09-11 13:22:11 -07:00
Andrew Meadows
5296ddade9
remove unused menu item
2015-09-11 13:22:11 -07:00
Andrew Meadows
8d5106b072
improved debug render of hand coordinates
...
also cleaned up includes in Hand.h
2015-09-11 13:22:11 -07:00
Howard Stearns
5314e0c744
Remove unused.
2015-09-11 13:20:56 -07:00
Howard Stearns
841e23e29d
Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings
2015-09-11 12:59:19 -07:00
Howard Stearns
f8f2a067a1
whitespace
2015-09-11 12:59:07 -07:00
Seth Alves
f51f17b267
Merge pull request #5775 from ericrius1/paintCan
...
Paint can
2015-09-11 12:34:44 -07:00
Brad Davis
19806c16a7
Fix debug building
2015-09-11 12:31:32 -07:00
Brad Davis
44ee45a5ca
Merge pull request #5783 from highfidelity/revert-5779-entityScriptCrashes
...
Revert "Make sure all entity script callbacks happen on the Entities …
2015-09-11 12:28:15 -07:00
Brad Davis
fd1cfadc47
Fixing potential access to null object
2015-09-11 12:02:57 -07:00
ericrius1
0a46db60ac
spawning particles on grab and deleting on release, with a lifetime, for better cleanup of particles
2015-09-11 12:01:01 -07:00
Brad Hefta-Gaub
5c6d8da97b
Revert "Make sure all entity script callbacks happen on the Entities script engine thread"
2015-09-11 11:55:36 -07:00
Howard Stearns
02fba12a48
Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings
2015-09-11 11:53:19 -07:00
Howard Stearns
67ce0966d1
Rationalize the rig state setters.
2015-09-11 11:52:20 -07:00
Brad Davis
7fecd3261d
Fixing bad merge
2015-09-11 11:40:57 -07:00
ericrius1
eabdd1f4d9
quick fix for particles hanging around
2015-09-11 11:33:21 -07:00
ericrius1
6e46e3d3b6
cleanup for paintcan
2015-09-11 11:24:53 -07:00
Brad Davis
244795b629
Merge branch 'homer' into temp
...
Conflicts:
interface/src/Application.cpp
2015-09-11 11:21:29 -07:00
Seth Alves
59c0cb4e6a
Merge pull request #5777 from highfidelity/revert-5769-edit-js-adjustment
...
Revert "edit.js adjustment"
2015-09-11 10:59:00 -07:00
Seth Alves
218225e4a5
Merge pull request #5781 from hyperlogic/tony/head-ik
...
Added head target to AnimGraph IK node.
2015-09-11 10:58:53 -07:00
Anthony J. Thibault
8e504e63b0
Removed unused variable, changed glm::vec3(0) to glm::vec3()
2015-09-11 10:43:49 -07:00
Brad Davis
327d698b44
Merge pull request #5780 from ZappoMan/entityScriptCrashes
...
prevent sending signals in the entities script engine
2015-09-11 10:08:05 -07:00
Brad Hefta-Gaub
20a733b9f5
prevent sending signals in the entities script engine
2015-09-11 10:06:06 -07:00
Seth Alves
0e63147be2
Merge pull request #5776 from birarda/ac-pid-zero
...
make sure AC process ID is valid before acting on the process
2015-09-11 10:00:08 -07:00
Anthony J. Thibault
7996a02bd8
Added head target to AnimGraph IK node.
...
* In HMD mode head orientation and position is set.
* When not in HMD only orientation is set, position should
default to the underlying pose position.
2015-09-11 09:48:48 -07:00
Brad Hefta-Gaub
b9d5412aad
prevent sending signals in the entities script engine
2015-09-11 09:48:42 -07:00
ericrius1
1991ba0eba
absolute path for now- just for testing purposes before merge
2015-09-11 09:37:03 -07:00
Stephen Birarda
a286f4e7d0
Merge pull request #5772 from Atlante45/protocol
...
Asset server node JSON stats
2015-09-11 09:35:39 -07:00
Seth Alves
b1c5a04531
respond to code review
2015-09-11 09:29:52 -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
05df84ee67
Remove AS stats namespace/Filter DS
2015-09-11 15:20:01 +02:00
