Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 15:13:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3106 commits 71 branches 56 tags 1.2 GiB
Commit graph

3106 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Andrzej Kapolka
672f4de496 Avoid colliding with gravityless environments. 2013-05-23 10:36:28 -07:00
Andrzej Kapolka
34b526f15c Restore the original floor behavior. 2013-05-23 10:32:12 -07:00
Jeffrey Ventrella
649fb72556 Merge remote-tracking branch 'upstream/master' 2013-05-23 10:15:18 -07:00
Jeffrey Ventrella
77324ebb46 made avatars appear to float above the ground 2013-05-23 10:14:46 -07:00
Andrzej Kapolka
1878ac8610 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 09:52:30 -07:00
Philip Rosedale
c56509e5a2 Re-enabled pitch gyro look in first person, start location is now not reset on sensor reset 2013-05-23 09:30:36 -07:00
Philip Rosedale
6b3f35ef19 Merge pull request #393 from ey6es/master 
Put all environment data in the same packet and only send it off about once a second.
 2013-05-22 21:11:22 -07:00
Philip Rosedale
1037101f7d Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 19:47:48 -07:00
birarda
380b26b6b6 Merge pull request #402 from birarda/master 
head mouse fix
 2013-05-22 19:46:52 -07:00
Stephen Birarda
120c835004 fix head mouse 2013-05-22 19:46:33 -07:00
Philip Rosedale
5b3ac504c4 Updated merge conflicts 2013-05-22 19:43:11 -07:00
Philip Rosedale
f39fade4c7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 19:40:13 -07:00
Philip Rosedale
22b534cd8e Fixed headmouse 2013-05-22 19:39:37 -07:00
birarda
b6e0207264 Merge pull request #400 from birarda/master 
correct signs for yaw and roll from invensense
 2013-05-22 19:38:59 -07:00
Stephen Birarda
d7a1cc6ea8 correct the sign for yaw and roll for invensense serial data 2013-05-22 19:38:17 -07:00
birarda
8b95db2bd4 Merge pull request #399 from birarda/master 
complete fix for oculus rendering
 2013-05-22 19:16:49 -07:00
Stephen Birarda
3e192cda9b correct rendering for first-person for oculus 2013-05-22 19:15:52 -07:00
birarda
3e16e6a36c Merge pull request #398 from birarda/master 
correct sign of yaw for oculus
 2013-05-22 18:57:06 -07:00
Stephen Birarda
997a10c981 correct the sign of yaw for oculus 2013-05-22 18:56:38 -07:00
Andrzej Kapolka
bb412818aa Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 18:36:47 -07:00
Jeffrey Ventrella
7da3b8af4e Merge pull request #397 from Ventrella/master 
another fix
 2013-05-22 18:34:03 -07:00
Jeffrey Ventrella
83c12ae9af etc 2013-05-22 18:31:22 -07:00
birarda
a8ef537fe0 Merge pull request #396 from Ventrella/master 
working on pitch yaw roll in avatar head
 2013-05-22 18:21:13 -07:00
Jeffrey Ventrella
82af516471 ya ya 2013-05-22 18:16:11 -07:00
Jeffrey Ventrella
b7613497eb fixed pitch yaw (not roll) 2013-05-22 18:14:18 -07:00
Andrzej Kapolka
1c8418aca3 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 18:07:05 -07:00
Philip Rosedale
818201a27c Merge pull request #395 from Ventrella/master 
added first person transition
 2013-05-22 17:43:32 -07:00
Andrzej Kapolka
5f7db8caa6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 17:41:47 -07:00