Commit graph

32386 commits

Author SHA1 Message Date
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
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
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
Stephen Birarda
82ac0b1a27 use a mutable mutex to keep const-ness 2015-09-30 14:23:18 -04:00
Stephen Birarda
f7e7b07441 fix constness of SentPacketHistory in OEPS 2015-09-30 14:15:22 -04:00
Stephen Birarda
cc6b0adb7d guard insert/get in SentPacketHistory 2015-09-30 14:15:04 -04:00
Brad Hefta-Gaub
1f1eb00c63 Merge pull request #5949 from sethalves/debug-grab
improve actionInspector.js
2015-09-30 11:01:09 -07:00
Seth Alves
ba317a0511 Merge branch 'debug-grab' of github.com:sethalves/hifi into debug-grab 2015-09-30 10:58:05 -07:00
Seth Alves
898e3917e3 improve actionInspector.js 2015-09-30 10:57:52 -07:00
Brad Hefta-Gaub
94b0e36f0e Merge pull request #5948 from sethalves/debug-grab
script to display entity-action details in an overlay
2015-09-30 10:43:05 -07:00
Seth Alves
96d0df49e4 script to display entity-action details in an overlay 2015-09-30 10:41:39 -07:00
Brad Davis
9453e5cb1b Merge pull request #5947 from ZappoMan/hideHandCursors
only show hand cursors when menu is enabled
2015-09-30 09:43:40 -07:00
Brad Hefta-Gaub
76825c2be7 only show hand cursors when menu is enabled 2015-09-30 09:06:45 -07:00
Leonardo Murillo
054a3728de Merge pull request #5945 from kencooke/master
Create symbol files on Windows release builds
2015-09-30 09:46:16 -06:00
Ken Cooke
de8848f7bc Fix to only pass --release to windeployqt on release builds 2015-09-30 08:11:16 -07:00
Ken Cooke
4dc2c9a58f Create symbol files on Windows release builds. Added --release to windeployqt.exe, otherwise it gets confused and copies debug DLLs instead of release. 2015-09-29 18:42:52 -07:00
Ryan Huffman
b4ca03ac3f Merge pull request #5940 from ericrius1/polyLineFix
Made polyline painting experience smoother- no more flickering
2015-09-29 18:22:01 -07:00
ericrius1
1760720b2b added check for normals and vertices 2015-09-29 17:42:20 -07:00
ericrius1
5ce3b13a4c Fixed spacing issues 2015-09-29 17:31:02 -07:00
ericrius1
5c6f8198f3 Merge remote-tracking branch 'origin/polyLineFix' into polyLineFix
Conflicts:
	libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
2015-09-29 16:39:21 -07:00
ericrius1
d1b016b483 untabbified lines 2015-09-29 16:38:21 -07:00