Commit graph

16442 commits

Author SHA1 Message Date
Philip Rosedale
0b02376594 Add head-driven movement to default scripts 2014-09-08 11:39:04 -07:00
Philip Rosedale
2b87296cde Merge branch 'master' of https://github.com/worklist/hifi 2014-09-08 11:38:02 -07:00
Brad Hefta-Gaub
ca6c7cda15 Merge pull request #3373 from cozza13/20019
Code Review for Job #20019
2014-09-08 11:36:02 -07:00
Philip Rosedale
5b88e47810 Head movement and hydra/hand movement separated to headMove.js and hydraMove.js 2014-09-08 11:31:39 -07:00
Brad Hefta-Gaub
8068117f0c Merge pull request #3368 from chansensturm/audio-noise
New Audio Buffer, Format, Tone Generator, Pink Noise Generator, and Gain objects
2014-09-08 11:28:02 -07:00
Craig Hansen-Sturm
431fcbcf6c coding standard / SLOT selectAudioSourceSine440 linkage / tone gen amplitude parameter 2014-09-08 11:18:14 -07:00
Chris Collins
a824712ee6 Changed list model icon
Changed list-model.svg icon to be consistent with the other icons
2014-09-08 10:55:45 -07:00
Philip Rosedale
68cc49f19e Merge pull request #3372 from ZappoMan/entitiesCrashes
Fixes the several entity crashes
2014-09-07 21:04:14 -07:00
Philip Rosedale
de4b423c46 Merge pull request #3367 from ZappoMan/improveClockSkew
improve ping behavior and clockskew in octree servers
2014-09-07 20:59:34 -07:00
ZappoMan
420f7de957 fix various crashes in entites 2014-09-07 20:31:54 -07:00
Clément Brisset
dc59cd4bb6 Merge pull request #3371 from ZappoMan/warningFixes
fix some recently introduced warnings
2014-09-06 19:01:56 -07:00
ZappoMan
9fdd1f422a fix crash on change domains while entities are animating or moving 2014-09-06 16:54:36 -07:00
ZappoMan
d734655ab6 fix some recently introduced warnings 2014-09-06 16:03:03 -07:00
Brad Hefta-Gaub
fe3f0cd358 Merge pull request #3355 from stojce/19964
Code Review for Job #19964
2014-09-06 15:43:27 -07:00
Brad Hefta-Gaub
d342f9281f Merge pull request #3357 from huffman/19968
Code Review for Job #19968
2014-09-06 15:42:02 -07:00
Brad Hefta-Gaub
2f22292213 Merge pull request #3370 from ZappoMan/defaultScriptsLoad
use load instead of include for default scripts since Script.load() now works better
2014-09-06 15:38:49 -07:00
ZappoMan
293fc56a66 use load instead of include for default scripts since Script.load() now works better 2014-09-06 15:38:01 -07:00
Brad Hefta-Gaub
a77739f31c Merge pull request #3369 from ctrlaltdavid/20007
Code Review for Job #20007
2014-09-06 15:36:29 -07:00
David Rowe
5ebe6962a4 Make scripts loaded with Script.load() not persist 2014-09-06 09:59:47 -07:00
Craig Hansen-Sturm
2700d8c59d ubuntu build fix (remove std::memset ...) 2014-09-06 04:05:52 -07:00
Craig Hansen-Sturm
76adb952a3 ubuntu build fix (remove std::memset ...) 2014-09-06 03:57:11 -07:00
Craig Hansen-Sturm
e64c81420e ubuntu build fix (remove std::memset ...) 2014-09-06 03:29:14 -07:00
Craig Hansen-Sturm
e2f3392f09 formatting/renaming 2014-09-06 02:51:11 -07:00
Craig Hansen-Sturm
f309875069 formatting/renaming 2014-09-06 02:50:37 -07:00
Craig Hansen-Sturm
1eba20bc3b minor cleanup 2014-09-06 02:32:13 -07:00
Craig Hansen-Sturm
7a5ec429d1 audio rendering loop now uses input-gain, tone-generator, noise-generator, and post-generator-gain objects / audiobuffer object now shared between all new audio objects / zero buffer copy between new objects / inline tone-generator code removed / new audio options for generators 2014-09-06 02:29:48 -07:00
Craig Hansen-Sturm
5bab1ee7f5 dependency on new audiobuffer and audioformat objects/render call now uses audiobuffers 2014-09-06 02:22:27 -07:00
Craig Hansen-Sturm
8ecf0870e7 dependency on new audiobuffer and audioformat objects 2014-09-06 02:20:14 -07:00
Craig Hansen-Sturm
0b33c344ff new audio buffer object 2014-09-06 02:18:35 -07:00
Craig Hansen-Sturm
f439475f3c new audio gain/mute object 2014-09-06 02:18:04 -07:00
Craig Hansen-Sturm
3a9a4a6402 new pink noise generator audio source object 2014-09-06 02:16:00 -07:00
Craig Hansen-Sturm
c6911274f6 new tone generator audio source object 2014-09-06 02:14:47 -07:00
ZappoMan
f16a85b2aa fix header 2014-09-05 19:07:30 -07:00
ZappoMan
9e21d26a6d improve ping behavior and clockskew in octree servers by introducing datagramprocessing thread 2014-09-05 19:03:44 -07:00
Craig Hansen-Sturm
1cdb01e072 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-05 18:31:02 -07:00
Craig Hansen-Sturm
68fa44f845 audio menu changes to support tone and noise generators 2014-09-05 18:30:39 -07:00
Clément Brisset
7476c61647 Merge pull request #3366 from ey6es/master
The long-requested full "Retina" resolution fix for OS X.
2014-09-05 18:08:22 -07:00
Andrzej Kapolka
c9d22ea07e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-05 18:04:15 -07:00
Clément Brisset
f3344ac440 Merge pull request #3365 from AndrewMeadows/inertia
remove warnings
2014-09-05 18:00:35 -07:00
Andrew Meadows
bd8fc75305 fix bug: zero velocity when teleporting to new locations 2014-09-05 17:51:18 -07:00
Andrzej Kapolka
0b2d0a0b07 Fix for mouse events. 2014-09-05 17:30:19 -07:00
Andrew Meadows
526d998924 removed warnigs about ill-formed narrowing conversion 2014-09-05 17:21:15 -07:00
Andrew Meadows
1d7ac23aa1 removed signed/unsigned comparison 2014-09-05 17:10:13 -07:00
Andrzej Kapolka
c2cd23a54c Mouse coordinate fix. 2014-09-05 17:07:37 -07:00
Andrew Meadows
5c75b53c0d removed singed/unsigned comparisons 2014-09-05 17:06:42 -07:00
Andrew Meadows
2f03f0fb0d removed unused variables 2014-09-05 17:00:23 -07:00
Andrew Meadows
be4ec8920d reorderd init of data members in ctor 2014-09-05 16:58:25 -07:00
Andrew Meadows
51dca12a7b added default case for switch statements
which avoids warnings about unhandled enum values
2014-09-05 16:55:42 -07:00
Andrew Meadows
2fdfb125f2 removed signed/unsigned comparisons 2014-09-05 16:55:24 -07:00
Andrzej Kapolka
5bdad18ade Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-05 16:45:15 -07:00