Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18710 commits 71 branches 56 tags 1.2 GiB
Commit graph

18710 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Sam Gateau
a344d46871 fix std::bitset method 2014-11-04 18:05:04 -08:00
Sam Gateau
1eb49d3763 fixing template bracket issues 2014-11-04 17:54:54 -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
Sam Gateau
99eb46f218 Removed any checkGLError so they do not show 2014-11-04 17:10:17 -08:00
Sam Gateau
27aadd24b3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 16:43:26 -08:00
Sam Gateau
441d09a460 debugiing the mysterious glError coming from glFrustum 2014-11-04 16:42:58 -08:00
Sam Gateau
4afa0b4188 more GL error checking 2014-11-04 15:52:25 -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
Sam Gateau
66d732fc33 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 14:52:22 -08:00
Sam Gateau
c842060dc5 fix names for stream and Batch interface 2014-11-04 14:51:57 -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
Stephen Birarda
b968f05123 use a new cursor for selection in lobby 2014-11-04 11:54:14 -08:00
Andrzej Kapolka
f00c54c23c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 11:45:23 -08:00
Andrzej Kapolka
03ce8081a4 Oh, when will I learn not to use "near" and "far" as variable names? 2014-11-04 11:44:47 -08:00
Stephen Birarda
f53455ee55 use a ray from the near clip for action ray 2014-11-04 11:40:47 -08:00
AndrewMeadows
61d5bfc751 Merge pull request #3730 from ZappoMan/deadcode 
removed some dead code
 2014-11-04 11:09:24 -08:00