Commit graph

18470 commits

Author SHA1 Message Date
Stephen Birarda
c8aeab53ba changes for C++11 support 2014-11-05 11:42:18 -08:00
Stephen Birarda
874ccf0708 add FindLibcuckoo module and instructions for dropping in libcuckoo 2014-11-05 10:57:06 -08: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
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
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
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
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
AndrewMeadows
d7234d5995 Merge pull request #3731 from ctrlaltdavid/20138
CR for Job #20138 - Repopulate example default models for "Upload URL" to better sized models
2014-11-04 11:08:47 -08:00
ZappoMan
a89287e404 reset the QElapsedTimer in usecTimestampNow() periodically to prevent error 2014-11-04 11:01:37 -08:00
Stephen Birarda
8452182b45 replace position and orientation calls in lobby 2014-11-04 10:43:09 -08:00
Stephen Birarda
303e8f6da9 more js changes for changes to camera interface 2014-11-04 10:41:36 -08:00
Stephen Birarda
fe0d593ac4 expose camera mode as property and leverage in scripts 2014-11-04 10:41:13 -08:00
Stephen Birarda
81ef722ef8 update camera calls in JS to use new mode methods 2014-11-04 10:35:41 -08:00
Stephen Birarda
790aa848ae leverage Camera object for scripting, remove sep interface 2014-11-04 10:33:55 -08:00
Stephen Birarda
957705998f fix an uninitialized action ray when hitting spacebar 2014-11-04 10:19:56 -08:00
Stephen Birarda
99219a1758 use actionRay in lobby script 2014-11-04 10:17:00 -08:00
Brad Hefta-Gaub
37d95b7f82 Merge pull request #3733 from huffman/inspect-tool-fixes
Inspect tool fixes
2014-11-04 10:13:59 -08:00
Ryan Huffman
2e8e31fce9 Update inspect tool behavior to pan correctly 2014-11-04 10:06:45 -08:00
Ryan Huffman
573e6f119f Add entity camera options to settings 2014-11-04 10:06:17 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
David Rowe
4fdc00948f Repopulate example models in newEditEnties.js too 2014-11-04 09:39:37 -08:00
David Rowe
fd8fb32190 Repopulate example models for "Upload URL" to better sized models 2014-11-04 09:33:39 -08:00
Ryan Huffman
fc977e21e6 Remove print statements 2014-11-04 09:14:14 -08:00
ZappoMan
af1b69d8a1 removed some dead code 2014-11-04 09:01:45 -08:00
Brad Hefta-Gaub
1707025bd0 Merge pull request #3729 from huffman/inspect-tool
Add inspect tool functionality to newEditModels.js
2014-11-04 08:54:31 -08:00
AndrewMeadows
2083a4dd89 Merge pull request #3727 from birarda/domain-tunnel
report restricted access state from domain-server in heartbeat
2014-11-04 08:42:39 -08:00
Ryan Huffman
a3fa1e4ce8 Merge branch 'master' of github.com:highfidelity/hifi into inspect-tool 2014-11-04 08:32:58 -08:00
Ryan Huffman
185b9ac545 Add Inspect tool to newEditEntities 2014-11-04 08:32:21 -08:00
Ryan Huffman
640c2c5fbf Add optional orientation easing to entity camera 2014-11-04 08:30:10 -08:00