Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 04:49:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8887 commits 25 branches 0 tags 1.1 GiB
Commit graph

156 commits

Author SHA1 Message Date
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
93482d9d18 Fixing indentation. 2014-01-23 16:41:03 -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
4ebd5795fc handle merge with nodelist-patches branch 2014-01-23 16:01:52 -08:00
Stephen Birarda
80106979a5 replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -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
ZappoMan
d2bf3a2a5d set default particle lifetime to 10 seconds, make sure lifetime is always honored 2014-01-23 13:46:12 -08:00
ZappoMan
8aa7a915e7 ok, one more shot at fixing particle-server crash 2014-01-23 13:01:07 -08:00
ZappoMan
ccc30d95fb fix crashing particle server bug 2014-01-23 10:32:42 -08:00
Stephen Birarda
f4f828ab72 Merge pull request #1629 from ZappoMan/juridiction_improvements 
Change JurisdictionListener and JurisdictionSender to not require virtual base class
 2014-01-22 16:16:24 -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
Brad Hefta-Gaub
b9ccd28428 removed some debug code 2014-01-22 14:35:38 -08:00
Brad Hefta-Gaub
85363f6603 Merge branch 'master' of git://github.com/worklist/hifi into juridiction_improvements 2014-01-22 14:23:00 -08:00
Brad Hefta-Gaub
8be6fcbccc CR feedback 2014-01-22 14:11:11 -08:00
Brad Hefta-Gaub
34dc1a698e fixed types 2014-01-22 14:09:39 -08:00
Brad Hefta-Gaub
6e9e21051d first cut at move JurisdicionListener and JuridictionSender into non-mulitply derived classes 2014-01-22 14:05:31 -08:00
Brad Hefta-Gaub
c3b681786a make particles and voxels JS APIs all operate on meters not domain units 2014-01-22 11:12:52 -08:00
Brad Hefta-Gaub
fe5a8d9da2 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/shared/src/PacketHeaders.cpp
 2014-01-21 20:21:22 -08:00
Brad Hefta-Gaub
164e703dec tweaks to JS particle editing api 2014-01-21 20:05:00 -08:00
Brad Hefta-Gaub
eb1e72b838 fix a bug where x was only attribute being copied for vec3s WHT 2014-01-21 16:40:03 -08:00
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
Andrew Meadows
141c20f4ef Fix formatting to abide by compressed K&R style. 2014-01-21 09:26:23 -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
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
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
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
Brad Hefta-Gaub
ab9e01ce7f add ParticleID class 2014-01-20 09:11:47 -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
Brad Hefta-Gaub
a7fd1e4565 first cut at having particle JS api return ParticleID types 2014-01-17 16:50:56 -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
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
Brad Hefta-Gaub
1e0f1adb16 added lifetime to particles 2014-01-17 14:59:40 -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
Brad Hefta-Gaub
43da1edadb more particle work 2014-01-17 11:35:35 -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