Commit graph

31678 commits

Author SHA1 Message Date
Seth Alves
e650e40388 try harder to have line rezzed when it's needed. don't ignore entities that are too close when doing line intersection 2015-09-15 11:32:56 -07:00
Seth Alves
7b5d6c20e9 double change in hand rotation before applying it to the object 2015-09-15 11:21:13 -07:00
Seth Alves
99b0046fc7 various adjustments 2015-09-15 10:43:17 -07:00
Seth Alves
d874c9b382 snip out tractor beam 2015-09-14 14:20:49 -07:00
Seth Alves
f4aad05621 reduce radius of hand-intersects-object test. fix lifetime of laser line 2015-09-14 14:07:16 -07:00
Stephen Birarda
8308dbf4a3 Merge pull request #5787 from huffman/cleanup-asset-requests-on-node-kill
DO NOT MERGE: Cleanup asset requests on node kill
2015-09-14 13:08:01 -07:00
samcake
0b3e78abed Merge pull request #5796 from jherico/marge
Fixing differing highlights between left and right eyes in stereo modes
2015-09-14 12:28:18 -07:00
Ryan Huffman
29d26a1f9a Fix namespace issues std:: template specialization 2015-09-14 12:17:36 -07:00
Ryan Huffman
42d21e4dc1 Update AssetClient's node killed handling to check if node is asset server first 2015-09-14 11:56:47 -07:00
Ryan Huffman
e87fcb78cd Add proper cleanup of AssetRequest in AssetResourceRequest 2015-09-14 11:34:51 -07:00
Brad Davis
1bb15e28d6 Fixing differing highlights between left and right eyes in stereo modes 2015-09-14 11:24:28 -07:00
Ryan Huffman
b8c1c279c6 Update AssetRequest::State enum to use camelcase 2015-09-14 11:22:55 -07:00
Ryan Huffman
6468046c68 Update AssetClient callbacks to return whether a response was received 2015-09-14 11:22:34 -07:00
Ryan Huffman
71456eee5e Add UploadDialog error for NetworkError 2015-09-14 11:19:47 -07:00
Stephen Birarda
d189fb932f Merge pull request #5785 from Atlante45/protocol
Update AssetServer stats with units
2015-09-14 11:18:23 -07:00
Atlante45
1f46b90f9c Remove constexpr for windows 2015-09-14 18:39:31 +02:00
Brad Hefta-Gaub
1f8599de13 Merge pull request #5790 from sethalves/quiet-compiler
quiet compiler
2015-09-14 09:24:08 -07:00
Seth Alves
414d9162ef change type of MAX_LOG_SIZE rather than cast its only use 2015-09-14 08:47:14 -07:00
Seth Alves
4d6d882f52 Merge pull request #5791 from jherico/homer
Fix procedural vec3 uniforms
2015-09-12 13:40:07 -07:00
Brad Davis
61fb9924bf Fix procedural vec3 uniforms 2015-09-12 13:19:33 -07:00
Seth Alves
61c9da1d27 minimize diff 2015-09-12 10:43:20 -07:00
Seth Alves
93dc0714f7 quiet compiler 2015-09-12 10:10:53 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Seth Alves
e65ef93663 Merge pull request #5778 from jherico/homer
Fixing some entity race condition crashes
2015-09-11 17:54:53 -07:00
Howard Stearns
4ffe2d0747 Merge pull request #5786 from AndrewMeadows/ik-with-constraints
inverse kinematics works with rotation constraints
2015-09-11 17:34:50 -07:00
Ryan Huffman
2bb633d370 Merge pull request #5788 from birarda/master
make node timeout less brittle (by giving it more time)
2015-09-11 16:59:04 -07:00
Andrew Meadows
94b0074165 Merge pull request #5765 from ctrlaltdavid/20669-tidy
Move cubic interpolation method to shared library
2015-09-11 16:58:22 -07:00
Andrew Meadows
9c6060160a Merge pull request #5784 from howard-stearns/rationalize-rig-settings
Rationalize rig settings
2015-09-11 16:56:44 -07:00
Brad Davis
2daa5c3bf6 PR comment, fix extra variable decl 2015-09-11 16:54:18 -07:00
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
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