Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 01:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8235 commits 22 branches 28 tags 1.2 GiB
Commit graph

8235 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Stojce Slavkovski
cd4fcb993f removed unused 'LogDisplay' class 2013-12-29 23:52:26 +01:00
Stojce Slavkovski
2b92194d35 sytle changes on log dialog 2013-12-29 23:45:24 +01:00
Stojce Slavkovski
aa75763b27 Merge branch 'master' of https://github.com/worklist/hifi into 19463 2013-12-29 22:54:41 +01: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
Stojce Slavkovski
e0255721da Search keyword highlighter 2013-12-24 22:15:19 +01:00
Stojce Slavkovski
840d1a33ef Reveal log file 
- change log location lo application data folder
- reveal file in Finder (Explorer) implementation
 2013-12-23 21:23:47 +01:00
Stojce Slavkovski
505ed5bc64 Storing log to file - initial 2013-12-22 23:55:21 +01:00
Stojce Slavkovski
ee1eb25dfa replace LogDisplay with File logger 
- added abstract logger interface
 2013-12-22 18:56:53 +01:00
Stojce Slavkovski
3d44ab9939 Dialog layout 2013-12-22 15:06:40 +01: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
Philip Rosedale
cf3dc47c18 debug off 2013-12-19 23:16:04 -08:00
Philip Rosedale
b6ac73bb57 merge 2013-12-19 23:12:11 -08:00
Philip Rosedale
f4a28850cf Merge remote-tracking branch 'upstream/master' 2013-12-19 23:05:37 -08:00
Philip Rosedale
e29b366b7e Merge pull request #1415 from birarda/injected-audio 
hook throw and catch sounds to Hand ball tests
 2013-12-19 17:37:17 -08:00