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
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
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
ZappoMan
cbc502553b
add rescale support to entity properties UI
2014-09-26 16:25:24 -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
Stephen Birarda
3cbfad69cd
fix indentation issues for merged AddressBarDialog classes
2014-09-26 14:32:59 -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
AndrewMeadows
7f7861671e
Merge pull request #3471 from ctrlaltdavid/20055
...
Code Review for Job #20055
2014-09-26 14:00:33 -07:00
Andrzej Kapolka
aa0b3a18ef
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-26 13:53:23 -07:00
Andrzej Kapolka
efa22d931f
If we're rendering the billboard, don't render the body.
2014-09-26 13:48:11 -07:00
Andrzej Kapolka
3fe6e30632
Working on QR decomposition.
2014-09-26 13:43:28 -07:00
David Rowe
c0419c61f4
Fix missing constructor initialization
2014-09-26 09:15:17 -07:00
David Rowe
aa9511c263
Position Rift camera at avatar model's mid-eye location
2014-09-25 22:49:12 -07:00
Philip Rosedale
597871442e
fix linux build fail
2014-09-25 17:39:53 -07:00
Philip Rosedale
3fd1ab40e4
remove magic number
2014-09-25 16:17:05 -07:00
Philip Rosedale
1d4b86d85b
Blink first with one eye and at slightly different speeds, look back and forth exactly at eyes when receiving gaze in Oculus
2014-09-25 16:00:56 -07:00
stojce
5610cfeb34
CR fixes
2014-09-26 00:57:56 +02:00
stojce
6a3bc8f255
Merge branch 'master' of https://github.com/highfidelity/hifi into 20061
2014-09-25 23:57:19 +02:00
Philip Rosedale
693bc11868
Merge branch 'master' of https://github.com/worklist/hifi
2014-09-25 11:59:14 -07:00
Philip Rosedale
7836fd8a85
Add world space eye locations (for making eye contact) to the oculus manager
2014-09-25 11:58:41 -07:00
Andrzej Kapolka
7de108f493
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-25 11:22:19 -07:00
AndrewMeadows
697c7f6a61
Merge pull request #3481 from ZappoMan/collidingEntities
...
First cut at colliding entities
2014-09-25 09:38:50 -07:00
Brad Hefta-Gaub
84630a8f74
Merge pull request #3484 from huffman/20024
...
Code Review for Job #20024
2014-09-25 09:33:58 -07:00
Brad Hefta-Gaub
0775e9dde4
Merge pull request #3479 from PhilipRosedale/master
...
Improved eye contact, audio driven mouth and brows, linear audio scope
2014-09-25 09:32:37 -07:00
Brad Hefta-Gaub
712f88baa3
Merge pull request #3476 from birarda/xbox-controller
...
add script support for general SDL controllers
2014-09-25 09:25:08 -07:00
Philip Rosedale
fcc5eb9d0a
Tuning of audio-driven mouths and brows to look better and not stay open
2014-09-24 16:37:55 -07:00
ZappoMan
6b8c9bba42
improved debug in entity renderer
2014-09-24 16:05:04 -07:00
ZappoMan
f43ba4a68b
first cut at getting entities to collide
2014-09-24 15:28:04 -07:00
Philip Rosedale
75e536235c
Avatars look at your camera, not your avatar. Improvements to lookAt code
2014-09-24 14:38:44 -07:00
stojce
039deb8b42
added go button active state icon
2014-09-24 23:26:34 +02:00
Stephen Birarda
3ab24d6ea5
add a missing HAVE_SDL block
2014-09-24 11:59:44 -07:00
Stephen Birarda
875c1dba72
change name in header comment to match new class name
2014-09-24 08:40:39 -07:00
stojce
92cb17cbbe
Merge branch 'master' of https://github.com/highfidelity/hifi into 20061
...
Conflicts:
interface/src/Menu.h
2014-09-24 09:25:04 +02:00
Stephen Birarda
9348888ae5
map PrioVR to new JoystickScriptingInterface
2014-09-23 17:42:48 -07:00
Stephen Birarda
13d3eb02e3
report the 360 axis values in xbox.js
2014-09-23 17:19:57 -07:00
Stephen Birarda
d50c81e4a1
add a property for number of buttons in Joystick
2014-09-23 17:10:25 -07:00
Stephen Birarda
00b0806c4d
move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick
2014-09-23 17:09:46 -07:00
stojce
8031454f61
use backslash to activate chat
2014-09-24 00:22:51 +02:00
stojce
c14bf84af8
layout fix
2014-09-24 00:14:00 +02:00
Stephen Birarda
900daf48eb
initial working connection of an xbox gamepad
2014-09-23 14:48:44 -07:00
Ryan Huffman
1ee01fdab3
Merge branch 'master' of github.com:highfidelity/hifi into 20024
2014-09-23 14:10:00 -07:00
