Clément Brisset
fafcef9a6c
Merge pull request #5925 from sethalves/fix-obj-materials
...
Fix obj materials
2015-10-01 15:34:15 -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
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
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
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
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
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
Seth Alves
dd0a16df04
don't leave search state if we intersect something that someone else is already grabbing
2015-09-30 14:19:59 -07:00
Brad Hefta-Gaub
9cf49597a6
fix possible crash from null coming from _sentPackets
2015-09-30 14:16:41 -07:00
Seth Alves
b417abc3de
try again on string startswith
2015-09-30 14:16:07 -07:00
Seth Alves
c27766facb
move string startswith to utils.js
2015-09-30 14:07:23 -07:00
Seth Alves
f746a970de
don't grab something if someone else is already grabbing it
2015-09-30 14:03:10 -07:00
Seth Alves
b34ea6ded4
store action lifetime as an expires integer
2015-09-30 13:46:23 -07:00
Seth Alves
06f7f92951
Merge branch 'master' of github.com:highfidelity/hifi into debug-grab
2015-09-30 13:09:47 -07:00
Seth Alves
7c6846c260
add lifetime and tag arguments to actions
2015-09-30 13:09:41 -07:00
Brad Hefta-Gaub
88f0c7017e
Merge pull request #5953 from hyperlogic/tony/avatar-mixer-crash-fix
...
Prevent taking a reference to a QUrl rvalue.
2015-09-30 12:36:45 -07:00
Brad Hefta-Gaub
46e1a298c8
Merge pull request #5951 from huffman/cc-rng-fix
...
Fix infinite recursion error with CC rng
2015-09-30 12:36:35 -07:00
Brad Hefta-Gaub
4480b60321
Merge pull request #5950 from birarda/guard-sph
...
guard for insert/get in SentPacketHistory
2015-09-30 12:33:29 -07:00
Anthony J. Thibault
83c3f65b1f
Prevent taking a reference to a QUrl rvalue.
2015-09-30 11:34:38 -07:00
Ryan Huffman
1e9593029c
Fix infinite recursion error with CC rng
...
On some std::random implementations tryin get a range [low, high) where
high < low will cause infinite recursion.
2015-09-30 11:34:11 -07:00
James Pollack
0865f94106
magic numbers
2015-09-30 11:31:33 -07:00
