Seth Alves
5b970e6b1a
try to fix double-distance-grabbing lockout
2015-10-02 11:43:19 -07:00
Seth Alves
bb5abeeabb
Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes
2015-10-02 10:57:56 -07:00
Howard Stearns
639be1eef6
Merge pull request #5978 from AndrewMeadows/cleanup-sixense-calibration
...
improved sixense/hydra calibration
2015-10-02 10:50:05 -07:00
Andrew Meadows
e9c71f3867
cleanup comments
2015-10-02 10:02:12 -07:00
Andrew Meadows
50b2c8ae37
remove warnings in linux
2015-10-02 09:39:34 -07:00
Andrew Meadows
940b8eb529
improve some variable names
2015-10-02 09:39:13 -07:00
Andrew Meadows
98fe06be57
cleanup sixense/hydra calibration
2015-10-02 09:30:18 -07:00
Seth Alves
9f27e5ff1f
back out a couple other unneeded changes
2015-10-01 18:21:53 -07:00
Seth Alves
40c5103d2f
back out change where actino data caches were split into in/out
2015-10-01 17:15:20 -07:00
Brad Hefta-Gaub
454a86d7ff
Merge pull request #5934 from imgntn/hand_grab
...
[Scripts] Prevent mouse grab from moving 'ungrabbable' objects
2015-10-01 17:03:44 -07:00
Seth Alves
e90b156b7b
avoid: add an action, immediately receive an update to that entities action, delete the just-added action because it wasn't in the packet
2015-10-01 17:02:02 -07:00
Howard Stearns
53e7d5fd7c
Merge pull request #5975 from AndrewMeadows/cleanup-legacy-constraints
...
remove cruft relating to old verlet avatar skeleton simulation
2015-10-01 16:48:33 -07:00
Seth Alves
f2ebba9863
separate out the inbound and outbound caches of serialized action data
2015-10-01 16:16:23 -07:00
Andrew Meadows
8bde78a4e8
Merge pull request #5954 from ctrlaltdavid/particle-interpolation
...
Improve particle property interpolation
2015-10-01 16:13:18 -07:00
David Rowe
e56d2d9b43
Add asserts
2015-10-01 15:48:37 -07:00
Clément Brisset
fafcef9a6c
Merge pull request #5925 from sethalves/fix-obj-materials
...
Fix obj materials
2015-10-01 15:34:15 -07:00
James Pollack
dfab1fc685
Fix merge conflicts and lint the conflict code
2015-10-01 15:32:22 -07:00
Seth Alves
716ebf487f
Merge pull request #5952 from imgntn/ping_pong_gun
...
[Scripts] Ping Pong Gun
2015-10-01 15:06:48 -07:00
James B. Pollack
4a7e3c66bd
Update createPingPongGun.js
...
use relative paths
2015-10-01 15:05:25 -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
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
Andrew Meadows
09ac01a5e7
remove cruft from old verlet avatar simulation
2015-10-01 13:44:50 -07:00
Atlante45
b37bf2b1b6
Remove extra debug
2015-10-01 13:18:22 -07:00
James Pollack
861aa91572
shoot out of the right end of the gun
2015-10-01 12:27:45 -07:00
Atlante45
d0bec38603
Fix currentAPI.js
2015-10-01 11:30:50 -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
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
Stephen Birarda
5da5bd47af
add a missing rename for socket Q_ASSERT_X
2015-09-30 21:45:22 -04: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
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
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
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
