Brad Hefta-Gaub
99dd20f828
Merge pull request #3780 from ctrlaltdavid/20182
...
CR for Job #20182 - Add ability to set alpha on text overlays
2014-11-12 16:26:59 -08:00
Brad Hefta-Gaub
70c463695a
Merge pull request #3779 from PhilipRosedale/master
...
Remove buckyBalls and faceshift lean-to-drive
2014-11-12 16:26:50 -08:00
Philip Rosedale
6af2b7aadf
remove buckyballs and face shift lean driving (should be a script if desired)
2014-11-12 07:33:59 -08:00
Stephen Birarda
b7b371ba61
resolve conflicts on merge with upstream master
2014-11-11 20:53:24 -08:00
David Rowe
8ac3aba2bd
Make text overlays apply alpha to text as well as background
2014-11-11 17:54:02 -08:00
Stephen Birarda
9aa950e657
fix audio injector cleanup for local only injectors
2014-11-11 17:34:03 -08:00
Stephen Birarda
7f79f0946d
play a random musak song in lobby when it is shown
2014-11-11 17:10:25 -08:00
Stephen Birarda
0433586293
switch lobby noise back to drone
2014-11-11 16:59:15 -08:00
Stephen Birarda
cb5d5dd3a8
handle looping via AudioInjectorLocalBuffer
2014-11-11 16:57:25 -08:00
Stephen Birarda
a5a02b5f8a
add AudioInjectorLocalBuffer for more control
2014-11-11 16:34:00 -08:00
Stephen Birarda
0e30c65e60
handle cleanup of local injection, volume
2014-11-11 15:12:11 -08:00
Philip Rosedale
e6bbb53483
Merge pull request #3774 from ZappoMan/newEntityNotification
...
implement "preload" method for entity Scripts
2014-11-11 14:46:23 -08:00
ZappoMan
8ec3f8ce99
implement support for calling preload when the script changes
2014-11-11 14:21:06 -08:00
Stephen Birarda
cd3877b584
handle local audio output via AudioInjector directly for control
2014-11-11 14:14:43 -08:00
ZappoMan
2bc7896dee
first cut at preload script behavior
2014-11-11 13:46:48 -08:00
Ryan Huffman
db9a5f2282
Add back XZ constraining to entity edit tools
2014-11-11 11:43:27 -08:00
Stephen Birarda
1f452c8baa
replace AudioInjectionOptions with hash in playSoundOnEnterOrLeave
2014-11-11 11:17:45 -08:00
Stephen Birarda
d81609f045
use hash in place of AudioInjectionOptions in other js files
2014-11-11 11:16:45 -08:00
Stephen Birarda
89ae8f53ba
use new AudioInjectionOptions format in botProceduralWayPoints
2014-11-11 11:05:35 -08:00
Stephen Birarda
bfc25767ed
repairs to bot_procedrual for hash injector options format
2014-11-11 10:57:07 -08:00
Stephen Birarda
853c0197a1
repairs to birdSongs for new hash injector format
2014-11-11 10:55:45 -08:00
Ryan Huffman
bedd9c76f2
Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool
...
Conflicts:
examples/newEditEntities.js
2014-11-11 10:48:49 -08:00
Stephen Birarda
d4b74e6ecf
update birdSongs to new injector hash format
2014-11-11 10:30:16 -08:00
Stephen Birarda
12e15eab6a
update avatarCollision to new hash injector format
2014-11-11 10:29:29 -08:00
Stephen Birarda
c684a1cf00
update audioBall to new hash injector format
2014-11-11 10:28:33 -08:00
Stephen Birarda
05174ffdf3
update airGuitar.js to new AudioInjectionOptions format
2014-11-11 10:26:53 -08:00
Ryan Huffman
d537c5efdb
Add grid tool menu option
2014-11-11 09:56:02 -08:00
Ryan Huffman
b04fd89e4f
Update grid tool html location
2014-11-11 09:55:30 -08:00
AndrewMeadows
22dbebbe09
Merge pull request #3760 from DaveDubUK/20142
...
CR for Job #20142 - Walk Cycle Polish Description
2014-11-11 09:10:32 -08:00
DaveDubUK
3f1897d6b2
Minor formatting change
2014-11-11 13:21:37 +00:00
DaveDubUK
05b361affc
Formatting changes
2014-11-11 07:34:18 +00:00
DaveDubUK
ef325db052
Formatting changes to walk.js 1.1
...
Minor formatting changes for HiFi coding standard compliance
2014-11-08 11:47:57 +00:00
Brad Hefta-Gaub
3a90e869d4
Revert "CR for Job #20140 - Add Overlays.getTextWidth"
2014-11-07 21:50:19 -08:00
Brad Hefta-Gaub
8e17bc74bf
Merge pull request #3759 from ctrlaltdavid/20140
...
CR for Job #20140 - Add Overlays.getTextWidth
2014-11-07 20:14:18 -08:00
ZappoMan
742e6487c7
rename textureNames to originalTextures
2014-11-07 10:05:43 -08:00
ZappoMan
fdc5aa1da5
include urls with texture names, make sure to wait till default textures loaded before setting new textures
2014-11-07 09:54:13 -08:00
ZappoMan
c48d79ad8b
add gettable feature which lists texture names
2014-11-07 09:05:47 -08:00
David Rowe
8c3360d0a9
Auto-size load URL and file menu items in editModels and newEditEntities
...
And fix a couple of typos.
2014-11-07 08:59:37 -08:00
Ryan Huffman
feaf5678bb
Add grid tools to entity edit tools
2014-11-06 15:00:39 -08:00
Philip Rosedale
b103c62df9
add new birdSongs.js
2014-11-06 08:30:33 -08:00
Philip Rosedale
54957a2fa1
merge fix
2014-11-05 21:08:24 -08:00
Philip Rosedale
291767fd9e
updated header
2014-11-05 17:09:26 -08:00
Philip Rosedale
688bd0f34f
first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body'
2014-11-05 16:58:58 -08:00
DaveDubUK
7a1f7bd418
Update to walk.js v 1.1
...
Revised code structure (see /libraries for new files), walk animation
completely overhauled (now using geometric wave generators, Fourier
synthesis and Butterworth LP filtering for selected motion curve
construction), redesigned sidestepping animations, tweaked flying
animations, decreased maximum walk speed in Interface to more natural
human value, improved Hydra support, added support for Leap motion,
animation file sizes optimised, cleared out code used to work around now
fixed bugs, lots of minor tweaks and improvements. walk.js is now under
100,000 characters, but I had to use tabs instead of 4 spaces to get it
below the threshold.
2014-11-05 20:11:11 +00:00
Stephen Birarda
f8874daab6
remove the voxel drumming script
2014-11-05 10:10:22 -08:00
Brad Hefta-Gaub
583b7b1267
Merge pull request #3732 from thoys/20166
...
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
2014-11-04 15:51:05 -08:00
Philip Rosedale
6b8476a87f
Merge pull request #3734 from birarda/lobby
...
bubble up a PickRay with action event, camera cleanup
2014-11-04 12:03:29 -08:00
Stephen Birarda
b968f05123
use a new cursor for selection in lobby
2014-11-04 11:54:14 -08:00
Stephen Birarda
f53455ee55
use a ray from the near clip for action ray
2014-11-04 11:40:47 -08:00
AndrewMeadows
d7234d5995
Merge pull request #3731 from ctrlaltdavid/20138
...
CR for Job #20138 - Repopulate example default models for "Upload URL" to better sized models
2014-11-04 11:08:47 -08:00
