Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 17:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8172 commits 71 branches 56 tags 1.2 GiB
Commit graph

8172 commits

This branch
This branch
All branches
Author SHA1 Message Date
Leonardo Murillo
251416ab0a Merge branch 'master' of github.com:/worklist/hifi 2014-01-07 14:39:18 -06:00
Stephen Birarda
9e49f200a6 Merge pull request #1468 from ey6es/master 
Fix for "red ball" issue with no skeleton: use avatar position for head
 2014-01-06 16:15:44 -08:00
Andrzej Kapolka
8b2212b6cf Fix for "red ball" issue with no skeleton: use avatar position for head 
position.
 2014-01-06 12:08:42 -08:00
Leonardo Murillo
314c4ffcfa Using applicationVersion() instead of const wherever version is specified 2014-01-06 09:24:29 -06:00
Leonardo Murillo
ba79b1b329 Using BUILD_VERSION to setApplicationVersion 2014-01-06 09:18:10 -06:00
Philip Rosedale
61d3f63f9c Merge pull request #1458 from birarda/master 
fix random UUID creation for injector, assume RAW passed to sound is 48Khz
 2014-01-05 21:37:47 -08:00
Stephen Birarda
32be6199fd fix reference to downloaded byte array samples 2014-01-05 17:41:33 -08:00
Stephen Birarda
a06f18328c add downsampling so RAW audio for sound assumed to be 48Khz 2014-01-05 17:40:37 -08:00
Stephen Birarda
5b272bfd6a fix random UUID creation for injected audio 2014-01-05 17:09:57 -08:00
Philip Rosedale
7c97247a92 Merge pull request #1455 from ZappoMan/more_scripting 
change particle update to support full script engine
 2014-01-05 13:50:49 -08:00
Brad Hefta-Gaub
7ce774da70 change particle update to support full script engine 2014-01-05 10:39:58 -08:00
Philip Rosedale
909663fe96 Merge pull request #1454 from ZappoMan/bugfixes 
fixes to scriptable particle collisions
 2014-01-04 16:28:48 -08:00
Brad Hefta-Gaub
0252e7f95e use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces 2014-01-04 03:17:02 -08:00
Brad Hefta-Gaub
0df02618ee use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces 2014-01-04 03:16:47 -08:00
Brad Hefta-Gaub
3efc1ea410 Merge branch 'master' of git://github.com/worklist/hifi into bugfixes 2014-01-04 01:47:49 -08:00
Brad Hefta-Gaub
207ea30c6d fix delete problem with voxels 2014-01-04 01:10:48 -08:00
Philip Rosedale
607d8332e3 Merge pull request #1452 from ey6es/master 
First cut at orbit behavior (plus ray/capsule intersection test for avatar picking).
 2014-01-03 20:02:11 -08:00
Andrzej Kapolka
02adcbc309 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-03 18:17:20 -08:00
Andrzej Kapolka
35009c384f Merge pull request #1453 from PhilipRosedale/master 
two new scripts:  Clap, PlaySound
 2014-01-03 18:16:52 -08:00
Brad Hefta-Gaub
e97e211bc4 quiet down some debugging 2014-01-03 18:10:30 -08:00
Andrzej Kapolka
e37203d833 The overloaded function should be const, true. 2014-01-03 17:59:15 -08:00
Philip Rosedale
a2c33aadba two script example files 2014-01-03 17:58:00 -08:00
Andrzej Kapolka
1bd069c4e2 Removed unused variable. 2014-01-03 17:56:55 -08:00
Andrzej Kapolka
2b15fdf78f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-03 17:49:34 -08:00
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
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
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
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
Andrzej Kapolka
1003393101 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-03 11:11:04 -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
Stephen Birarda
443c94a88f repairs to AudioMixer and audio injection flow 2014-01-02 17:15:46 -08:00