Commit graph

333 commits

Author SHA1 Message Date
Andrew Meadows
c6253bb51a AACube vs Sphere and Capsule collision tests
Sphere is unit tested.
Also removed the shape collision query against Octree
2014-08-27 12:09:41 -07:00
Stephen Birarda
9d8818eee5 remove OpenSSL requirement from octree library 2014-08-08 13:18:32 -07:00
Stephen Birarda
a99b19d28a make Qt5 and ZLIB required finds, add OpenSSL to interface 2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d tweak setup_hifi_library to bubble up full path of Qt modules 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
2bb37f2d64 more Qt module dependencies sorted out for libraries 2014-08-08 13:17:53 -07:00
Stephen Birarda
33e5826842 remove animation server, bubble up qt modules 2014-08-08 13:17:52 -07:00
Stephen Birarda
9a50532b1f bubble up sub dependencies to link_hifi_library 2014-08-08 13:17:52 -07:00
Stephen Birarda
ef58453fda turn off verbose octree packet debug 2014-07-30 18:10:11 -07:00
Stephen Birarda
db25cd9d2c call PaymentManager when an OctreeEditPacketSender needs to pay 2014-07-30 18:07:08 -07:00
Stephen Birarda
eba92eb517 have the OctreeEditPacketSender emit a signal when payment is required 2014-07-30 17:21:04 -07:00
Stephen Birarda
04effabe48 Merge branch 'master' into domain-server-auth 2014-07-30 17:14:03 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
Stephen Birarda
ab1be38fd5 reset the cost of the packet back to 0 so it doesn't keep accumulating 2014-07-30 14:02:46 -07:00
Stephen Birarda
7a128e5f77 add satoshi cost to voxel packet debug 2014-07-30 10:14:51 -07:00
Stephen Birarda
66592466ad pipe satoshi cost down to queuePacketToNodes 2014-07-30 10:05:21 -07:00
Stephen Birarda
6a534a6ff1 send along satoshi costs for voxel additions from VoxelEditPacketSender 2014-07-29 17:31:12 -07:00
Stephen Birarda
39e6d7d31b octree packet methods can take a cost 2014-07-29 11:40:07 -07:00
Atlante45
72a31ec8fc Removed magic number to use DEFAULT_NEAR/FAR_CLIP 2014-07-25 10:56:44 -07:00
Atlante45
c5ad856e65 Changed DEFAULT_FAR_CLIP to TREE_SCALE 2014-07-25 10:55:42 -07:00
wangyix
ce0101aa2a fixed octreeEditPacketSender seq numbers errors; untested 2014-07-10 14:53:29 -07:00
wangyix
fd051310da prune missing set before constructing nack packets;
make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use
that value as the default history size
2014-07-01 12:01:51 -07:00
wangyix
f2dfa6b978 fixed warnings 2014-06-30 16:10:58 -07:00
wangyix
0ae58bd7f9 added senderUUID arg to seq stats 2014-06-27 15:39:11 -07:00
wangyix
2ec04fb756 replaced old seqnum tracking code with SequenceNumberStats 2014-06-25 17:20:57 -07:00
Brad Hefta-Gaub
6d77d438ab Merge pull request #3057 from AndrewMeadows/ragdoll
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
2014-06-24 15:47:18 -07:00
Andrew Meadows
c98631f820 merge upstream/master into andrew/ragdoll 2014-06-18 17:23:24 -07:00
wangyix
761a154a93 Merge remote-tracking branch 'upstream/master' 2014-06-18 15:59:45 -07:00
Brad Hefta-Gaub
c7b1b504b4 Merge pull request #3047 from birarda/master
allow a payload to define a zone of unattenuated audio
2014-06-18 15:25:41 -07:00
wangyix
827b28ceda Merge remote-tracking branch 'origin/master'
Conflicts:
	assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
2014-06-18 15:21:19 -07:00
Brad Hefta-Gaub
f2b2784fa9 Merge pull request #3045 from wangyix/edit_nack_pull
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
2014-06-18 15:02:40 -07:00
wangyix
f76b4dc1ab made getMissingSequenceNumbers() inline 2014-06-18 13:39:49 -07:00
wangyix
29723d0ef3 changed octree data nacks to repeatedly nack missing seq nums 2014-06-18 13:36:54 -07:00
Stephen Birarda
5878b4af59 setup listener unattenuated zones for source ring buffers 2014-06-18 12:50:16 -07:00
Clément Brisset
7597191081 Merge pull request #3042 from ZappoMan/editModelFeatures
add support for changing the model URL of a model
2014-06-18 11:52:01 -07:00
Brad Hefta-Gaub
c49ff59725 Merge pull request #3037 from wangyix/edit_nack_pull
Edit nack pull
2014-06-18 11:43:25 -07:00
ZappoMan
26075d9d26 add support for changing the model URL of a model 2014-06-18 11:29:56 -07:00
wangyix
7cef5eeeec replaced UINT16_MAX at 2 other places 2014-06-18 10:27:02 -07:00
wangyix
b63c88f42c removed more spaces 2014-06-18 09:38:39 -07:00
wangyix
8c4e365958 added forgotten i++ in sendNackPackets()
plus minor style fixes
2014-06-18 09:28:42 -07:00
Andrew Meadows
9e839f0980 Shape::getCenter() -> Shape::getTranslation() 2014-06-18 08:55:48 -07:00
Andrew Meadows
b9d4545aef merge upstream/master into andrew/ragdoll
Conflicts:
	libraries/shared/src/Shape.h
	libraries/shared/src/ShapeCollider.h
2014-06-17 17:03:16 -07:00
wangyix
7f4cf3719e added rollover handling to OctreeSceneStats 2014-06-17 16:40:08 -07:00
wangyix
bdbb12f4dc switched edit nacks to non-verified 2014-06-17 14:35:40 -07:00
ZappoMan
4413049302 fixed a bug in inside out ray casting returning the wrong face 2014-06-17 13:05:35 -07:00
ZappoMan
9a3f8508cf add support for inside out ray intersection on AACube and AABox 2014-06-17 12:12:53 -07:00