Commit graph

17135 commits

Author SHA1 Message Date
Atlante45
8393fcc6eb Frame computation + timerOffset member
When jumping inside a recording
2014-09-22 14:01:02 -07:00
Stephen Birarda
523a4e6ba2 allow moving of location from DataWebDialog for locations 2014-09-22 11:58:23 -07:00
stojce
cc83c2b2e0 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-22 20:52:17 +02:00
stojce
466dbdcee5 added address bar dialog 2014-09-22 20:51:19 +02:00
Philip Rosedale
034870e46e Merge pull request #3466 from birarda/master
use 10.8 only in deployment target, base SDK should be latest
2014-09-22 11:45:52 -07:00
AndrewMeadows
a0b458fd1d Merge pull request #3465 from chansensturm/audio-noise
New Audio Edit Buffer Object / Click Removal /  ....
2014-09-22 11:38:42 -07:00
Craig Hansen-Sturm
75858b07c6 coding standard + missing frame-offsets in audiobuffer 2014-09-22 11:21:18 -07:00
Craig Hansen-Sturm
66ec43c066 coding standard - else clause 2014-09-22 11:04:21 -07:00
David Rowe
a11bf7f15b Decouple Rift head tracking from avatar's head position
This makes the Rift's view reflect the user's physical movements exactly
while the avatar follows the movements as best it can.
2014-09-22 11:02:12 -07:00
Atlante45
0b89fc1f63 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-22 10:55:46 -07:00
AndrewMeadows
3d89aa9c9c Merge pull request #3463 from ey6es/deference
Break deferred lighting business out into its own class, use deferred lighting for voxels/avatars/entities/particles in addition to metavoxels.  Don't merge until after conference, obviously.
2014-09-22 10:42:25 -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
Craig Hansen-Sturm
4372410fa7 unrolling for int16_t<->float32_t conversion/scaling and copy in/out 2014-09-20 14:49:41 -07:00
Craig Hansen-Sturm
1b2ee4023a out of line inline members for coding standard 2014-09-20 05:46:27 -07:00
Craig Hansen-Sturm
90379ee7eb frame and channel counts are now consistently uint32_t / float32_t replaces float 2014-09-20 04:50:11 -07:00
Craig Hansen-Sturm
47c6ba708f new audio edit buffer object / click removal / apply linear fade to sound clip endpoints 2014-09-20 04:45:58 -07:00
Atlante45
1d014358ee Added possibility to change AudioInjector position 2014-09-19 17:06:03 -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
Andrzej Kapolka
6c907a9d83 Read the emissive color property and use it to effect glow. 2014-09-19 16:49:51 -07:00
Andrzej Kapolka
9515145b9b Removed commented lines. 2014-09-19 15:48:56 -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
Andrzej Kapolka
646c0dc48f Working on translucent model bits. 2014-09-19 15:31:46 -07:00
Ryan Huffman
145425276d Fix script list not being hidden 2014-09-19 14:17:08 -07:00
Atlante45
3d8f3ad9fa Fixes concurrency issue with scriptengine timers 2014-09-19 13:21:24 -07:00
Andrzej Kapolka
8d3eef708a Move various avatar render bits to post-lighting section. 2014-09-19 13:13:05 -07:00
Andrzej Kapolka
446c2193ff Limit what we render for deferred point/spot lights based on the light's
radius.
2014-09-19 12:18:00 -07:00
Andrzej Kapolka
08fda3bbef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-19 10:30:40 -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
Andrzej Kapolka
e356b06c75 Fix for lights in rear view mirror/head mode. 2014-09-18 17:39:40 -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
Andrzej Kapolka
c6aad42f21 Move LocalLight to AvatarManager, apply it at the avatar level. 2014-09-18 17:09:53 -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
Andrzej Kapolka
b9ae005e53 Working on the actual deferred lights. 2014-09-18 16:12:46 -07:00