Stephen Birarda
ac66f09157
Merge pull request #2194 from AndrewMeadows/cleanup
...
g++ warnings
2014-03-06 15:49:22 -08:00
ZappoMan
d89cb2bf5e
added penetration support to particle collisions JS callbacks
2014-03-05 15:03:54 -08:00
ZappoMan
c90d4a9514
fix failed lock causing particle collisions to not work
2014-03-04 15:07:30 -08:00
Andrew Meadows
c8149f95a3
fix warning for unused variable (we forgot to use it)
2014-03-04 11:06:23 -08:00
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
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
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
19f218f37c
fix typo
2014-01-31 15:45:31 -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
33edcea5fb
resolve conflicts on merge with upstream master
2014-01-29 12:23:06 -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
4103cc1cde
packet header changes and beginning of conversion to QByteArray
2014-01-28 10:36:08 -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
Andrew Meadows
2f02ee0b31
Moving applyHardCollision to the Particle class. Adding daming and elasticity to CollisionInfo.
2014-01-24 16:29:44 -08:00
Stephen Birarda
d5b4e643c8
resolve conflicts on merge with upstream/master
2014-01-23 18:10:40 -08:00
Andrew Meadows
93482d9d18
Fixing indentation.
2014-01-23 16:41:03 -08:00
Andrew Meadows
afa1134282
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-01-23 16:24:43 -08:00
Andrew Meadows
631c1d2c1b
Merge branch 'master' of ssh://github.com/highfidelity/hifi into zero-length-penetrations
2014-01-23 16:07:16 -08:00
Andrew Meadows
70c675e9be
Adding comments and minor cleanup after tracking down some NaN's that were showing up in collision sound triggers.
2014-01-23 16:03:52 -08:00
Stephen Birarda
9ab1fc4c2c
resolve conflicts on merge with upstream/master
2014-01-23 14:43:04 -08:00
Stephen Birarda
2e548fb39c
complete migration of Avatar list to AvatarManager
2014-01-23 14:41:11 -08:00
Philip Rosedale
29f33a4e79
Balls rolling on voxels don’t make sound
2014-01-23 13:54:45 -08:00
Andrew Meadows
556526316f
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
...
Conflicts:
interface/src/avatar/Hand.cpp
interface/src/avatar/Hand.h
libraries/particles/src/ParticleCollisionSystem.cpp
2014-01-22 16:21:49 -08:00
Andrew Meadows
e4e495889d
added initial avatar-avatar collision stub
2014-01-22 16:06:49 -08:00
Brad Hefta-Gaub
9231c1d80a
remove ParticleEditHandle, and change ParticleCollisionSystem to use new particle edit API
2014-01-22 15:21:58 -08:00
Andrew Meadows
82f212bc19
close issue #1602 (particles overlap during collisions)
2014-01-22 13:29:43 -08:00
Brad Hefta-Gaub
347933f1a5
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface
...
Conflicts:
libraries/particles/src/Particle.cpp
libraries/particles/src/ParticleCollisionSystem.cpp
libraries/particles/src/ParticleTreeElement.cpp
2014-01-21 02:15:46 -08:00
Andrew Meadows
966cd76e2c
Adding static friction for easier "catching" of particles on paddle hands.
2014-01-20 17:34:24 -08:00
Andrew Meadows
61e1b25e70
ParticleTreeElement::_particles is now a QList<> instead of std::vector<> for faster erase()
2014-01-20 12:43:27 -08:00
Brad Hefta-Gaub
bc2830d0d3
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface
...
Conflicts:
libraries/particles/src/ParticleCollisionSystem.cpp
2014-01-20 10:55:34 -08:00
Andrew Meadows
d0a53f817a
applyHardCollision() now takes a CollisionInfo rather than two vectors ("penetration" and "addedVelocity")
2014-01-17 17:14:57 -08:00
Andrew Meadows
3750aa902a
Cleanup of "soft hand paddle" collision hackery. Still a hack, but more commented and readable.
2014-01-17 16:31:06 -08:00
Brad Hefta-Gaub
1e0f1adb16
added lifetime to particles
2014-01-17 14:59:40 -08:00
Andrew Meadows
f08e639cb2
fixes for avatar paddle-hands, plus some hackery for demo
2014-01-17 11:22:50 -08:00
Stephen Birarda
75152abe2c
fix unused variable warnings and constructor ordering
2014-01-16 09:52:29 -08:00
Andrew Meadows
1266ffd0ca
merge of windows-build
...
Conflicts:
domain-server/src/DomainServer.cpp
interface/src/Application.cpp
interface/src/Menu.cpp
libraries/avatars/src/AvatarData.h
libraries/shared/src/NodeList.h
2014-01-16 09:00:13 -08:00
Andrew Meadows
221f830b5f
Uncommenting particle shift on penetration.
2014-01-15 17:03:07 -08:00
Andrew Meadows
09bce076cc
All avatars now have disk collision proxies at their hands.
2014-01-15 14:06:31 -08:00
Brad Hefta-Gaub
170dbe6e85
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
domain-server/src/DomainServer.cpp
interface/src/Audio.cpp
interface/src/DataServerClient.cpp
interface/src/Oscilloscope.cpp
interface/src/PairingHandler.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Faceshift.cpp
interface/src/devices/SerialInterface.cpp
interface/src/renderer/FBXReader.cpp
libraries/avatars/src/AvatarData.h
libraries/octree-server/src/OctreeServer.cpp
libraries/octree-server/src/OctreeServer.h
libraries/octree/src/ViewFrustum.cpp
libraries/shared/src/Logging.cpp
libraries/shared/src/Node.cpp
libraries/shared/src/Node.h
libraries/shared/src/NodeList.cpp
libraries/shared/src/NodeList.h
libraries/shared/src/PerfStat.cpp
libraries/shared/src/SharedUtil.cpp
libraries/voxels/src/VoxelTree.cpp
voxel-edit/src/main.cpp
2014-01-15 10:20:21 -08:00
Andrew Meadows
af3fae7bbf
Merge upsteam master into current project (experimental hand paddles)
...
Conflicts:
interface/src/avatar/Avatar.cpp
libraries/avatars/src/AvatarData.cpp
2014-01-14 16:39:46 -08:00
Andrew Meadows
b51699bb2f
First pass at particle-hand collisions using hacked hand capsules.
2014-01-14 16:25:31 -08:00
Stephen Birarda
8676ac38f9
foreach spacing and reference repairs
2014-01-14 15:54:09 -08:00
Stephen Birarda
7d1a64ca8c
change NodeList container to QHash with QSharedPointer
2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
550ec8a9c7
changed all fmin to std::min
2014-01-10 21:42:01 -08:00
