Philip Rosedale
|
e6bbb53483
|
Merge pull request #3774 from ZappoMan/newEntityNotification
implement "preload" method for entity Scripts
|
2014-11-11 14:46:23 -08:00 |
|
Stephen Birarda
|
83529c1fed
|
fix QIODevice fail in AudioInjector by passing explicit size
|
2014-11-11 14:45:33 -08:00 |
|
ZappoMan
|
8975fbe1ee
|
removed blank line
|
2014-11-11 14:26:45 -08:00 |
|
Brad Hefta-Gaub
|
d38496c3c7
|
Merge pull request #3771 from huffman/entity-grid-tool
Add entity grid tool
|
2014-11-11 14:21:26 -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 |
|
Philip Rosedale
|
17d0f247d6
|
Switch muting threshold to 0.003 to be a bit less aggressive
|
2014-11-11 14:10:44 -08:00 |
|
Philip Rosedale
|
8c35d4e3dc
|
remove debug line
|
2014-11-11 14:08:59 -08:00 |
|
ZappoMan
|
2bc7896dee
|
first cut at preload script behavior
|
2014-11-11 13:46:48 -08:00 |
|
Philip Rosedale
|
0508726c40
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-11-11 13:23:55 -08:00 |
|
Ryan Huffman
|
db9a5f2282
|
Add back XZ constraining to entity edit tools
|
2014-11-11 11:43:27 -08:00 |
|
Stephen Birarda
|
d0e8c294da
|
handle passing of local audio interface to AudioInjector
|
2014-11-11 11:22:16 -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
|
3d1bb68c72
|
fix for playSound argument to match QScriptValue conversion
|
2014-11-11 11:04:33 -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 |
|
Stephen Birarda
|
ef2c181c98
|
repairs to audio classes for Sound* to QScriptValue
|
2014-11-11 10:55:07 -08:00 |
|
Philip Rosedale
|
d9141b4010
|
Merge pull request #3750 from Atlante45/reverb_for_own_voice
Reverb for own voice
|
2014-11-11 10:52:26 -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 |
|
Stephen Birarda
|
a8681cd5b6
|
changes to allow AudioInjectorOptions to operate as a hash from js
|
2014-11-11 10:24:21 -08:00 |
|
Ryan Huffman
|
3ec28f8e30
|
Add WindowScriptingInterface::doCreateWebWindow
|
2014-11-11 10:15:16 -08:00 |
|
Ryan Huffman
|
a1d771a0be
|
Rename WebWindow to WebWindowClass
|
2014-11-11 10:03:14 -08:00 |
|
Ryan Huffman
|
bd61eba664
|
Remove unused include
|
2014-11-11 10:00:28 -08:00 |
|
Stephen Birarda
|
d083e75d2d
|
groundwork for better locally looped audio
|
2014-11-11 09:59:10 -08:00 |
|
Ryan Huffman
|
f577cdd2f4
|
Add Grid3DOverlay to Overlays
|
2014-11-11 09:56:47 -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 |
|
Sam Gateau
|
ad51416c28
|
move the transform class files to the Shared library, still problem with negative scale composition
|
2014-11-11 09:54:35 -08:00 |
|
Ryan Huffman
|
2ebca0a659
|
Add Grid3DOverlay
|
2014-11-11 09:50:25 -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 |
|
Philip Rosedale
|
c965c21702
|
Merge pull request #3758 from ey6es/master
Mirror/warning fixes.
|
2014-11-10 17:23:43 -08:00 |
|
Philip Rosedale
|
885a93b7e3
|
Merge pull request #3769 from birarda/plugs
add guard for handling of local audio
|
2014-11-10 17:20:19 -08:00 |
|
Philip Rosedale
|
8457393647
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-11-10 16:10:05 -08:00 |
|
Philip Rosedale
|
dbc1ba7925
|
Merge pull request #3768 from Atlante45/mute_when_noisy
Mute when noisy / Pulsing mute button
|
2014-11-10 16:09:46 -08:00 |
|
Stephen Birarda
|
dabc2b23a3
|
add a guard in case local audio cannot be handled
|
2014-11-10 15:51:56 -08:00 |
|
Atlante45
|
a868661a25
|
Extra space
|
2014-11-10 15:51:31 -08:00 |
|
Atlante45
|
02b401701f
|
Set a minimum mute intervalle in the mixer
|
2014-11-10 15:46:36 -08:00 |
|
Philip Rosedale
|
38a142eeb8
|
return value by reference
|
2014-11-10 15:23:13 -08:00 |
|
Atlante45
|
125ef0e3e2
|
make pulsate function into a cos
|
2014-11-10 15:12:40 -08:00 |
|
Atlante45
|
53fb9e9047
|
make mute icon pulsate when muted
|
2014-11-10 14:11:17 -08:00 |
|
Atlante45
|
edec4d1298
|
Mixer send mute when if too noisy
|
2014-11-10 14:10:29 -08:00 |
|
Andrzej Kapolka
|
5f89b6e00e
|
The spec actually says that the 'L' (should have been 'LL' anyway) isn't
necessary; the compiler will know to read the constant as a long long.
|
2014-11-10 11:58:52 -08:00 |
|