Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 14:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8579 commits 25 branches 0 tags 1.1 GiB
Commit graph

4652 commits

Author SHA1 Message Date
Brad Hefta-Gaub
03a9253748 remove usage of ParticleEditHandle from application 2014-01-21 14:07:46 -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
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
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
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
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
ZappoMan
17abbc4715 Merge pull request #1586 from PhilipRosedale/master 
Clap script and better bird sounds
 2014-01-20 09:06:28 -08:00
Philip Rosedale
2fe666aa63 Merge pull request #1583 from birarda/nodelist-container 
NodeList container repairs
 2014-01-17 17:23:16 -08:00
Andrzej Kapolka
341f60da76 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-17 17:10:46 -08:00
Philip Rosedale
4547f07739 added fountain script 2014-01-17 17:10:15 -08:00
Andrzej Kapolka
470b83a55b Got the sign backwards. 2014-01-17 17:04:22 -08:00
Andrzej Kapolka
765f98fadc Remove unused variables, change orbit pitch behavior (closes #1582). 2014-01-17 17:00:03 -08:00
Philip Rosedale
08c49bb68f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-17 16:54:48 -08:00
Philip Rosedale
317af4c927 Merge pull request #1585 from AndrewMeadows/paddle-fixes 
Paddle fixes
 2014-01-17 16:50:10 -08:00
Andrew Meadows
0921999c3b Removing menu option for where to hold the ball -- we always hold from the finger tip (approximately). 2014-01-17 16:37:44 -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
aac1764243 Re-enabling particle-avatar collisions. 2014-01-17 16:30:07 -08:00
Stephen Birarda
594165782a repair badly scoped usage of QMutexLocker 2014-01-17 16:20:22 -08:00
Stephen Birarda
99cd6c8ce8 remove two unused variable warnings 2014-01-17 16:04:04 -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
ZappoMan
bb41fe6ddb Merge pull request #1573 from stojce/19484 
Code Review for Job #19484
 2014-01-17 13:25:59 -08:00
stojce
99feb36d19 Merge branch 'master' of https://github.com/worklist/hifi into 19484 2014-01-17 20:57:23 +01:00
Atlante45
08de50f578 Fixed mouseVoxel getting resized all the time when flying over smaller voxel 2014-01-17 20:36:43 +01:00
Philip Rosedale
f677198cc8 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-17 11:28:43 -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
Andrzej Kapolka
7a4353428e Fixed eye rotations. 2014-01-17 11:05:26 -08:00
Andrzej Kapolka
515cc5316c Get rid of code to decay pitch on movement. 2014-01-17 10:54:44 -08:00
stojce
13f223ff12 Merge branch 'master' of https://github.com/worklist/hifi into 19484 2014-01-17 19:46:44 +01:00
Philip Rosedale
0d838d2e73 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-17 08:50:36 -08:00
Andrzej Kapolka
7fcd1ccf29 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-16 17:06:55 -08:00
Andrzej Kapolka
0e7692dfea When the mouse is hidden, just look straight forward. 2014-01-16 16:59:50 -08:00
Andrzej Kapolka
8c6c521b65 Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 16:38:07 -08:00
Andrzej Kapolka
c93e70e3cb Merge pull request #1563 from birarda/master 
have muting also mute local loopback, NodeList tweak
 2014-01-16 16:37:47 -08:00
Andrzej Kapolka
4ed8ffd831 Merge pull request #1562 from ZappoMan/bugfixes 
fix 3d mode switch on/off issue
 2014-01-16 16:37:03 -08:00
Andrzej Kapolka
e7a3beed78 Removed a couple more resources. 2014-01-16 15:17:38 -08:00
Andrzej Kapolka
1b891cb326 Removed unused resources. 2014-01-16 15:16:19 -08:00
Philip Rosedale
a4f13e8bdd Merge branch 'master' of https://github.com/worklist/hifi 2014-01-16 15:01:57 -08:00
Andrzej Kapolka
aa3c18c0ed Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 15:01:39 -08:00
Andrzej Kapolka
2e3c597d40 Scooping out more head bits. 2014-01-16 15:01:24 -08:00
Stephen Birarda
0ddf9520dd if audio is muted don't loopback local audio, fixes #1561 2014-01-16 14:55:09 -08:00
Brad Hefta-Gaub
1cfbfe6611 fix 3d mode switch on/off issue 2014-01-16 14:54:08 -08:00
Andrzej Kapolka
a5bf0493f5 Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 14:47:56 -08:00
Andrzej Kapolka
50d224661c Pruning more avatar bits. 2014-01-16 14:47:39 -08:00