David Rowe
b70c1a4960
Merge branch 'master' into 20639
2015-08-07 12:33:13 -07:00
David Rowe
ea03067a02
When eye tracking data is lot for > N seconds handle as "not tracking"
...
Revert to default look-at behaviour and saccades until tracking resumes.
2015-08-07 12:23:43 -07:00
David Rowe
e2bf5cad3e
Resume eye tracking at start-up if was running at shut-down
2015-08-07 11:59:11 -07:00
Stephen Birarda
e9f2cadfff
Update BUILD_OSX.md
2015-08-07 10:49:20 -07:00
Stephen Birarda
eec382ade8
Merge pull request #5513 from bwent/domain-server-authentication
...
Add connection token UUId to sign with username when connecting to domain-server
2015-08-07 10:05:00 -07:00
Brad Hefta-Gaub
a10d310403
Merge pull request #5526 from samcake/daft
...
Fix the multi part per mesh with various opacity level issue
2015-08-07 08:57:31 -07:00
David Rowe
e37fd956ed
Fix look-at target position getting stuck when avatar moves out of range
2015-08-06 22:51:25 -07:00
David Rowe
738c5658fa
Guard against NaNs in eye tracker look-at position
2015-08-06 20:46:51 -07:00
Seth Alves
66f595f4b2
Merge pull request #5520 from howard-stearns/single-animation-vs-blend
...
Don't let individual startAnimation get messed up by blend/fade.
2015-08-06 18:55:14 -07:00
Sam Gateau
e4ce1002ea
cleaning th ecode
2015-08-06 18:54:58 -07:00
Sam Gateau
561a058dc8
cleaning th ecode
2015-08-06 18:53:21 -07:00
Sam Gateau
f0f141a2b4
SImple fix to the case of multiple material in a mesh with different opacity
2015-08-06 18:51:44 -07:00
David Rowe
427b8b973c
Fix excluding saccades when doing eye tracking
2015-08-06 17:20:03 -07:00
David Rowe
551c00dc23
Fix look-at position calculation when in HMD display
...
Calculate look-at target from camera position and orientation.
Render own look-at vectors from camera eye positions.
Draw other avatar's look-at vectors from their eyeballs.
With and without eye trackers.
2015-08-06 16:41:06 -07:00
Brad Hefta-Gaub
0947bf2cd0
Merge pull request #5517 from samcake/punk
...
Improving the quality of the normal encoding in the Deferred Buffer
2015-08-06 15:13:08 -07:00
samcake
db7e457325
Merge pull request #5521 from huffman/fix-billboard-backface
...
Disable back-face culling when rendering BillboardOverlay
2015-08-06 14:14:16 -07:00
Ryan Huffman
cefb7be51d
Disable back-face culling when rendering BillboardOverlay
2015-08-06 14:09:32 -07:00
Howard Stearns
02f57286e4
Don't let individual startAnimation get messed up by blend/fade.
2015-08-06 11:30:18 -07:00
bwent
ffccc9ca96
clean up formatting, make connectionUUID const in NodeList
2015-08-06 10:11:22 -07:00
bwent
73ea958640
add check if user is local user
2015-08-06 09:01:25 -07:00
Brad Davis
9215ea8894
Merge pull request #5516 from Atlante45/warnings
...
Fix warning and remove unused headers
2015-08-05 19:12:09 -07:00
Brad Davis
37dc2d00cd
Merge pull request #5515 from sethalves/zlib-in-build-instructions
...
update build instructions -- interface now depends on zlib
2015-08-05 19:10:42 -07:00
bwent
a8f9f9d746
clean-up formatting
2015-08-05 17:43:03 -07:00
samcake
07a9dd3404
Ready for release
2015-08-05 17:41:23 -07:00
Sam Gateau
7be736d6de
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-08-05 17:17:30 -07:00
Sam Gateau
95682e6270
Introducing the Normal fitting algorithm for better normal in the deferred buffer
2015-08-05 17:17:00 -07:00
David Rowe
d7b42e264e
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-08-05 16:49:06 -07:00
Atlante45
3dc8bd47ae
Fix warning and remove unused headers
2015-08-05 16:46:44 -07:00
Seth Alves
12286b7e9b
Merge pull request #5514 from howard-stearns/only-update-motion-state-for-my-avatar
...
Don't try to animate other people's avatars!
2015-08-05 16:17:22 -07:00
Seth Alves
bee21b13b7
interface now depends on zlib. describe how to install on windows
2015-08-05 16:13:25 -07:00
bwent
45e3eafce3
Remove ERR_get_error call
2015-08-05 16:00:25 -07:00
Howard Stearns
ca6d798aa5
Don't try to animate other people's avatars!
2015-08-05 15:59:22 -07:00
bwent
ab2b54a6b2
Add connection token to sign with username when connecting to domain-server
2015-08-05 15:33:59 -07:00
samcake
a4f105f6c3
Merge pull request #5495 from highfidelity/core
...
Update the rendering pipeline to use OpenGL 4.1 Core profile everywhere
2015-08-05 15:10:46 -07:00
Stephen Birarda
998a8168a3
remove an extra unneeded message
2015-08-05 14:38:14 -07:00
Stephen Birarda
653e0d29c7
resolve conflicts on merge with upstream/core
2015-08-05 14:37:30 -07:00
Stephen Birarda
078e60076c
don't set a default build type
2015-08-05 14:34:00 -07:00
Stephen Birarda
6c337b8aeb
repairs for build type of glew external
2015-08-05 14:30:36 -07:00
bwent
8868148c94
Parital fix for padding error using RSA_sign and RSA_verify
2015-08-05 14:07:25 -07:00
Bradley Austin Davis
252677e1c2
Fix MD5 of glew dep
2015-08-05 14:02:14 -07:00
Bradley Austin Davis
89cc2ccfa5
More merge comments
2015-08-05 13:53:19 -07:00
Bradley Austin Davis
649b9d6ce9
Fixing signed/unsigned comparisons
2015-08-05 13:48:05 -07:00
Brad Davis
754bf5c6f7
Merge pull request #5509 from birarda/core
...
get GLEW for all platforms as external project
2015-08-05 13:41:48 -07:00
David Rowe
e8eac7db34
Render look-at vectors and target in first person view
2015-08-05 13:40:57 -07:00
David Rowe
a15943d941
Increase size of look-at target sphere
2015-08-05 13:39:26 -07:00
Brad Davis
5723d2689b
Merge pull request #5510 from SamGondelman/core
...
Core Profile: Merge from master
2015-08-05 12:52:37 -07:00
Sam Gondelman
513c652ab3
merge from master and attempt to fix connexion conflicts
2015-08-05 12:42:39 -07:00
Stephen Birarda
34e188fe6e
log more of the steps for glew external project
2015-08-05 12:35:37 -07:00
Stephen Birarda
cc909507f4
get GLEW for all platforms as external project
2015-08-05 12:34:11 -07:00
David Rowe
3be2ddf234
Fix calibration menu item actions
2015-08-05 12:05:04 -07:00
