Philip Rosedale
84b2bc14c0
Merge pull request #3526 from ey6es/metavoxels
...
Tweaks to the way dual contour edits are performed, added cuboid shape and made snapping to grid optional for boxes.
2014-10-03 09:08:18 -07:00
Andrzej Kapolka
bf1c7b17fe
Fix for texture coordinate generation.
2014-10-02 18:09:47 -07:00
Andrzej Kapolka
c67f421ea9
Generate additional vertices with different normals when normals differ by
...
"crease" angle.
2014-10-02 17:25:44 -07:00
Stephen Birarda
8cb258e14c
don't use just filename when searching in application framework
2014-10-02 14:35:54 -07:00
Andrzej Kapolka
27099f6dcd
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-02 13:03:00 -07:00
Andrzej Kapolka
4e19cc21f6
Remove the "box edit" in favor of using the spanner edit.
2014-10-02 13:01:39 -07:00
Andrzej Kapolka
bce0147776
Added aspect fields to cuboids.
2014-10-02 12:51:56 -07:00
Stephen Birarda
138e57bcd8
don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD
2014-10-02 11:16:25 -07:00
Stephen Birarda
172ee3d7dc
add failsafe for hydra load, look in app frameworks folder
2014-10-02 09:06:29 -07:00
Andrzej Kapolka
42e95f2b38
Working on spanner metavoxel edits.
2014-10-01 18:46:23 -07:00
Andrzej Kapolka
1ca212f43d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-01 11:55:27 -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
Andrzej Kapolka
14267e3902
Layout tweak.
2014-09-30 15:42:33 -07:00
Andrzej Kapolka
add7ad4d4e
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-30 15:21:27 -07:00
Andrzej Kapolka
5d2f6b98e2
Added erase buttons, initialize color editor on creation.
2014-09-30 15:20:24 -07:00
Andrzej Kapolka
70847ff3f9
Allow painting boxes that aren't grid-aligned; merged color and material
...
tools.
2014-09-30 14:53:19 -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
Andrzej Kapolka
001af5f982
Simplify the message situation by removing color-only edits.
2014-09-30 12:17:35 -07:00
Andrzej Kapolka
e01113d2a7
Simplifications suggested by Andrew.
2014-09-30 12:01:44 -07:00
Stephen Birarda
39ee62608b
ensure HAVE_SIXENSE is defined to define _sixenseLibrary
2014-09-30 11:35:53 -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
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
