Commit graph

32727 commits

Author SHA1 Message Date
ericrius1
7ee26c5d4a tweaked settings 2015-10-01 14:26:22 -07:00
Anthony J. Thibault
8bfd38ce7c FBXReader: When the animation has no animation curve use the joint's default position. 2015-10-01 14:15:02 -07:00
Andrew Meadows
09ac01a5e7 remove cruft from old verlet avatar simulation 2015-10-01 13:44:50 -07:00
Seth Alves
25cbebb66c Merge branch 'transmit-joint-translation' of github.com:sethalves/hifi into transmit-joint-translation 2015-10-01 13:24:04 -07:00
Seth Alves
8453043038 remove unused variable 2015-10-01 13:23:51 -07:00
Atlante45
b37bf2b1b6 Remove extra debug 2015-10-01 13:18:22 -07:00
David Rowe
2fbb436bc5 Fix Reload Content menu item 2015-10-01 12:42:23 -07:00
James Pollack
861aa91572 shoot out of the right end of the gun 2015-10-01 12:27:45 -07:00
James Pollack
d2f4b6e9f0 add / remove controller listener methods 2015-10-01 12:21:56 -07:00
ericrius1
290659b9f6 increased lifetime 2015-10-01 11:46:37 -07:00
James Pollack
a4105eb321 add color pickers 2015-10-01 11:34:02 -07:00
Atlante45
d0bec38603 Fix currentAPI.js 2015-10-01 11:30:50 -07:00
ericrius1
ef5ad9eeb3 Laser stays visible when further away from surfaces 2015-10-01 11:02:22 -07:00
Howard Stearns
335d87134b Squash compiler warning in AnimVariant. 2015-10-01 10:58:31 -07:00
Seth Alves
2700529b33 lower action lifetime 2015-10-01 10:41:43 -07:00
Seth Alves
d4f954a0e2 allow more than one near-grab on an object 2015-10-01 10:25:30 -07:00
ericrius1
191a4740a3 laser color matches paint color 2015-10-01 09:50:58 -07:00
Clément Brisset
966945d08c Merge pull request #5968 from birarda/assert-warning
add missing rename for socket Q_ASSERT_X
2015-10-01 09:24:24 -07:00
Andrew Meadows
381c98c4fa fix for ModelEntityItem::shouldBePhysical() 2015-10-01 08:56:05 -07:00
Andrew Meadows
22b6607760 add polyvox entities to physics engine 2015-10-01 08:56:05 -07:00
Andrew Meadows
ef7e908675 allow dynamic objects to be set collisionless 2015-10-01 08:56:04 -07:00
Ken Cooke
4e29d8382d SSE2 optimization of new resampler. 3.5x faster for all modes. Dither is always enabled. 2015-10-01 03:24:10 -07:00
Stephen Birarda
5da5bd47af add a missing rename for socket Q_ASSERT_X 2015-09-30 21:45:22 -04:00
samcake
0398f9429e fix the coo/texel blender mode for the case when color is black and the stereo issue 2015-09-30 18:39:13 -07:00
samcake
69c4075439 Fix the behavior when skybox color is black and skymap is available 2015-09-30 18:08:01 -07:00
samcake
d3d4775232 THe dataBuffer contining the properties of the skybox is now per instace and not static and shared so it's static from frames to frames 2015-09-30 17:54:20 -07:00
Howard Stearns
73e81d1da5 Merge pull request #5966 from ZappoMan/fixScriptStopAgentCrash
real fix for crashing avatar agents
2015-09-30 17:45:41 -07:00
Brad Hefta-Gaub
c01077a0d7 real fix 2015-09-30 17:30:34 -07:00
samcake
be9b244779 Fix the skybox color issue with background rendering when no texture is there 2015-09-30 17:21:52 -07:00
ericrius1
2899962d43 can now cycle colors with 4 and 2 buttons on hydra 2015-09-30 17:14:17 -07:00
Brad Hefta-Gaub
066e25bb4a Merge pull request #5965 from hyperlogic/tony/avatar-lean-bug-fixes
Bug fix for deriveBodyFromHMDSensor calculations
2015-09-30 16:54:59 -07:00
ericrius1
3592b78b2b less points per line 2015-09-30 16:35:43 -07:00
Anthony J. Thibault
d993d39718 Bug fix for deriveBodyFromHMDSensor calculations
The calculation that determined where the body position relative to the HMD
was incorrect, one of the components was in the wrong coordinate frame.

Now use the skeleton's bind pose to compute the proper avatar offsets for the eyes, neck and hips.
Use these offsets to calculate where the hips should be given a specific hmd position and orientation.

Also, added a bug fix for Rig, which would cause a -1 index deference when an avatar was missing
certain named joints, such as, "LeftEye", "Neck" and "Head".
2015-09-30 16:28:33 -07:00
Ryan Huffman
23b057cbb2 Merge pull request #5961 from ZappoMan/fixScriptStopAgentCrash
possible fix for crashing agents acting like avatars
2015-09-30 16:24:41 -07:00
ericrius1
e516281da8 Added closePaint script and removed no longer used spray paint scripts 2015-09-30 16:15:52 -07:00
Brad Hefta-Gaub
84b515827e Merge pull request #5963 from sethalves/debug-grab
adjust grab script
2015-09-30 16:13:07 -07:00
James Pollack
c55d627e9b Different model, different sounds, release interval 2015-09-30 16:12:27 -07:00
Seth Alves
91965db5ab increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:07:22 -07:00
Seth Alves
cd2a1542e0 increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:05:16 -07:00
Seth Alves
4e057e5ada increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:03:54 -07:00
Brad Hefta-Gaub
42d9045770 possible fix for crashing agents acting like avatars 2015-09-30 16:02:33 -07:00
samcake
6b86f21491 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-09-30 15:54:39 -07:00
samcake
75e858cd13 Putting together the stencil buffer for opaque vs background and using it for the backgroud render items 2015-09-30 15:54:03 -07:00
Ryan Huffman
2dc0d68f0f Merge pull request #5960 from ZappoMan/fixScriptStopAgentCrash
fix possible crash in agent
2015-09-30 15:49:06 -07:00
Brad Hefta-Gaub
34dc8bdbcb fix possible crash in agent 2015-09-30 15:34:35 -07:00
Brad Hefta-Gaub
497cb89abd Merge pull request #5959 from huffman/fix-octree-inbound
Fix OctreeInboundPacketProcessor std_list crash
2015-09-30 15:16:38 -07:00
Ryan Huffman
b7cfc07748 Merge pull request #5957 from ZappoMan/fixSentPacketHistoryCrash
fix possible crash from null coming from _sentPackets
2015-09-30 15:12:09 -07:00
Brad Hefta-Gaub
5f7442f78d Merge pull request #5955 from sethalves/debug-grab
fix grabbing
2015-09-30 15:09:20 -07:00
Ryan Huffman
0063eee4a0 Fix issue with nackPacketList being accessed after being moved 2015-09-30 15:02:45 -07:00
James Pollack
3cdb4e7186 importing 2015-09-30 14:23:11 -07:00