Commit graph

16925 commits

Author SHA1 Message Date
Stephen Birarda
eb0f7da517 cleanup to snapshot class to reduce passing of variables 2014-09-22 16:14:06 -07:00
Stephen Birarda
e5a54116dc correctly return empty string for domain ID if it is null 2014-09-22 15:00:07 -07:00
Stephen Birarda
523a4e6ba2 allow moving of location from DataWebDialog for locations 2014-09-22 11:58:23 -07:00
Stephen Birarda
84df6058cb add domainID to location scripting interface 2014-09-22 10:42:14 -07:00
Stephen Birarda
25c86af40f Merge branch 'master' into move-locations 2014-09-22 10:22:30 -07:00
Stephen Birarda
49e3f4bdb0 use 10.8 only in deployment target, base SDK should be latest 2014-09-22 09:20:34 -07:00
Brad Hefta-Gaub
631171eb2e Merge pull request #3462 from Atlante45/fix_attachment_bug_with_recording
Fixes concurrency issue with ScriptEngine timers
2014-09-21 20:48:05 -07:00
Brad Hefta-Gaub
4921ff025a Merge pull request #3464 from AndrewMeadows/ragdoll
add move.js demo MyAvatar.motorVelocity feature
2014-09-21 20:47:01 -07:00
Craig Hansen-Sturm
049810c00d Merge pull request #3454 from ZappoMan/perListenerSourcePairMixerData
Per listener source pair mixer data
2014-09-21 16:28:19 -07:00
Andrew Meadows
57dd9fba28 adding move.js, removing swissArmyJetpack.js 2014-09-19 16:55:04 -07:00
Andrew Meadows
09d3c51120 add multiply(float, Vec3) because multiply commutes 2014-09-19 16:54:03 -07:00
Atlante45
36a3372f58 Same fix for MyAvatar class 2014-09-19 15:47:13 -07:00
Atlante45
c570931f35 Fix attachemnt getting into wrong state
If you play a recording containing attachement with different
attachemnts already on, those attachement will sometime get into a wrong
state.
2014-09-19 15:43:22 -07:00
Atlante45
3d8f3ad9fa Fixes concurrency issue with scriptengine timers 2014-09-19 13:21:24 -07:00
AndrewMeadows
76f78e77d1 Merge pull request #3461 from PhilipRosedale/master
final tweaks to movement script
2014-09-19 09:23:14 -07:00
Philip Rosedale
6c808f2979 final tweaks to movement script 2014-09-19 09:22:27 -07:00
AndrewMeadows
2a5ec89e3b Merge pull request #3460 from PhilipRosedale/master
Added JS support for neck position for headMove script
2014-09-19 09:04:12 -07:00
Philip Rosedale
c6d6c347cd head move using neck measurement for movement rather than head. 2014-09-19 08:48:55 -07:00
ZappoMan
99cc02cc4f Merge branch 'master' of https://github.com/highfidelity/hifi into perListenerSourcePairMixerData 2014-09-18 17:44:04 -07:00
Stephen Birarda
e09eef98f2 add option to add javascript objects to a DataWebDialog 2014-09-18 17:17:33 -07:00
Craig Hansen-Sturm
255d9346bb Merge pull request #3459 from Atlante45/JS_hook_for_recordings
Added JS hooks for new Player options
2014-09-18 17:13:07 -07:00
ZappoMan
7fc7eeb0a1 Merge branch 'master' of https://github.com/highfidelity/hifi into perListenerSourcePairMixerData 2014-09-18 17:05:48 -07:00
Atlante45
3ba178022e Added new options to ControlledAC.js 2014-09-18 17:02:11 -07:00
Atlante45
58b1db4f09 Added JS hooks for new Player options 2014-09-18 16:49:13 -07:00
Clément Brisset
36c6099864 Merge pull request #3457 from chansensturm/audio-noise
Set default for head-penumbra filter to off
2014-09-18 16:46:15 -07:00
Craig Hansen-Sturm
a66b6e7237 Merge pull request #3458 from Atlante45/editVoxel_fix
Fixes 0 makes a voxel when tool off
2014-09-18 16:38:54 -07:00
Atlante45
b58c5f75dd Fixes 0 makes a voxel when tool off 2014-09-18 16:24:23 -07:00
Craig Hansen-Sturm
8e6d5da8fd disable positional filter by default 2014-09-18 16:05:15 -07:00
Craig Hansen-Sturm
8a8095566b Merge pull request #3456 from Atlante45/rec_file_format_tweaks
Fix LookAtPosition
2014-09-18 15:32:38 -07:00
Atlante45
29ff8c09d9 Fix LookAtPosition 2014-09-18 15:23:58 -07:00
ZappoMan
6f73da7d44 CR feedback 2014-09-18 15:19:03 -07:00
Andrzej Kapolka
cb1af4499a Merge pull request #3455 from ey6es/master
Tiny tweak to weight loading: only replace lowest weight if the new weig...
2014-09-18 15:05:30 -07:00
ZappoMan
bd23b8b8b9 completely remove _penumbraFilter from AudioMixer class 2014-09-18 15:01:06 -07:00
ZappoMan
864c1c88a7 fix the filter with delay and add per listener source pair data 2014-09-18 14:58:44 -07:00
Philip Rosedale
d3cc22b39d Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 14:51:19 -07:00
Craig Hansen-Sturm
2383379a35 default sine gain set to -6db 2014-09-18 13:52:53 -07:00
Brad Hefta-Gaub
a5ea0479c1 Merge pull request #3450 from birarda/master
handle hifi urls emitted from DataWebDialog in Application
2014-09-18 13:36:37 -07:00
Stephen Birarda
9f3d908d9f fix typo in comment 2014-09-18 13:32:01 -07:00
Brad Hefta-Gaub
c48b3ae51e Merge pull request #3451 from birarda/fix-ssl-handshake-race
make sure the OAuthWebViewHandler is ready before the NodeList might need it
2014-09-18 13:29:54 -07:00
Stephen Birarda
b63ef1f7fe Merge pull request #3453 from birarda/clement-recording-changes
Rec file format tweaks (on behalf of @Atlante45)
2014-09-18 13:14:09 -07:00
Craig Hansen-Sturm
256bd627fa clamp to 0.0f when within EPSILON neighborhood of 0.0f 2014-09-18 13:12:53 -07:00
Andrzej Kapolka
37eb40122c Tiny tweak to weight loading: only replace lowest weight if the new weight is
greater.
2014-09-18 13:05:57 -07:00
Stephen Birarda
1a5149af02 add another missing const to readRecordingFromRecFile 2014-09-18 11:29:51 -07:00
Stephen Birarda
75ecdd2f68 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-18 11:27:33 -07:00
Stephen Birarda
b1abdc05a0 add the last missing consts in Recording.h 2014-09-18 11:25:50 -07:00
Stephen Birarda
93d83b707d use a copy of filename in Recording.cpp to make changes to filename 2014-09-18 11:21:09 -07:00
Stephen Birarda
2ee367fa44 add a couple of missing consts 2014-09-18 11:14:17 -07:00
Stephen Birarda
ac588a569e add const to recording methods where arguments are passed by reference 2014-09-18 11:12:11 -07:00
Stephen Birarda
6e39f049c8 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 11:08:59 -07:00
Philip Rosedale
3f9eff2a90 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 10:48:44 -07:00