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
8089 commits 25 branches 0 tags 1.1 GiB
Commit graph

8089 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
f03139dbe5 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-02 15:38:07 -08:00
Andrzej Kapolka
ed4ad1cea9 Removed some unused code. 2014-01-02 15:37:56 -08:00
Philip Rosedale
8f48ca0e95 Merge pull request #1437 from ey6es/master 
Restore bent arm behavior when pointing (lost in ball removal).  Fix compile warning.
 2014-01-02 15:26:33 -08:00
Philip Rosedale
c47ace6d7f Merge pull request #1436 from birarda/master 
changes to audio injector for overlapped sounds in preparation for JS
 2014-01-02 15:24:47 -08:00
Andrzej Kapolka
0461335887 Align hand with forearm in mouse-pointing mode. 2014-01-02 14:56:29 -08:00
Stephen Birarda
8cc4a33ad3 repair AudioInjector threading 2014-01-02 13:35:56 -08:00
Andrzej Kapolka
7178147535 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-02 13:23:39 -08:00
Andrzej Kapolka
6c27569e9b Fix arm bending, compile warning. 2014-01-02 13:23:15 -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
Stephen Birarda
3a45fb8533 cleanup new API for sound injection 2014-01-02 12:31:01 -08:00
Stephen Birarda
674c19a570 leverage new AudioInjector API for throw and catch sounds 2014-01-02 12:17:18 -08:00
Andrew Meadows
68c09c5b74 Merge 'threedtv' of https://github.com/ZappoMan/hifi for pull 1430 2014-01-02 11:59:57 -08:00
Stephen Birarda
3123b83d0b audio API changes to allow multiple injections of single sound 2014-01-02 11:53:33 -08:00
ZappoMan
f5433c8a44 Merge pull request #1434 from birarda/master 
notify for node kill on NodeList clear, remove double sound
 2014-01-02 11:43:24 -08:00
Stephen Birarda
591876eaf3 notify for node kill on NodeList clear 2014-01-02 10:01:47 -08:00
Andrew Meadows
934b0f619b Particles now collide with avatars, but avatars don't react yet. 2014-01-02 09:36:21 -08:00
Andrew Meadows
d520adba98 exposed getVelocity() and findSpherePenetration() in Avatar base class 2014-01-02 09:31:24 -08:00
Andrew Meadows
5843c745cb minor formatting and code standard enforcement to Particle.* 2014-01-02 09:30:14 -08:00
Stephen Birarda
a0cf2c8fb1 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-02 09:00:14 -08:00
Philip Rosedale
fa5e986b85 Merge pull request #1433 from ZappoMan/collision_scripting 
Scripting support for Particle Collisions
 2013-12-31 16:50:34 -08:00
ZappoMan
8f9a99e1f4 add example scripts 2013-12-31 12:13:06 -08:00
ZappoMan
48b2d7d3fa scripting for particle to voxel collisions 2013-12-31 11:33:43 -08:00
Andrew Meadows
7c108ab489 Merge remote-tracking branch 'trunk/master' 2013-12-31 10:57:24 -08:00
Andrew Meadows
14b88fd141 Changing meaning of "elasticy" in applyHardCollision() to range in [0,1] instead of [1,2] 
Also enforcing C++ style casts as per coding standard.
 2013-12-31 09:49:46 -08:00
ZappoMan
651d2d0c81 rename voxels and particles scripting interfaces 2013-12-31 09:41:35 -08:00
Andrew Meadows
6e661e05e5 minor cleanup and enforcement of coding standards 2013-12-31 09:30:01 -08:00
ZappoMan
5057517b78 pass scriptable particle on collisions 2013-12-30 16:35:58 -08:00
ZappoMan
9194a53410 change to setScript() since it does more than update 2013-12-30 15:55:57 -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
788bb530f8 added comment 2013-12-28 13:02:27 -08:00
ZappoMan
47f45c3af1 make sure camera is configured on connect 2013-12-28 13:00:25 -08:00
ZappoMan
6f2a1b9802 cleanup 2013-12-28 12:51:50 -08:00
ZappoMan
32b2fb8f21 cleanup 2013-12-28 12:08:24 -08:00
ZappoMan
a43844447c first cut at 3D TV support 2013-12-28 10:07:33 -08:00
ZappoMan
ebdf80a4ed Merge pull request #1429 from PhilipRosedale/grabspin 
Grab drag now turns as well, removed old _balls code
 2013-12-27 10:48:39 -08:00
Philip Rosedale
e3a77ef139 tuning 2013-12-26 20:20:57 -08:00
Philip Rosedale
74380260b3 Grab includes rotation 2013-12-26 19:07:02 -08:00
Philip Rosedale
9b3973c2e4 removed headers 2013-12-21 18:07:40 -08:00
Philip Rosedale
58a73dfede yet again remove the test _balls now that we have a particle server 2013-12-21 18:06:04 -08:00
ZappoMan
fdb1bf5622 Merge pull request #1426 from PhilipRosedale/master 
Fixed chat height
 2013-12-21 10:42:58 -08:00
Philip Rosedale
03d192574d typo 2013-12-20 22:57:35 -08:00
Philip Rosedale
bad47bd527 Fixed chat height 2013-12-20 15:33:56 -08:00
Stephen Birarda
10eb8985f4 remove the double catch sound 2013-12-20 15:29:12 -08:00
Stephen Birarda
87ed91677c Merge pull request #1421 from birarda/master 
remove bottle options from qt5 formula
 2013-12-20 11:03:09 -08:00
Stephen Birarda
276ab3741b remove all bottle options from formula 2013-12-20 11:02:46 -08:00
Stephen Birarda
eadf39872e Merge pull request #1420 from birarda/injected-audio 
updated patched qt5 homebrew formula
 2013-12-20 10:58:44 -08:00
Stephen Birarda
c116cc0a88 update homebrew qt5 formula with patched 5.2.0 stable 2013-12-20 10:58:23 -08:00
ZappoMan
7a08f6b9a1 Merge pull request #1417 from PhilipRosedale/master 
Cleanup and tweaks to make throw/catch better
 2013-12-20 08:55:15 -08:00