Commit graph

18543 commits

Author SHA1 Message Date
ZappoMan
542d671e54 cleanup entity scripts when changing domains or entity is deleted 2014-11-06 20:01:09 -08:00
ZappoMan
55576e7f9d fix crash in mouse messages while quitting 2014-11-06 17:53:22 -08:00
ZappoMan
c1385a9c35 fix random crash on checkEnterLeaveEntities 2014-11-06 17:41:55 -08:00
ZappoMan
bceab4ead9 clear all octree related state when disconnecting from a domain 2014-11-06 17:25:49 -08:00
Andrzej Kapolka
372d8946d0 Merge pull request #3749 from ZappoMan/entityBugs
Fix the bug where sometimes entity changes don't get sent to all viewers
2014-11-06 15:19:35 -08:00
AndrewMeadows
efd9626c2f Merge pull request #3740 from samcake/temp0
Introduce the input stream stage to the gpu::Batch and apply it for model rendering
2014-11-06 14:14:08 -08:00
Brad Hefta-Gaub
ca7b975c6a Merge pull request #3748 from ey6es/master
Light radius fix: fixed winding order issues with spheres/cones, use near radius to detect when the near window is inside the light volume.
2014-11-06 14:11:13 -08:00
Sam Gateau
bed524716d Removed all the prefix to the enum values, since all the enums are in the gpu scope we consider its good to avoid name colisions 2014-11-06 14:01:43 -08:00
ZappoMan
768a854b00 cleanup 2014-11-06 14:00:26 -08:00
ZappoMan
90b079d5a8 remove debug 2014-11-06 13:51:48 -08:00
ZappoMan
3c7b06f1d2 quiet some debug 2014-11-06 13:45:38 -08:00
ZappoMan
5333f0eb19 quiet some debug 2014-11-06 13:45:30 -08:00
ZappoMan
2b62402a57 possible fix for entities not always updating bug 2014-11-06 13:17:46 -08:00
Andrzej Kapolka
788f1b91c0 Use near radius as threshold, since we need to switch to full screen rendering
whenever any point of the near window intersects the light volume.
2014-11-06 12:54:49 -08:00
Andrzej Kapolka
2c0b8c9172 Winding order fixes. 2014-11-06 12:45:02 -08:00
Sam Gateau
b0189efcdf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-06 10:56:54 -08:00
Sam Gateau
820c0798aa In BufferStream, clean up the constructor and destructor 2014-11-06 10:43:54 -08:00
Sam Gateau
2d06e71e32 Remove double definition of static const arrays for Types and Dimensions 2014-11-06 10:42:14 -08:00
Sam Gateau
5a51a99f76 Fixing missing brackets after if 2014-11-06 10:40:06 -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
Sam Gateau
2b27af51f1 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-05 09:35:26 -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
Sam Gateau
562ecc8e3a fix glLight attenuation bad values by filtering before glcall 2014-11-04 18:18:24 -08:00
Andrzej Kapolka
52d0b15979 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 18:13:58 -08:00