Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 14:07:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3134 commits 76 branches 59 tags 1.2 GiB
Commit graph

3134 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeffrey Ventrella
16a1dd103d Merge remote-tracking branch 'upstream/master' 2013-05-21 15:27:37 -07:00
Jeffrey Ventrella
2781a354a8 reversed gyro for head (didn't know the headset was on backwards :) 2013-05-21 15:27:03 -07:00
ZappoMan
4f0aca4b0c Merge pull request #372 from birarda/master 
refactor FindGLM to not check twice, revert the previous audio change
 2013-05-21 15:12:43 -07:00
Jeffrey Ventrella
e09e01b81e Merge remote-tracking branch 'upstream/master' 2013-05-21 15:09:23 -07:00
Jeffrey Ventrella
6840ce0bbe thingy 2013-05-21 15:09:05 -07:00
birarda
ff71161bd6 Merge pull request #371 from PhilipRosedale/master 
Missing Transmitter files committed
 2013-05-21 15:05:00 -07:00
Philip Rosedale
dc8dea727a Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 15:04:24 -07:00
Philip Rosedale
330c59b36b Fixed conflicts 2013-05-21 15:04:12 -07:00
birarda
b4fd0c129a Merge pull request #369 from Ventrella/master 
cleaned up pitch/yaw/roll confusion in Head
 2013-05-21 15:04:08 -07:00
Jeffrey Ventrella
1f82d339d0 Merge remote-tracking branch 'upstream/master' 2013-05-21 15:03:06 -07:00
Jeffrey Ventrella
c11851b75d cleaned up formatting stuff 2013-05-21 15:02:44 -07:00
Stephen Birarda
a4bf95f93b don't go looking for GLM twice, check the cache 2013-05-21 15:01:41 -07:00
Stephen Birarda
95cef67e33 Revert "remove unused variable in Audio" 
This reverts commit bbdd601855.
 2013-05-21 15:01:08 -07:00
Philip Rosedale
f47b5a196a Added missing transmitter files 2013-05-21 15:00:22 -07:00
birarda
ca9738a101 Merge pull request #370 from birarda/master 
remove unused varible in Audio
 2013-05-21 14:52:45 -07:00
Stephen Birarda
bbdd601855 remove unused variable in Audio 2013-05-21 14:52:05 -07:00
Jeffrey Ventrella
ef95b13723 Merge remote-tracking branch 'upstream/master' 2013-05-21 14:21:14 -07:00
Jeffrey Ventrella
d21b48ad6e cleaned up a lot of pitch/yaw/roll confusion in Head and made new versions of eyes, eyebrows and mouth (Head still needs work) 2013-05-21 14:20:44 -07:00
tosh
0ab2d4c741 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 23:13:21 +02:00
tosh
0261f50298 merge up 2013-05-21 23:13:03 +02:00
ZappoMan
fb4424e975 don't rebroadcase PACKET_HEADER_ERASE_VOXEL messages 2013-05-21 14:07:03 -07:00
birarda
8afeeaf222 Merge pull request #368 from ZappoMan/master 
Stub implementation of Transmitter class to fix busted build
 2013-05-21 14:04:29 -07:00
ZappoMan
fdba349d9b temporary hack fix to busted build 2013-05-21 13:57:54 -07:00
tosh
ba4f4b9809 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 22:49:39 +02:00
ZappoMan
0bcd629c8a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-21 13:46:04 -07:00
ZappoMan
6f0035b297 Merge pull request #365 from PhilipRosedale/master 
Made Transmitter it's own class, removed V1 Transmitter code (Glass and Android)
 2013-05-21 13:45:15 -07:00
ZappoMan
13475f791f Merge pull request #366 from ey6es/master 
Added basic capsule/sphere collisions between avatar and voxels; added casted getter for Application instance; switched to glDrawRangeElements for voxel rendering.
 2013-05-21 13:43:24 -07:00
ZappoMan
869a100486 cleanup 2013-05-21 13:37:58 -07:00
Andrzej Kapolka
0377ca1adb Compute nodes' enclosing radius in the same place. 2013-05-21 13:32:41 -07:00
Andrzej Kapolka
1118c06f5d Only do collision checking for own avatar. 2013-05-21 13:01:01 -07:00
Andrzej Kapolka
597769a861 Added basic capsule/sphere collisions between avatar and voxels. 2013-05-21 12:58:02 -07:00
ZappoMan
9f23f846a9 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-21 12:47:46 -07:00
ZappoMan
d6d9b053f5 removed extra color exists bitmask since we weren't using it and it was redundant 2013-05-21 12:45:40 -07:00
ZappoMan
6c309d2ece made wantSearchForColoredNodes a command line option defautl to false 2013-05-21 12:40:03 -07:00
ZappoMan
9b5ee05141 added some sample files 2013-05-21 12:04:48 -07:00
ZappoMan
d637ef4078 cleanup code 2013-05-21 12:02:26 -07:00
ZappoMan
edcc92cfb6 cleanup code 2013-05-21 11:58:48 -07:00
Philip Rosedale
71a875042a Updated transmitter class to handle correct orientation of gyros 2013-05-21 11:57:14 -07:00
ZappoMan
e8fd96018b cleanup code 2013-05-21 11:52:57 -07:00
ZappoMan
b61d6cf4e8 cleanup code 2013-05-21 11:48:30 -07:00
ZappoMan
e47d9ea21f cleanup code 2013-05-21 11:44:48 -07:00
ZappoMan
7c9be4b9f5 cleanup code 2013-05-21 11:42:13 -07:00
ZappoMan
e29bc9972f code cleanup 2013-05-21 11:34:31 -07:00
ZappoMan
3220f986d6 code cleanup 2013-05-21 11:33:32 -07:00
ZappoMan
a7f0a66aee code cleanup 2013-05-21 11:31:47 -07:00
ZappoMan
0dde5b6411 remove dead code, comment cleanup 2013-05-21 11:28:12 -07:00
ZappoMan
4f9c7fed59 removed UI for want exists bits, defaults to true 2013-05-21 11:25:50 -07:00
ZappoMan
ef2d27aba6 getting closer to working delete 2013-05-21 10:43:31 -07:00
Philip Rosedale
340882a330 Changed 1P view to turn off head rendering when close/inside head rather than showing disembodied neck 2013-05-21 10:22:05 -07:00
Andrzej Kapolka
b15162abfd Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 09:49:12 -07:00