Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 10:38:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8581 commits 75 branches 59 tags 1.2 GiB
Commit graph

2193 commits

Author SHA1 Message Date
Brad Hefta-Gaub
90c841ff01 add findClosestParticle() to JS interface 2014-01-21 14:29:20 -08:00
Brad Hefta-Gaub
278ca02595 remove debug code 2014-01-21 14:06:55 -08:00
Brad Hefta-Gaub
97b0ed2cc5 implemented support for PACKET_TYPE_PARTICLE_ERASE 2014-01-21 13:24:35 -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
Brad Hefta-Gaub
cd0e8e742c particle edit checkpoint 2014-01-21 02:12:31 -08:00
Brad Hefta-Gaub
3bcd02f8e3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/shared/src/PacketHeaders.cpp
 2014-01-20 20:25:52 -08:00
Andrew Meadows
b0edc7ee6f Merge branch 'master' of ssh://github.com/highfidelity/hifi into paddle-fixes-2 2014-01-20 17:39:41 -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
516a590e4f Modifying how the "particle is stopped" logic reads with minimal modification to how it works. 2014-01-20 17:33:09 -08:00
Brad Hefta-Gaub
d831f9df5e first cut at using partial property info in particle edits 2014-01-20 16:34:45 -08:00
Andrzej Kapolka
804ce83fa6 Get the base position/orientation directly from the avatar to prevent 
jerkiness when flying with the Hydra.  Also, restore arm lengths when the
Hydra becomes inactive.
 2014-01-20 13:44:41 -08:00
Andrew Meadows
1ed57e044a Fixing measure of "old" particles while simplifying the math (faster!). 2014-01-20 13:40:15 -08:00
Andrew Meadows
1eb2f19320 Removing one more usecTimestampNow() call in Particle::update() 2014-01-20 13:34:08 -08:00
Andrew Meadows
79e4b6d691 Removing per-particle calls to usecTimestampNow() which can add up when simulating a lot of particles. 2014-01-20 13:27:19 -08:00
Brad Hefta-Gaub
b4b3720fcf move creatorTokenID management into Particle static members 2014-01-20 12:56:35 -08:00
Andrzej Kapolka
81ab68a529 Store hand position relative to body orientation/position. 2014-01-20 12:44:09 -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
Andrzej Kapolka
520f7a78a8 Compile fixes (perhaps just for my version of Qt/GCC). 2014-01-20 11:41:04 -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
Brad Hefta-Gaub
ab9e01ce7f add ParticleID class 2014-01-20 09:11:47 -08:00
Stephen Birarda
fbf4cc59ee Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-17 17:26:08 -08:00
Philip Rosedale
2fe666aa63 Merge pull request #1583 from birarda/nodelist-container 
NodeList container repairs
 2014-01-17 17:23:16 -08:00
Stephen Birarda
cffe9624a6 Merge pull request #1572 from ZappoMan/bugfixes 
Fix issue #1519 and adds feature #1520
 2014-01-17 17:21:30 -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
Stephen Birarda
659ba3c784 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-17 16:52:16 -08:00
Brad Hefta-Gaub
a7fd1e4565 first cut at having particle JS api return ParticleID types 2014-01-17 16:50:56 -08:00
Andrew Meadows
6c6a59b252 Hand now holds a ball a bit forward, which prevents the body from colliding with the ball on throw. 2014-01-17 16:36:50 -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
Stephen Birarda
594165782a repair badly scoped usage of QMutexLocker 2014-01-17 16:20:22 -08:00
Brad Hefta-Gaub
99f9ae9d3a implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash 2014-01-17 16:02:58 -08:00
Stephen Birarda
fad7bde0e1 add mutex locking to NodeHash 2014-01-17 16:02:57 -08:00
Stephen Birarda
9007a15381 comment out the JurisdictionListener's connection for now 2014-01-17 15:27:44 -08:00
Stephen Birarda
b24eca199a use new signal slot syntax in JurisdictionListener 2014-01-17 15:23:58 -08:00
Stephen Birarda
816b324236 switch to explicit lock and unlock in removeSilentNodes 2014-01-17 15:17:10 -08:00
Stephen Birarda
3355b71d6b switch back to returning iterator from killNodeAtHashIterator 2014-01-17 15:13:56 -08:00
Brad Hefta-Gaub
1e0f1adb16 added lifetime to particles 2014-01-17 14:59:40 -08:00
Stephen Birarda
6670ff6ee5 fix linking of webserver for octree-server 2014-01-17 14:27:24 -08:00
Stephen Birarda
5fdf310a45 hook OctreeServer up to embedded-webserver 2014-01-17 14:21:15 -08:00
Brad Hefta-Gaub
d4331db45a Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	examples/gun.js
	libraries/script-engine/src/ScriptEngine.cpp
 2014-01-17 13:29:36 -08:00
Stephen Birarda
ce393fdf27 uppercase the names of the HTTP classes 2014-01-17 11:53:47 -08:00
Stephen Birarda
5625000485 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-17 11:38:42 -08:00
Brad Hefta-Gaub
43da1edadb more particle work 2014-01-17 11:35:35 -08:00
Andrew Meadows
562b29b293 adding back log about mismatching packet type 2014-01-17 11:35:16 -08:00
Stephen Birarda
40cdba203d handle programmatic DS requests except for script creation 2014-01-17 11:29:20 -08:00
Andrew Meadows
48796231ef Merge branch 'master' of ssh://github.com/highfidelity/hifi into paddle-fixes 2014-01-17 11:26:04 -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
bce40a9963 add basic SSI include support to HttpManager 2014-01-17 10:40:49 -08:00
Brad Hefta-Gaub
18ded1d7db added scriptEnding callback 2014-01-17 09:51:14 -08:00
Brad Hefta-Gaub
c404a36439 add script number to menu items so that we can run multiple copies of same script 2014-01-17 09:40:38 -08:00
Stephen Birarda
e68dc1b142 cleaup commenting and style across new HTTP classes 2014-01-17 09:00:34 -08:00