Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 14:00:14 +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
c2af9becba Ray/capsule intersection test. 2014-01-03 17:48:58 -08:00
Brad Hefta-Gaub
5144a91d1f cleanup spacing and comments 2014-01-03 17:28:06 -08:00
Brad Hefta-Gaub
9aa3d31876 cleanup spacing 2014-01-03 17:24:55 -08:00
Brad Hefta-Gaub
b72dfbd3a4 fix tabs 2014-01-03 17:20:54 -08:00
Brad Hefta-Gaub
8abd76c055 fixed issue with voxels not always showing up when changed between clients 2014-01-03 17:10:35 -08:00
Andrew Meadows
6f21592ebd pulling latest upstream changes to local repo 2014-01-03 16:51:21 -08:00
Andrew Meadows
8f94cec746 Fixing build: missed some instances of VOXEL_ELASTICITY. 
Also enforcing C++ style casts.
 2014-01-03 16:49:13 -08:00
Andrzej Kapolka
aa9fc290a5 Minimum chat circle radius from Ryan, basic avatar/voxel orbit behavior. 2014-01-03 16:46:11 -08:00
Andrew Meadows
d8e48f8cba Pulling latest worklist/hifi into local repo 2014-01-03 16:36:52 -08:00
Andrew Meadows
6518e70688 Minor cast enforcement during initialization. 2014-01-03 16:27:57 -08:00
Andrew Meadows
1882c9e43b Merge branch 'elasticity' of https://github.com/PhilipRosedale/hifi into elasticity-fix 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-03 16:26:17 -08:00
Andrew Meadows
bce39e916a Pulling latest worklist/hifi into local repo 2014-01-03 16:10:21 -08:00
Andrew Meadows
74392a8835 Moved ParticleTreeUpdateArgs into ParticleTreeElement.h 2014-01-03 16:03:42 -08:00
Andrew Meadows
ea88f00ce5 Name changes, formatting, and comments for readability. 2014-01-03 16:01:31 -08:00
Philip Rosedale
83101d3d11 reduce elasticity to be less than 1 2014-01-03 15:31:16 -08:00
Philip Rosedale
2cf5efc4a8 Merge pull request #1449 from PhilipRosedale/mirror 
Mirror
 2014-01-03 15:25:28 -08:00
Philip Rosedale
2286916fbb Don’t render head if inside it! 2014-01-03 15:00:42 -08:00
Philip Rosedale
65340f1667 Tweaked mirror distances 2014-01-03 14:33:54 -08:00
Philip Rosedale
8c2a37921e Merge pull request #1448 from birarda/master 
add property for volume in AudioInjectorOptions
 2014-01-03 14:25:16 -08:00
Stephen Birarda
91b07d93c8 Merge pull request #1440 from PhilipRosedale/buckyballs 
Removed some more old balls/hair/particle code, added local-only version of buckyballs to try playing with
 2014-01-03 14:21:29 -08:00
Stephen Birarda
decaf2e245 add property for volume in AudioInjectorOptions 2014-01-03 14:17:12 -08:00
stojce
594a20e248 Merge branch 'master' of https://github.com/worklist/hifi into 19466 2014-01-03 22:53:30 +01:00
Andrzej Kapolka
3f367c0c45 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2014-01-03 13:28:40 -08:00
stojce
2814cca9af #19466 - Add avatar scale to preferences panel 2014-01-03 21:02:56 +01:00
Andrzej Kapolka
1003393101 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-03 11:11:04 -08:00
Andrzej Kapolka
67ed045869 More work on delta streaming. 2014-01-03 11:10:21 -08:00
Philip Rosedale
94a57119f8 Merge pull request #1445 from birarda/master 
simplify loopback trigger for injected audio, actually move to QThread
 2014-01-03 10:43:06 -08:00
Stephen Birarda
a4f2735739 fix a glaring omission - actually move the audioInjector to QThread 2014-01-03 10:39:09 -08:00
Stephen Birarda
a61e214c9a simplify loopback trigger for injected audio 2014-01-03 10:16:59 -08:00
ZappoMan
ec1f08b140 Merge pull request #1443 from birarda/master 
open up more audio to JS
 2014-01-03 10:12:44 -08:00
Stephen Birarda
6f60a22c07 fix copyright years 2014-01-03 09:50:13 -08:00
Stephen Birarda
2a422b84f2 fix broken build by removing ASI as friend to AI 2014-01-03 09:49:32 -08:00
Stephen Birarda
339ef93fc4 remove no longer needed QDebug includes 2014-01-03 09:41:01 -08:00
Stephen Birarda
f24eff33fe open up ASI playSound method to ScriptEngine 2014-01-03 09:38:05 -08:00
Andrzej Kapolka
a08afae319 More work on client/server communication. 2014-01-02 17:40:43 -08:00
Andrzej Kapolka
25b2353df1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2014-01-02 17:35:39 -08:00
Stephen Birarda
443c94a88f repairs to AudioMixer and audio injection flow 2014-01-02 17:15:46 -08:00
Philip Rosedale
3fe972791c remove unused mohawk and hair physics 2014-01-02 17:12:34 -08:00
Philip Rosedale
2ad3aea729 Cleanup to move BuckyBalls prototype to own class file 2014-01-02 17:02:04 -08:00
Andrzej Kapolka
1d7d0d32f2 Merge pull request #1439 from ZappoMan/fix_warnings 
fix various compiler warnings on gcc
 2014-01-02 16:43:24 -08:00
ZappoMan
1a67d946d8 more warnings fixes 2014-01-02 16:33:58 -08:00
ZappoMan
20d4020a33 Merge pull request #1438 from ZappoMan/collision_scripting 
added comments to example scripts
 2014-01-02 16:24:26 -08:00
ZappoMan
ce81b95eaa more warnings fixes 2014-01-02 16:21:58 -08:00
ZappoMan
696afd7875 more warnings fixes 2014-01-02 16:18:49 -08:00
ZappoMan
9e64528989 removed more dead debug code 2014-01-02 16:10:05 -08:00
Andrew Meadows
930d9957f3 Changed argument names in collision methods for improved readability. 2014-01-02 16:09:41 -08:00
ZappoMan
f1da6bf90b fix various compiler warnings on gcc 2014-01-02 15:58:03 -08:00
Andrzej Kapolka
5df899c620 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2014-01-02 15:57:04 -08:00
Philip Rosedale
b9d68ec087 removed old ParticleSystem class 2014-01-02 15:53:11 -08:00
Philip Rosedale
739a02c022 merge fixes 2014-01-02 15:46:37 -08:00