Commit graph

3134 commits

Author SHA1 Message Date
ZappoMan
c767babba5 lower voxel send rate 2013-05-24 10:47:57 -07:00
ZappoMan
56f1be37fc Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-24 10:15:38 -07:00
birarda
05ad7309a1 Merge pull request #411 from ey6es/master
Fix for starfield rendering on Oculus.
2013-05-24 10:14:31 -07:00
ZappoMan
e23d243e84 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-24 10:14:20 -07:00
ZappoMan
ca0a3e30a1 Merge pull request #414 from PhilipRosedale/master
Added the mighty mohawk
2013-05-24 10:13:56 -07:00
Philip Rosedale
bf94c88bcc Fixes per review 2013-05-24 10:12:50 -07:00
ZappoMan
34a598dcd7 make dragonfly move in circle instead of line 2013-05-24 09:35:27 -07:00
Philip Rosedale
95e73afc78 Added the avatar mohawk 2013-05-24 00:16:52 -07:00
Philip Rosedale
23401640cd Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 22:53:07 -07:00
ZappoMan
4e739b3aa3 Merge pull request #413 from ZappoMan/voxel_animation
new bug parts and colors
2013-05-23 19:03:47 -07:00
ZappoMan
8a3528040c new bug parts and colors 2013-05-23 19:00:59 -07:00
Andrzej Kapolka
add84b2f39 Hide the cursor when in fullscreen Oculus mode. 2013-05-23 17:58:04 -07:00
Andrzej Kapolka
9be4f06e9a Disable voxel textures by default. 2013-05-23 17:32:43 -07:00
Andrzej Kapolka
99c8998c49 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 17:31:37 -07:00
birarda
509905fd78 Merge pull request #412 from birarda/master
tune the distance attenuation
2013-05-23 16:49:29 -07:00
Stephen Birarda
18e8a5ebf9 tune the distance attenuation on audio-mixer 2013-05-23 16:48:28 -07:00
Andrzej Kapolka
95f1a9adaa Removed unused nearCenter/farCenter from ViewFrustum. 2013-05-23 16:34:11 -07:00
Andrzej Kapolka
514c12c7fc Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	interface/src/Application.cpp
2013-05-23 15:39:04 -07:00
Andrzej Kapolka
9b433c974c Fix for starfield rendering on Oculus: put inter-pupil translation in
modelview matrix where it belongs, don't reset perspective projection for
starfield.
2013-05-23 15:35:41 -07:00
birarda
c58c0c3295 Merge pull request #410 from birarda/master
remove AvatarRenderer, no longer in use
2013-05-23 15:18:54 -07:00
Stephen Birarda
b673715aa2 remove the no longer in use AvatarRenderer 2013-05-23 15:18:32 -07:00
birarda
148276de7f Merge pull request #409 from PhilipRosedale/master
Latest tweaks to head, rendering, start location
2013-05-23 15:17:15 -07:00
Philip Rosedale
a4a756704e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 15:02:47 -07:00
Philip Rosedale
37cb914891 You can reset start location with 'G' 2013-05-23 15:02:32 -07:00
birarda
111936e13a Merge pull request #407 from ZappoMan/voxel_animation
Adding Dragon Fly Animation
2013-05-23 14:06:16 -07:00
birarda
3cf8a8224f Merge pull request #408 from birarda/master
fix clocking on AudioInjector thread
2013-05-23 13:57:12 -07:00
Stephen Birarda
842ef820ab use a more consistent method to clock the injector thread 2013-05-23 13:56:16 -07:00
ZappoMan
d3de03b67a cleanup 2013-05-23 13:00:13 -07:00
ZappoMan
5e1e931298 cleanup 2013-05-23 12:57:14 -07:00
ZappoMan
b5d388e4e6 cleanup 2013-05-23 12:56:37 -07:00
ZappoMan
aba0b2c51a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-23 12:55:22 -07:00
ZappoMan
37cd0465f4 added moving dragon fly 2013-05-23 12:55:11 -07:00
Philip Rosedale
235cfc8ab2 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 12:33:39 -07:00
Philip Rosedale
32d2418b7a Added display head mouse option (default off) and all camera modes follow head gyros the same way. 2013-05-23 12:33:26 -07:00
birarda
f82db95fee Merge pull request #406 from ZappoMan/voxel_animation
Fixes to voxel node coloration bug
2013-05-23 12:25:21 -07:00
ZappoMan
089d8d525e Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-23 12:20:34 -07:00
ZappoMan
6ec61996c9 Merge pull request #405 from PhilipRosedale/master
Chat in right place above head, not body, tweaks to sensors, reset behavior, gyro pitch back.
2013-05-23 12:19:43 -07:00
Philip Rosedale
eb15aa602c Added amplification of gyro rates when applying to head, for more sensitivity, and to allow easily looking to one side and another 2013-05-23 12:17:24 -07:00
ZappoMan
473665fb4a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-23 12:16:29 -07:00
ZappoMan
29f84ebbb5 code cleanup 2013-05-23 12:11:38 -07:00
ZappoMan
bf9c867611 make voxel server tree NOT a reaveraging tree, also, don't rebroadcast some Z commands to clients 2013-05-23 12:09:55 -07:00
ZappoMan
25700ae490 fixes to coloring bugs, coding standard cleanup 2013-05-23 12:08:51 -07:00
ZappoMan
2130572034 fixed color initialization on VoxelNode construction 2013-05-23 12:07:56 -07:00
ZappoMan
6e5ed6435b added shortcut key to log menu 2013-05-23 12:06:59 -07:00
Philip Rosedale
7a0ea8bd59 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 11:48:18 -07:00
Philip Rosedale
8fec96319c Merge pull request #403 from Ventrella/master
added effect of avatars floating above the ground with knees bent slightly
2013-05-23 11:48:00 -07:00
Philip Rosedale
be1fae5958 Move head back to center when moving 2013-05-23 11:37:27 -07:00
Philip Rosedale
85ea48e43a Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 11:26:26 -07:00
Philip Rosedale
86e3e25663 removed commented line, formatting 2013-05-23 11:26:14 -07:00
Andrzej Kapolka
4e119419c3 Merge pull request #404 from ey6es/master
Restore the original floor behavior so we don't sink into the ground.
2013-05-23 11:16:16 -07:00