Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 18:34:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9215 commits 76 branches 59 tags 1.2 GiB
Commit graph

72 commits

Author SHA1 Message Date
ZappoMan
a35e5eeb92 move modelScale before translation and rotation since that seems to fix the corruption 2014-02-04 20:20:06 -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
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
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
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
daf11692d8 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 2014-01-26 15:19:52 -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
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
d2bf3a2a5d set default particle lifetime to 10 seconds, make sure lifetime is always honored 2014-01-23 13:46:12 -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
8be6fcbccc CR feedback 2014-01-22 14:11:11 -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
164e703dec tweaks to JS particle editing api 2014-01-21 20:05:00 -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
d831f9df5e first cut at using partial property info in particle edits 2014-01-20 16:34:45 -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
Brad Hefta-Gaub
ab9e01ce7f add ParticleID class 2014-01-20 09:11:47 -08:00
Brad Hefta-Gaub
a7fd1e4565 first cut at having particle JS api return ParticleID types 2014-01-17 16:50:56 -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
Brad Hefta-Gaub
ac97f129d3 change interface since its confusing windows compiler 2014-01-10 20:49:08 -08:00
Andrew Meadows
c61f071ab7 merge of latest upstream work in preparation for pull request #1500 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-10 17:03:45 -08:00
Andrew Meadows
71e5de8420 Adding Particle::_mass and correct elastic collisions between particles 2014-01-10 11:37:01 -08:00
Brad Hefta-Gaub
0df02618ee use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces 2014-01-04 03:16:47 -08:00
Andrew Meadows
f78b7cda6f Merge pull request 1435 into https://github.com/worklist/hifi 'master' 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-02 13:01:45 -08:00
Andrew Meadows
5843c745cb minor formatting and code standard enforcement to Particle.* 2014-01-02 09:30:14 -08:00
ZappoMan
48b2d7d3fa scripting for particle to voxel collisions 2013-12-31 11:33:43 -08:00
ZappoMan
651d2d0c81 rename voxels and particles scripting interfaces 2013-12-31 09:41:35 -08:00
ZappoMan
5057517b78 pass scriptable particle on collisions 2013-12-30 16:35:58 -08:00
ZappoMan
cd11545613 change to setScript() since it does more than update 2013-12-30 15:55:46 -08:00
ZappoMan
8e6f924c73 add access to Voxels and Particles inside of collision scripts 2013-12-30 15:48:50 -08:00
ZappoMan
f4b28041fa first cut at running scripts on particle collisions 2013-12-30 14:59:00 -08:00
ZappoMan
d71bc248f4 support adjusting particles based on clockSkew 2013-12-19 14:49:58 -08:00
ZappoMan
e2b7e08398 revert back to timestamps, fix a couple other bugs 2013-12-19 09:50:53 -08:00
ZappoMan
d430558ea9 fix expectedBytes() mismatch between edit packets and normal packets 2013-12-18 21:08:34 -08:00
ZappoMan
6e2c0032b5 removed dead code 2013-12-18 19:22:15 -08:00