Commit graph

208 commits

Author SHA1 Message Date
Andrew Meadows
335141049c Cleaning up collision check API's and re-enabling collisions with particles. 2014-02-14 16:33:19 -08:00
Andrew Meadows
be1aaee359 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 09:05:08 -08:00
Andrew Meadows
7a8186f1da Adding ModelCollisionInfo struct to get more info about collisions against avatars.
Had to disable some collisions.  Will go back and make them work again soon.
2014-02-07 10:48:30 -08:00
Stephen Birarda
c1132726bf use SharedNodePointer in place of Node where appropriate 2014-02-06 14:58:03 -08:00
Andrew Meadows
082b7cf1a9 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
2014-02-06 14:37:19 -08:00
ZappoMan
76bc4564ad push to force rebuild 2014-02-05 10:24:00 -08:00
ZappoMan
53e7cd7797 fix particle init 2014-02-05 10:16:43 -08:00
ZappoMan
a35e5eeb92 move modelScale before translation and rotation since that seems to fix the corruption 2014-02-04 20:20:06 -08:00
Andrew Meadows
466a43c77f Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-03 10:47:00 -08:00
ZappoMan
289be04f0f use tryLock in some cases where we don't want to block and pass already locked to the findParticleByID() in scripting interface 2014-01-31 17:12:50 -08:00
ZappoMan
5b825ecd5b fix isKnownID 2014-01-31 15:46:19 -08:00
ZappoMan
19f218f37c fix typo 2014-01-31 15:45:31 -08:00
ZappoMan
9798538ea5 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting_work
Conflicts:
	libraries/particles/src/Particle.cpp
	libraries/particles/src/ParticlesScriptingInterface.cpp
2014-01-31 14:10:45 -08:00
AndrewMeadows
bed63513a9 Merge pull request #1745 from ZappoMan/scripting_work
support for global collision callbacks in JS
2014-01-31 10:42:44 -08:00
Stephen Birarda
dc70c74733 fix a double push in added particle response 2014-01-31 09:30:26 -08:00
ZappoMan
3b17550d92 make sure to flush edit queue on script shutdown 2014-01-30 16:36:26 -08:00
Andrew Meadows
f3f1539111 Splitting avatar collision check in two: vs hands and vs skeleton. 2014-01-30 09:28:21 -08:00
ZappoMan
ed0a2a5a18 Merge branch 'master' of https://github.com/worklist/hifi into scripting_work
Conflicts:
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
	libraries/voxels/src/VoxelEditPacketSender.cpp
2014-01-29 19:49:36 -08:00
ZappoMan
08b06cc59c support for global collision callbacks in JS 2014-01-29 17:52:17 -08:00
Andrew Meadows
f093a571c5 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/particles/src/ParticleCollisionSystem.cpp
	libraries/shared/src/CollisionInfo.h
2014-01-29 14:12:22 -08:00
Stephen Birarda
7d8b7a79ac fix Particle update signature 2014-01-29 12:30:20 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
ZappoMan
9d87d58723 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting
Conflicts:
	libraries/particles/src/ParticlesScriptingInterface.cpp
2014-01-28 20:36:35 -08:00
ZappoMan
305e69def6 really get controller key, mouse, etc scripting working 2014-01-28 19:47:45 -08:00
Andrew Meadows
e13bc71f39 Adding avatar info back into ParticleCollisionSystem ctor arguments. 2014-01-28 14:43:36 -08:00
Andrew Meadows
167acb8873 Adding avatars back into ParticleCollisionSystem.
Had to add Application::_myAvatar to the AvatarManager list so that
particles would properly collide.
2014-01-28 14:16:34 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Stephen Birarda
2aaa9ce3f6 resolve conflicts on merge with upstream master 2014-01-28 12:30:43 -08:00
ZappoMan
427abd4509 add model properties to particles 2014-01-28 11:18:37 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
ZappoMan
568d5bc05d first cut at particle meshes 2014-01-28 09:26:47 -08:00
Andrew Meadows
2b5675b077 Fix issue #1684 : particles collide against avatars again.
This a quick and dirty fix to resurrect particle-avatar collisions.
We rebuild and pass a list of AvatarData* to the
ParticleCollisionManager every call to update().
2014-01-27 18:01:53 -08:00
ZappoMan
5e4813ab11 more work on allowing for local particle trees 2014-01-27 13:50:05 -08:00
ZappoMan
62b7e6e58d implement local edits in ParticleScriptingInterface 2014-01-27 09:00:34 -08:00
Andrew Meadows
31a2e467f4 more efficient ParticleTree::getParticles() and adding ParticleTree::getParticlesForUpdate() 2014-01-26 16:14:11 -08:00
Andrew Meadows
daf11692d8 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 2014-01-26 15:19:52 -08:00
AndrewMeadows
d19cb6da36 Merge pull request #1694 from ZappoMan/dont_edit_bad_particles
New particles JS features
2014-01-24 17:23:30 -08:00
Andrew Meadows
2f02ee0b31 Moving applyHardCollision to the Particle class. Adding daming and elasticity to CollisionInfo. 2014-01-24 16:29:44 -08:00
ZappoMan
67ef3282cb handle preventing edits to non-existant particles 2014-01-24 15:30:40 -08:00
Andrew Meadows
5cc2b029cf Adding ParticleTree::findParticles(box, QVector<Particle*>) method 2014-01-24 14:01:34 -08:00
Andrew Meadows
998b772be4 Adding ParticleTreeElement::findParticles(box, QVector<Particles*>) 2014-01-24 14:01:03 -08:00
Andrew Meadows
f6a49c96a7 Adding ParticleTreeElement::findParticles(box, QVector<Particles*>) 2014-01-24 13:59:35 -08:00
ZappoMan
0b871c80c3 added Particles.getParticleProperties() to JS 2014-01-24 12:56:36 -08:00
ZappoMan
bcaafb25f0 added findParticles() to JS api 2014-01-24 12:36:06 -08:00
ZappoMan
f02bc95908 clear particles when switching domains 2014-01-24 11:07:27 -08:00
Stephen Birarda
d5b4e643c8 resolve conflicts on merge with upstream/master 2014-01-23 18:10:40 -08:00
Stephen Birarda
777e375761 Merge pull request #1670 from AndrewMeadows/zero-length-penetrations
Zero length penetrations
2014-01-23 18:09:41 -08:00
Andrew Meadows
c33a437393 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-01-23 16:44:41 -08:00
Andrew Meadows
93482d9d18 Fixing indentation. 2014-01-23 16:41:03 -08:00