ZappoMan
f59185c00b
allow 3d overlays to be ignored from ray intersection
2014-10-03 03:02:54 -07:00
ZappoMan
175e5d5f79
add ray picking to 3D overlays
2014-10-02 20:44:49 -07:00
ZappoMan
a04941bcd5
removed some old debug
2014-10-02 17:56:31 -07:00
ZappoMan
d666f9ce98
Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements
...
Conflicts:
examples/editModels.js
2014-10-02 15:17:59 -07:00
Stephen Birarda
138e57bcd8
don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD
2014-10-02 11:16:25 -07:00
ZappoMan
5bcbfe96b8
add alpha color support to billboard overlay
2014-10-02 10:19:08 -07:00
ZappoMan
b2e725c964
add dashed line support to cube overlay
2014-10-02 10:18:42 -07:00
Stephen Birarda
172ee3d7dc
add failsafe for hydra load, look in app frameworks folder
2014-10-02 09:06:29 -07:00
ZappoMan
94c2540db0
add dashed line drawing to Base3DOverlay and 3d line and rectangle overlays
2014-10-01 09:45:20 -07:00
ZappoMan
7a9be9e5b9
implement support for localRenderAlpha property in the rendering portion of entities
2014-10-01 09:43:59 -07:00
Philip Rosedale
8f40780af0
Merge pull request #3517 from ctrlaltdavid/20048
...
CR for Job #20048 - Leap - Make leapHands.js work with Leap-on-Rift
2014-09-30 21:06:45 -07:00
ZappoMan
c3b0700601
introduce Planar3DOverlay for common features of rectangle and circle, introduced rectanglular 3D plane
2014-09-30 14:52:44 -07:00
Thijs Wenker
fd21d100f6
line indention fixes
2014-09-30 22:37:29 +02:00
Thijs Wenker
bacad6bcd2
Merge branch 'editmodels_js-model-list' of https://github.com/thoys/hifi
2014-09-30 22:33:50 +02:00
Thijs Wenker
110e26a9e9
Merge branch 'master' of https://github.com/worklist/hifi
2014-09-30 22:32:35 +02:00
Thijs Wenker
7f34079d8f
cleared comment
2014-09-30 22:31:41 +02:00
Philip Rosedale
e624058c14
Merge pull request #3514 from birarda/hydra-crash
...
fix for debug build without sixense library
2014-09-30 13:24:17 -07:00
Thijs Wenker
eed6e2e8f6
- Edit -> Model List menu option
...
- Combo items can be JS objects now, write a toString() function for each JS object to describe them
2014-09-30 22:11:21 +02:00
Stephen Birarda
39ee62608b
ensure HAVE_SIXENSE is defined to define _sixenseLibrary
2014-09-30 11:35:53 -07:00
ZappoMan
7fc6eecca7
added support for dashed lines for 3D Circle overlays
2014-09-30 11:27:16 -07:00
ZappoMan
16cdc2614f
added circle overlays
2014-09-30 10:06:39 -07:00
David Rowe
673afca11b
Update camera object's position and orientation with actual Rift values
2014-09-30 10:05:59 -07:00
Andrzej Kapolka
3c1f3b77a7
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-29 19:14:47 -07:00
Andrzej Kapolka
802b14d5ab
Use Jacobi eigenvalue algorithm to get eigenvalues/eigenvectors.
2014-09-29 19:14:17 -07:00
Stephen Birarda
e512b05e62
add extra debug for hydra library initialization
2014-09-29 17:28:50 -07:00
Stephen Birarda
f047c2dff0
have OS X hydra support be disabled by default
2014-09-29 17:08:06 -07:00
ZappoMan
bffd236640
add glowLevel, and pulse to all overlays
2014-09-29 16:44:40 -07:00
Stephen Birarda
2fbd249d9f
fix reset password link for LoginDialog
2014-09-29 16:38:10 -07:00
Stephen Birarda
3c236cc60a
resolve conflicts on merge with upstream master
2014-09-29 16:00:50 -07:00
David Rowe
1bffaa262d
Reference camera object rather than copy it
2014-09-29 15:46:22 -07:00
AndrewMeadows
c8882d68dd
Merge pull request #3503 from birarda/domain-wizard
...
lock changes to settings in the domain-server master config file
2014-09-29 15:41:29 -07:00
Andrzej Kapolka
4c617c6d55
Stop using the emissive color for glow.
2014-09-29 14:51:45 -07:00
Andrzej Kapolka
72ff908bd3
Fix for metavoxel crashes on Windows. I was expecting the scope of a
...
temporary object to last until the next line; turns out VC++ can destroy
it in the middle of evaluating the line.
2014-09-29 14:37:11 -07:00
Stephen Birarda
a847c2d80d
move url handling to after settings load debug
2014-09-29 13:15:28 -07:00
Stephen Birarda
3fbf141686
handle avatar location changes after avatar position has been reloaded
2014-09-29 13:14:25 -07:00
Stephen Birarda
1f4c0b6340
wrap sixenseExit call in HAVE_SIXENSE ifdef
2014-09-29 13:09:25 -07:00
Stephen Birarda
db0bfd53ae
make the sixense library name a constant
2014-09-29 12:58:40 -07:00
Stephen Birarda
f7a17b7dec
dynamically load sixense lib on OS X to make avoiding hid_init crash easier
2014-09-29 12:58:01 -07:00
Andrzej Kapolka
9855fbcfb4
Don't bother using a callback to render the eye vectors; just rely on the
...
post-lighting call to Avatar::render, like everything else. This should fix
the crash that Philip was seeing (presumably due to avatars' being deleted
during the draw process).
2014-09-29 11:45:12 -07:00
Stephen Birarda
eb7ee36168
use two dashes for url as command line option
2014-09-29 10:29:40 -07:00
David Rowe
6375e42d88
Configure Leap controller per HMD option when controller is created
2014-09-28 17:19:14 -07:00
David Rowe
5c406a0e06
Add "Leap Motion on HMD" developer menu option
2014-09-28 17:18:46 -07:00
Brad Hefta-Gaub
a701bcea7b
Merge pull request #3502 from ctrlaltdavid/20055
...
Make default eye model calculation be reliable
2014-09-28 12:06:03 -07:00
Clément Brisset
6d3bdd862b
Merge pull request #3501 from ey6es/metavoxels
...
Use the rather elaborate technique described in the Rice papers to find the minimizing point for each cell.
2014-09-27 19:52:42 -07:00
David Rowe
dbf6daf80c
Fix default eye model calculation to be reliable
2014-09-27 11:25:37 -07:00
Andrzej Kapolka
681bb60d03
Could extra comments.
2014-09-26 20:24:24 -07:00
Andrzej Kapolka
1cbbcdaedc
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-26 20:11:47 -07:00
Atlante45
7d78584aee
Fix chat shortcut
2014-09-26 20:11:14 -07:00
Andrzej Kapolka
8ebb2a7fb4
Ridiculously complicated minimization code.
2014-09-26 19:32:41 -07:00
Philip Rosedale
9b228c9e37
Merge pull request #3497 from ZappoMan/entityPropsRescale
...
add rescale support to entity properties UI
2014-09-26 16:42:15 -07:00
