James Pollack
7bcb4e4ae3
Merge branch 'master' into ericrius1-toybox
2015-10-01 14:59:54 -07:00
James Pollack
97fb189fc0
Merge remote-tracking branch 'upstream/master'
2015-10-01 14:58:18 -07:00
ericrius1
55c6b9d9c4
Added collision sound to blocks
2015-10-01 14:57:03 -07:00
Seth Alves
44e4f4dc63
merge from upstraem
2015-10-01 14:55:56 -07:00
Seth Alves
fa7a5f1a61
formatting, fix a bug
2015-10-01 14:51:33 -07:00
Brad Hefta-Gaub
5e8e15091a
Merge pull request #5970 from sethalves/allow-double-near-grab
...
allow more than one near-grab on an object
2015-10-01 14:47:03 -07:00
Seth Alves
56b50b5fb3
also add action to _previouslyDeletedActions if the local interface deletes the action
2015-10-01 14:45:10 -07:00
ericrius1
5aef7475d6
Sound position updates every frame based on new position of can
2015-10-01 14:42:51 -07:00
Brad Hefta-Gaub
521aaa0998
Merge pull request #5974 from Atlante45/extra_debug
...
Remove extra debug
2015-10-01 14:42:45 -07:00
Brad Hefta-Gaub
a2463cbf68
Merge pull request #5972 from Atlante45/fix_currentAPI
...
Fix currentAPI.js
2015-10-01 14:41:56 -07:00
Brad Hefta-Gaub
afe5075e10
Merge pull request #5971 from howard-stearns/AnimVariant-warning-squash
...
Squash compiler warning in AnimVariant.
2015-10-01 14:41:40 -07:00
Brad Hefta-Gaub
17402c697a
Merge pull request #5935 from imgntn/basketball_hoop
...
[Scripts] Basketball hoop
2015-10-01 14:40:55 -07:00
Seth Alves
d320f5b6f4
remember uuid of deleted actions for 20 seconds and don't re-add them
2015-10-01 14:40:12 -07:00
Brad Hefta-Gaub
f2e65f5a98
Merge pull request #5936 from birarda/tv-es-lockup
...
fix a timer leak, line width in PacketList
2015-10-01 14:39:40 -07:00
Howard Stearns
739545794f
Merge pull request #5944 from AndrewMeadows/ik-repairs-007
...
fix bug: IK attenuates fast underpose animations
2015-10-01 14:27:21 -07:00
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
