ZappoMan
133bbd81fe
small spacing change
2013-07-15 01:42:21 -07:00
ZappoMan
f078d646d7
small spacing change
2013-07-15 01:41:28 -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
ZappoMan
861ee9b389
Merge pull request #666 from tschw/master
...
fixes sliced-away initialization (crashes program during shutdown...
2013-07-14 12:32:41 -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
Philip Rosedale
8b9e0426b2
Simple glassy collision sound
2013-07-12 21:34:48 -07:00
Jeffrey Ventrella
3bc6b4c0d4
merge
2013-07-12 18:56:54 -07:00
Jeffrey Ventrella
915cb1e5bd
Merge remote-tracking branch 'upstream/master' into particles
2013-07-12 18:56:37 -07:00
Jeffrey Ventrella
ae99ca5ec8
added more API for the particle system
2013-07-12 18:55:42 -07:00
atlante45
3f6483d99c
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-12 18:02:06 -07: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
Stephen Birarda
0a3edb2f5b
Merge pull request #665 from PhilipRosedale/master
...
Tweaked skeleton smoothing and arms in view in 1P
2013-07-12 17:09:46 -07:00
Philip Rosedale
17fff564d0
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-12 17:01:09 -07:00
Philip Rosedale
832e81b45f
Less skeleton averaging, can see first person arms
2013-07-12 17:00:47 -07:00
Jeffrey Ventrella
d93edf0aca
Merge remote-tracking branch 'upstream/master' into particles
2013-07-12 16:20:11 -07:00
Jeffrey Ventrella
3649c89c12
more developing on the API for the particle system
2013-07-12 16:19:31 -07:00
ZappoMan
f9e142ef52
Merge pull request #664 from birarda/master
...
print packet version mismatch to the log
2013-07-12 16:15:31 -07:00
Stephen Birarda
0235993366
reset default packet version to 0
2013-07-12 16:00:44 -07:00
Stephen Birarda
3147ac3ac4
print packet version mismatch to Log
2013-07-12 15:54:12 -07:00
atlante45
412e732b0d
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-12 14:55:54 -07:00
atlante45
78645964c9
Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming
2013-07-12 14:54:05 -07:00
atlante45
35c00c739c
resizing avatar now handle the camera
2013-07-12 14:53:51 -07:00
Jeffrey Ventrella
48bf26fb28
Merge remote-tracking branch 'upstream/master' into particles
2013-07-12 14:41:48 -07:00
Jeffrey Ventrella
e6b751e538
more work on particle system
2013-07-12 14:32:14 -07:00
Stephen Birarda
ec48c6bf28
Merge pull request #663 from ZappoMan/occlusion_culling
...
tweaks to low res moving, made monochrome off by default
2013-07-12 14:27:47 -07:00
ZappoMan
85b1ce3051
tweaks to low res moving, made monochrome off by default
2013-07-12 14:11:35 -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
ZappoMan
934fa2e158
Merge pull request #645 from Ventrella/particles
...
version 1 of particle system
2013-07-12 13:14:37 -07:00
Stephen Birarda
93b122bc76
Revert "link STK to interface"
...
This reverts commit d55387f727
2013-07-12 13:12:52 -07:00
atlante45
0ab27d5ecf
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-12 13:08:22 -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
1c72362ed1
Merge pull request #661 from birarda/master
...
link STK to interface for sound generation
2013-07-12 11:18:52 -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
ZappoMan
a182c01b76
Merge pull request #659 from PhilipRosedale/master
...
Improvements to Avatar movement and jittering
2013-07-11 23:02:37 -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
9bf62436ea
Merge branch 'master' of git://github.com/worklist/hifi
2013-07-11 18:17: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
bc008624df
Merge pull request #658 from birarda/master
...
fix audio silence thanks to receive bail
2013-07-11 17:56:26 -07:00
Stephen Birarda
76dc01e84e
fix audio silence on receive bail
2013-07-11 17:55:59 -07:00
