Commit graph

1391 commits

Author SHA1 Message Date
Andrew Meadows
158c7de76e Ragdoll not an Entity. SkeletonModel is a Ragdoll 2014-06-13 12:27:58 -07:00
Andrew Meadows
5bd37acdb8 Changed RagDoll to Ragdoll 2014-06-13 11:55:39 -07:00
Andrew Meadows
417a7def07 SimulationEngine::enforceConstraints() takes args
...for limiting simulation costs
2014-06-13 11:10:32 -07:00
Andrew Meadows
fb7f5707c8 add SimulationEngine, MyAvatar has one. 2014-06-12 18:15:20 -07:00
Andrew Meadows
5be470bcbc add PhysicalEntity class
Model and RagDoll derive from PhysicalEntity
Shape gets back pointer to its Entity (shape sharing not possible)
CollisionInfo gets backpointers the shapes involved
2014-06-12 13:13:00 -07:00
Andrew Meadows
5f5ffff23c merge 2014-06-10 15:25:25 -07:00
Andrew Meadows
3c51ce76fc Add simulationID to Model Shape and CollisionInfo 2014-06-10 15:24:17 -07:00
Andrew Meadows
5a76a9b4b1 RagDoll keeps a pointer to list of shapes 2014-06-09 11:04:20 -07:00
Andrew Meadows
90c55ad06c fix some comments 2014-06-06 16:09:21 -07:00
Andrew Meadows
131a2c27b8 move RagDoll to libraries/shared 2014-06-06 15:51:50 -07:00
Andrew Meadows
0addf3bae4 cleaup: remove some unused collision code
remove CollisionInfo::_type
remove unused Avatar collision response stuff
comment out some code that works but will probably be replaced
2014-06-06 14:36:05 -07:00
Andrew Meadows
ca77eb9d1e cleanup of avatar collisions, prep for more ragdoll collisions
removal of paddle hands
particles use general sphere collision path against avatars
temp removal of skeleton self collision
2014-06-06 10:51:22 -07:00
Andrew Meadows
e8724b02f3 add CapsuleShape::setEndPoints() 2014-06-06 08:50:57 -07:00
Philip Rosedale
3cc67f5229 Merge pull request #2984 from ZappoMan/octreeWireformatImprovements
Octree wireformat improvements checkpoint
2014-06-04 21:58:08 -07:00
ZappoMan
c7a502e2c9 removed empty file 2014-06-04 15:18:11 -07:00
ZappoMan
2066dbcec7 cleanup 2014-06-04 15:16:51 -07:00
wangyix
5251057ed6 MovingPercentile moved else to same line as } 2014-06-04 15:13:16 -07:00
ZappoMan
10f7eae7a0 implemented decode 2014-06-04 14:56:13 -07:00
wangyix
0da6374e19 MovingPercentile .size() consistency 2014-06-04 14:31:58 -07:00
wangyix
e2d3fcc518 changed MovingPercentile to use QList 2014-06-04 14:24:23 -07:00
ZappoMan
78d3f1454c more operators 2014-06-04 14:19:35 -07:00
ZappoMan
2b85145325 added test suite for PropertyFlags, latest work on PropertyFlags 2014-06-04 11:41:09 -07:00
wangyix
25e2f28b02 more cleanup 2014-06-04 11:30:35 -07:00
wangyix
b452d08495 cleaned up debug statements
also reorganized MovingPercentile a little bit
2014-06-04 11:20:29 -07:00
wangyix
12ac6105f1 changed MovingMedian to MovingPercentile 2014-06-04 10:59:32 -07:00
ZappoMan
b48c70a7f7 first cut at PropertyFlags template class 2014-06-04 10:23:50 -07:00
wangyix
c851edd0ef added MovingMedian class, but not using it
added packet type/time data collection to DatagramProcessor and
post-execution prints of that info.
2014-06-03 16:18:40 -07:00
ZappoMan
e6966c2155 add improved detailed rendering and FPS debugging stats 2014-05-29 12:12:23 -07:00
barnold1953
5013c8c2fa Fixed script editor crash when script calls Script.stop(). Also made the
processEraseMessage wait until it can lock to ensure particles are
deleted.
2014-05-22 12:45:36 -07:00
Stephen Birarda
981f9df6b3 add option to pass data server username and password to DS 2014-05-21 09:53:09 -07:00
Stephen Birarda
8e9defad3e send an updated address to data-server with domain (when changed) 2014-05-15 12:18:24 -07:00
Brad Hefta-Gaub
e088c3d115 Merge pull request #2834 from AndrewMeadows/thermonuclear
remove leap fingers
2014-05-13 08:04:40 -07:00
Andrew Meadows
49dedb72c9 remove FingerData class and related cleanup 2014-05-12 11:09:12 -07:00
Andrzej Kapolka
363f545f7c After uploading, refresh the uploaded files so that they are immediately
redownloaded.
2014-05-09 17:50:08 -07:00
Andrew Meadows
8ec493e85b fix bad penetration depth for interior of cube 2014-05-07 12:39:20 -07:00
Andrew Meadows
9fc1c765d3 overhaul of CollisionInfo
store Cube info for sphereAACube collisions
2014-05-07 11:40:00 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia
Conflicts:
	interface/src/avatar/MyAvatar.h
2014-05-05 13:54:25 -07:00
Andrew Meadows
ddc9408a55 commit implementation of deleteLastCollision() 2014-05-05 12:32:23 -07:00
Andrew Meadows
f6b2b43376 forget collision for this failure case 2014-05-05 12:31:36 -07:00
Andrew Meadows
d2f858100e add CollisionList::deleteLastCollision() 2014-05-05 12:30:38 -07:00
Andrew Meadows
0cecef6441 fix "nearly but not quite" edge/corner collisions 2014-05-05 10:01:31 -07:00
Andrew Meadows
b097eed1aa fix sphere-cube collisions at edges (really) 2014-05-05 08:47:02 -07:00
Andrzej Kapolka
53a2760905 More attachment bits. 2014-05-04 16:24:23 -07:00
Andrew Meadows
0e3d66caf6 fix incorrect rescale of vec3 2014-05-02 22:27:52 -07:00
Andrew Meadows
c8e56a97cc fix sphere-cube collisions, with tests 2014-05-02 21:47:27 -07:00
Andrew Meadows
9ceda573cc sphere-cube: add the penetration don't subtract it 2014-05-02 10:39:27 -07:00
Andrzej Kapolka
322e12b9de Allow users to clear the head URL and have no separate head model. 2014-05-01 17:55:16 -07:00
Andrew Meadows
4e34d0339d set position in ctor that takes endpoints
and some cleanup
2014-04-29 15:15:53 -07:00
Atlante45
6595b29a4f More bug tracking 2014-04-29 10:55:30 -07:00