Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 18:40:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8887 commits 72 branches 59 tags 1.2 GiB
Commit graph

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
460a9aacb8 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-02 15:45:27 -08:00
Philip Rosedale
c286f84d97 removed trigger being used for toy ball catching 2014-01-02 15:38:21 -08:00
ZappoMan
366209668d Merge pull request #1431 from stojce/19463 
Code Review for Job #19463
 2014-01-02 15:38:15 -08:00
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
Stephen Birarda
594bd58774 add AudioScriptingInterface to expose playSound to JS 2014-01-02 15:35:28 -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
Stephen Birarda
845176bbc6 expose Sound to ScriptEngine 2014-01-02 15:14:28 -08:00
Stojce Slavkovski
3848028365 changed locking to QMutexLocker 2014-01-03 00:11:24 +01:00
Andrzej Kapolka
0461335887 Align hand with forearm in mouse-pointing mode. 2014-01-02 14:56:29 -08:00
Stojce Slavkovski
b7bcdf8f8c QMutex reference 2014-01-02 23:56:28 +01:00
Stojce Slavkovski
f583013776 Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 23:19:07 +01:00
Stojce Slavkovski
c0fcecad2c Jenkins build fix 2014-01-02 23:18:39 +01:00
Stojce Slavkovski
27e211de8d possible fix for jenkins build error 2014-01-02 23:10:21 +01: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
Stojce Slavkovski
31fa8ad1fb Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 21:06:28 +01: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
a9d21faa7e Merge branch 'master' of https://github.com/worklist/hifi into buckyballs 2014-01-01 10:45:38 -08:00
Philip Rosedale
d1e9c25d00 bucky balls! 2014-01-01 10:45:06 -08:00
Andrzej Kapolka
72b002ddc4 Allow streaming QVariantLists. 2013-12-31 17:30:41 -08:00
Andrzej Kapolka
839e5e085c Attempting to silence unused variable warning on Xcode. 2013-12-31 16:56:18 -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
Andrzej Kapolka
a8bb890187 Fixed a couple of Xcode warnings. 2013-12-31 16:27:54 -08:00
Andrzej Kapolka
d7d8cdce44 init -> commonInit, streaming tweaks. 2013-12-31 16:19:03 -08:00
Andrzej Kapolka
a210d57c03 Add back this spammy log message that I disabled. 2013-12-31 15:40:01 -08:00
Andrzej Kapolka
effd00a405 Basic "meta type compiler" for streaming, streaming fixes and test. 2013-12-31 15:30:15 -08:00
ZappoMan
32ec15beb7 added comments to example scripts 2013-12-31 12:24:37 -08:00
ZappoMan
8f9a99e1f4 add example scripts 2013-12-31 12:13:06 -08:00
Andrzej Kapolka
f9043c3cb9 Working on streaming types. 2013-12-31 11:34:10 -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
Andrzej Kapolka
ecd9c9f41d Communication between client and server. 2013-12-30 18:28:30 -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