Commit graph

18505 commits

Author SHA1 Message Date
Andrzej Kapolka
2c0b8c9172 Winding order fixes. 2014-11-06 12:45:02 -08:00
AndrewMeadows
843aaf4e95 Merge pull request #3747 from PhilipRosedale/master
First pass audio mixer muting, improved tour guide, hair, injector loudness in JS
2014-11-06 10:36:46 -08:00
AndrewMeadows
34684a4cc0 Merge pull request #3746 from ey6es/master
Perspective correction fix (lets us use lower tesselation on light volum...
2014-11-06 10:04:51 -08:00
AndrewMeadows
3f3e6ea581 Merge pull request #3745 from Atlante45/ignore_penumbra
Ignore penumbra
2014-11-06 09:59:31 -08:00
Philip Rosedale
7e822d31e7 Merge pull request #3744 from ZappoMan/entityBugs
Octree server improvements
2014-11-06 08:41:21 -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
ZappoMan
bcec14b0f4 adjust the sentAt times in packets by the receiving side's clockskew so that it can calculate proper flight times 2014-11-05 19:37:08 -08:00
Philip Rosedale
291767fd9e updated header 2014-11-05 17:09:26 -08:00
Philip Rosedale
0b205f3f16 fix bad spaces 2014-11-05 17:06:00 -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
Andrzej Kapolka
fd00461b4e Perspective correction fix (lets us use lower tesselation on light volumes). 2014-11-05 16:50:34 -08:00
ZappoMan
13e358549d add periodic pruning of the octree on load and save 2014-11-05 14:56:38 -08:00
ZappoMan
4ea0d32c8c dead code 2014-11-05 12:14:09 -08:00
ZappoMan
e9a332de4d make entity and voxel servers support domain based configuration 2014-11-05 12:12:17 -08:00
Brad Hefta-Gaub
4d7dac97c5 Merge pull request #3743 from birarda/injector-crash
fix for double definition in ScriptEngine
2014-11-05 11:23:36 -08:00
Stephen Birarda
2e8118300f fix for two member variable declarations on same line 2014-11-05 11:11:37 -08:00
Philip Rosedale
8fb3baa8fb Merge pull request #3742 from birarda/injector-crash
cleanup stray AudioInjectors when interface is being shut down
2014-11-05 11:02:29 -08:00
Stephen Birarda
663167d684 wait on AudioInjectors when shutting down interface 2014-11-05 10:37:22 -08:00
Stephen Birarda
f8874daab6 remove the voxel drumming script 2014-11-05 10:10:22 -08:00
Stephen Birarda
2c667d209d make the AudioInjectorScriptingInterface a singleton 2014-11-05 10:10:05 -08:00
Atlante45
b2b27a07d4 Merge branch 'master' of https://github.com/highfidelity/hifi into ignore_penumbra 2014-11-05 16:35:12 +01:00
Atlante45
4b73a5ac35 Modify injected audio stream to send the ignore penumbra option 2014-11-05 16:22:06 +01:00
Atlante45
49526e69f8 Added ignorePenumbra option to injected stream 2014-11-05 16:21:06 +01:00
Atlante45
85a59249df Move ignorePenumbra to positional audio 2014-11-05 16:19:26 +01:00
Philip Rosedale
7e36c51edc Merge pull request #3741 from ey6es/master
Use 3D geometry (cones, spheres) for rendering point and spot lights for deferred shading, exiting the fragment shaders early on depth fail.
2014-11-05 07:17:22 -08:00
Atlante45
617bb23206 Merge branch 'master' of https://github.com/highfidelity/hifi into ignore_penumbra 2014-11-05 15:42:50 +01:00
Andrzej Kapolka
fb4c1d38eb Set Oculus camera fov/aspect ratio. 2014-11-04 19:04:31 -08:00
Andrzej Kapolka
a0e0c47701 Depth value tweak. 2014-11-04 18:27:24 -08:00
Andrzej Kapolka
52d0b15979 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 18:13:58 -08:00
Andrzej Kapolka
892987d68a Increase tesselation to minimize artifacts. 2014-11-04 18:13:33 -08:00
Andrzej Kapolka
feabd1d5b3 Use a fullscreen quad when we're actually inside the light influence. 2014-11-04 18:08:56 -08:00
Andrzej Kapolka
1763d8f7f0 Switch to using cones/spheres (as opposed to screen-aligned quads) with depth
testing for light geometry.
2014-11-04 17:29:19 -08:00
Brad Hefta-Gaub
24c324fd1d Merge pull request #3735 from ctrlaltdavid/20126
CR for Job #20126 - Rift HUD shouldn't move with head
2014-11-04 15:52:10 -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
Andrzej Kapolka
576ac23e71 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 15:10:19 -08:00
Philip Rosedale
a6c8fb7449 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 14:12:24 -08:00
Philip Rosedale
803686c2ce Merge pull request #3739 from birarda/lobby
fix for ice server lookup from DomainHandler
2014-11-04 14:12:18 -08:00
Stephen Birarda
beb350d1e7 fix for HifiSockAddr lookup for ice server from DomainHandler 2014-11-04 13:53:56 -08:00
Philip Rosedale
b971089ba8 Merge pull request #3738 from birarda/lobby
fix for ice server sock addr in domain-server
2014-11-04 13:26:56 -08:00
Stephen Birarda
d46f775f20 async and sync nomenclature flip 2014-11-04 13:23:53 -08:00
Andrzej Kapolka
3b56f613e2 Cone render function, some cleanup of GeometryCache methods. 2014-11-04 13:21:51 -08:00
Stephen Birarda
d671dec61b fix for ice server sock addr in domain-server 2014-11-04 13:21:48 -08:00
Philip Rosedale
cdad40faec Merge pull request #3736 from ZappoMan/entityBugs
reset the QElapsedTimer in usecTimestampNow() periodically to prevent error
2014-11-04 12:59:13 -08:00
Philip Rosedale
c4eeebe03e Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 12:44:31 -08:00
Stephen Birarda
fab3a61f1b Merge pull request #3737 from birarda/lobby
fix for Camera.getPosition() calls
2014-11-04 12:40:08 -08:00
Stephen Birarda
72f80d4a0f make camera getPosition() callable from js 2014-11-04 12:39:50 -08:00
Philip Rosedale
558aa52d30 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 12:14:08 -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
Philip Rosedale
2a84149d15 Merge pull request #3728 from ey6es/master
Fix for lights/shadows on Oculus, as well as a couple fixes for 3DTV mode.
2014-11-04 12:01:03 -08:00