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
Philip Rosedale
4b8003948a
Merge branch 'master' of https://github.com/worklist/hifi
2014-09-29 10:52:19 -07:00
Stephen Birarda
eb7ee36168
use two dashes for url as command line option
2014-09-29 10:29:40 -07:00
Stephen Birarda
bd4a32551b
fix for settings save without organization
2014-09-29 10:09:33 -07:00
Stephen Birarda
46258ae78f
add a tooltip to say why locked settings cannot be changed
2014-09-29 10:02:01 -07:00
Stephen Birarda
58b03c7ef2
disable form inputs for values set by master config
2014-09-29 09:53:27 -07:00
Stephen Birarda
ec0805acc5
add locked settings to json return for auth'ed settings
2014-09-29 09:34:04 -07:00
Stephen Birarda
5e2870ac5f
require a distinction between master config and user config
2014-09-29 09:30:08 -07:00
David Rowe
c02cd66dcb
Don't calibrate avatar for Leap Motion if mounted on HMD
2014-09-28 17:19:47 -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
Brad Hefta-Gaub
e751605647
Merge pull request #3500 from Atlante45/fix_chat_shortcut
...
Fix chat shortcut
2014-09-26 20:39:07 -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
533d59becc
Merge pull request #3499 from Atlante45/radio_js
...
Stereo fix
2014-09-26 20:04:55 -07:00
Atlante45
5a8b9082b2
Check _currentSendPosition instead of overriding
2014-09-26 19:47:26 -07:00
Andrzej Kapolka
8ebb2a7fb4
Ridiculously complicated minimization code.
2014-09-26 19:32:41 -07:00
Atlante45
dfe70ed2e3
Initialize InjectedAudioStream with correct stereo value
2014-09-26 19:23:36 -07:00
Philip Rosedale
11395a0e10
Merge branch 'master' of https://github.com/worklist/hifi
2014-09-26 17:03:44 -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
Leonardo Murillo
bf380391c2
Merge pull request #3498 from birarda/domain-wizard
...
fix for ds static assignments from queue
2014-09-26 17:41:01 -06:00
Stephen Birarda
ae542419d1
fix for static assignments from queue
2014-09-26 16:36:18 -07:00
Brad Hefta-Gaub
e145b988b1
Merge pull request #3494 from birarda/master
...
cleanup for ifdef'ed glm::vec3 getters in OculusManager
2014-09-26 16:26:35 -07:00
ZappoMan
cbc502553b
add rescale support to entity properties UI
2014-09-26 16:25:24 -07:00
Stephen Birarda
4559c8a9ca
Merge pull request #3496 from birarda/domain-wizard
...
fix for domain-server allowed roles
2014-09-26 16:24:24 -07:00
Stephen Birarda
9e02a36d3d
fix for domain-server allowed roles
2014-09-26 16:23:57 -07:00
Stephen Birarda
3f517bef82
Merge pull request #3495 from birarda/domain-wizard
...
fix for role lookup in domain-server
2014-09-26 16:21:36 -07:00
Stephen Birarda
d389f13e1b
fix for role lookup in domain-server
2014-09-26 16:21:12 -07:00
Philip Rosedale
c276523afd
Merge branch 'master' of https://github.com/worklist/hifi
2014-09-26 15:55:41 -07:00
Stephen Birarda
bd73c950ac
cleanup for eyePosition ifdef HAVE_LIBOVR
2014-09-26 15:44:10 -07:00
Stephen Birarda
7c738edbd8
Merge pull request #3488 from PhilipRosedale/master
...
Correct eye contact for Oculus users
2014-09-26 15:42:03 -07:00
Philip Rosedale
2f609bb711
Merge pull request #3492 from birarda/domain-wizard
...
initial re-tooling of domain-server settings for metaverse setup
2014-09-26 15:40:44 -07:00
Philip Rosedale
3ea9923240
Merge pull request #3493 from ZappoMan/moreWorkOnCollidingEntitites
...
handled multiple collisions correctly, and don't collide if fully enclosed
2014-09-26 15:33:54 -07:00
Atlante45
6df430660d
Uninitialized member
2014-09-26 15:23:17 -07:00
Stephen Birarda
ae5a7b40a6
don't symlink the web directory on WIN32
2014-09-26 15:19:40 -07:00
ZappoMan
7bea4b3123
also honor ignore collisions for voxels and avatars
2014-09-26 15:12:59 -07:00
Stephen Birarda
42d40d5a13
some help text cleanup for audio settings
2014-09-26 15:11:12 -07:00
ZappoMan
bbd476d564
handled multiple collisions correctly, and don't collide if fully enclosed
2014-09-26 14:55:05 -07:00
Stephen Birarda
6bc81e6ff4
use panels on main domain-server page
2014-09-26 14:45:32 -07:00
Stephen Birarda
e8c3fa3cf1
use ID from new domain settings, don't disable save button
2014-09-26 14:39:50 -07:00
Stephen Birarda
3cbfad69cd
fix indentation issues for merged AddressBarDialog classes
2014-09-26 14:32:59 -07:00
Stephen Birarda
e75a2d355e
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-wizard
2014-09-26 14:31:52 -07:00
Stephen Birarda
cccacf4e6a
disable the save button if no settings are changed
2014-09-26 14:31:44 -07:00
Stephen Birarda
bbf111a9a0
disable the save button when nothing has changed
2014-09-26 14:27:29 -07:00
Stephen Birarda
5b2b0c47c0
Merge pull request #3483 from stojce/20061
...
Code Review for Job #20061
2014-09-26 14:24:44 -07:00
Stephen Birarda
05b80e3fb4
remove scrollspy while sections are not large enough
2014-09-26 14:21:49 -07:00
