Andrzej Kapolka
d8d9f5e315
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-15 16:54:29 -07:00
Philip Rosedale
7075258317
Merge pull request #673 from Atlante45/better_import
...
Better import
2013-07-15 16:20:01 -07:00
Andrzej Kapolka
d5abb3e6eb
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-15 16:15:12 -07:00
Andrzej Kapolka
4f1e786392
Fix for iris rendering; was broken by scale change.
2013-07-15 16:12:23 -07:00
Andrzej Kapolka
fdeb63c121
More work on face points.
2013-07-15 16:09:49 -07:00
atlante45
bf328c8532
Improved import system copying to clipboard
2013-07-15 16:07:50 -07:00
Eric Johnston
e937f86822
Build fail fix when Leap libs are not present.
2013-07-15 14:33:09 -07:00
Eric Johnston
0239341127
updated per feedback
2013-07-15 14:27:58 -07:00
Eric Johnston
c61966ebcd
made Leap unit-conversion method public
2013-07-15 14:12:52 -07:00
Eric Johnston
86faa33f83
Added fake Leap finger generation so that Ryan and Jeffrey can work on Leap glove-code without needing a Leap sensor at all times.
2013-07-15 13:56:37 -07:00
Andrzej Kapolka
6c587af6ac
Merge branch 'master' of https://github.com/worklist/hifi into pointy
...
Conflicts:
interface/src/avatar/Head.cpp
2013-07-15 13:13:51 -07:00
Andrzej Kapolka
5c590638f3
Working on mesh rendering for faces.
2013-07-15 13:12:22 -07:00
atlante45
423a0eaac8
Fixed typo
2013-07-15 12:28:22 -07:00
atlante45
fbcacc8cf7
Few pre-review change for avatar resizing
2013-07-15 12:11:29 -07:00
atlante45
bf3c4fa1f8
Avatar resizing final commit
2013-07-15 12:04:24 -07:00
atlante45
078a47b006
Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming
2013-07-15 12:03:04 -07:00
ZappoMan
f415f4081a
Fixed a bug in LOD boundaries
...
- changed the way we calculate whether or not to render a parent "average" voxel so
that if any of it's most distant child would not be visible, then it's used instead
of it's children
- added precalculated value for topFarLeft corner of AABox (optimization)
- changed VoxelSystem::newTreeToArrays() and VoxelTree::encodeTreeBitstreamRecursion()
to use the same help function for determining this LOD boundary behavior
- deleted old dead code in voxel-server and VoxelTree for picking which node to start
sending with, since it wasn't being used
- added VoxelNode::furthestDistanceToCamera() which tells you not the distance to the
center of the voxel, but the distance from the camera to the furthest corner relative
to the camera.
- added ViewFrustum::getFurthestPointFromCamera() which given an axis-aligned box will
tell you which vertex of the box is furthest from the camera
2013-07-15 01:32:14 -07:00
Andrzej Kapolka
a59fbfbf3e
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-14 18:21:50 -07:00
Andrzej Kapolka
411cb92300
Working on face rendering as point cloud.
2013-07-14 15:54:29 -07:00
tosh
ac3b95efe7
fixes sliced-away initialization (crashes program during shutdown when running without audio device)
2013-07-13 22:51:57 +02:00
atlante45
34cbe317fa
Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming
...
Conflicts:
interface/src/Avatar.cpp
interface/src/Webcam.cpp
2013-07-12 17:57:20 -07:00
atlante45
280afed7f0
added scale in avatar packets eand slots to change it from the menu
2013-07-12 17:51:47 -07:00
Philip Rosedale
832e81b45f
Less skeleton averaging, can see first person arms
2013-07-12 17:00:47 -07:00
Andrzej Kapolka
763e6a2fa1
Merge branch 'master' of https://github.com/worklist/hifi into pointy
...
Conflicts:
interface/src/Application.h
2013-07-12 15:34:55 -07:00
atlante45
35c00c739c
resizing avatar now handle the camera
2013-07-12 14:53:51 -07:00
atlante45
16647e3591
Resolve conflict
2013-07-12 13:27:46 -07:00
Stephen Birarda
5044139374
Merge pull request #662 from birarda/master
...
revert linking of STK to interface
2013-07-12 13:16:30 -07:00
ZappoMan
006929e45b
Merge pull request #660 from PhilipRosedale/master
...
Add speed brakes for better flying/walking
2013-07-12 13:15:22 -07:00
Stephen Birarda
93b122bc76
Revert "link STK to interface"
...
This reverts commit d55387f727
2013-07-12 13:12:52 -07:00
Jeffrey Ventrella
c348c5ec35
Merge remote-tracking branch 'upstream/master' into particles
2013-07-12 12:12:25 -07:00
Jeffrey Ventrella
106d7c225a
turned on particle system viewing for pull request
2013-07-12 12:11:51 -07:00
Stephen Birarda
d55387f727
link STK to interface
2013-07-12 11:18:15 -07:00
Philip Rosedale
e756fdbee6
Add speed brakes for better flying/walking
2013-07-12 08:28:50 -07:00
Philip Rosedale
4e9530f946
Body slowly turns to follow touch look
2013-07-11 22:31:31 -07:00
Philip Rosedale
4e89c679b9
Oculus will work with touch look (hopefully)
2013-07-11 21:51:13 -07:00
Philip Rosedale
d2dd41ba0f
make thrust be in direction of head/view
2013-07-11 21:46:13 -07:00
Philip Rosedale
6609a850eb
Gyros and touch look now work at same time
2013-07-11 21:34:42 -07:00
Philip Rosedale
670de73384
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-11 19:52:39 -07:00
Philip Rosedale
4b95f2bae5
Better thrust values and no jittering when standing
2013-07-11 19:10:34 -07:00
Atlante45
08b0afd466
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 18:17:06 -07:00
Atlante45
d84963040e
avatar resized + physic adapted
2013-07-11 18:16:55 -07:00
Stephen Birarda
76dc01e84e
fix audio silence on receive bail
2013-07-11 17:55:59 -07:00
Atlante45
12bbec66af
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 17:22:36 -07:00
Eric Johnston
58b50067ad
Some Leap finger fixes, but also temporarily disable Leap data sending, due to a crash.
...
Will resolve the crash before re-enabling.
2013-07-11 16:06:31 -07:00
Philip Rosedale
678b30f494
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-11 15:53:19 -07:00
Philip Rosedale
79b2703e1c
Improve avatar movement, added Physics.cpp for routines to help with physics calculations
2013-07-11 15:53:07 -07:00
Andrzej Kapolka
61f6b8b974
Moved all the avatar bits to their own subdirectory.
2013-07-11 14:53:46 -07:00
Atlante45
7f0ab0289e
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 14:10:40 -07:00
Andrzej Kapolka
c3242598f5
Merge pull request #655 from ZappoMan/occlusion_culling
...
Make Delta Sending Default, Added option for "Low Res" mode while moving
2013-07-11 14:08:22 -07:00
ZappoMan
c26e39764a
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-11 13:50:33 -07:00
