Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 05:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4533 commits 76 branches 59 tags 1.2 GiB
Commit graph

4533 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
ed8c33ef4b removed some comments 2013-07-10 11:19:49 -07:00
ZappoMan
d8b72cb126 removed some comments 2013-07-10 11:17:23 -07:00
ZappoMan
a9b1aa727f added back stars file loading 2013-07-10 11:11:21 -07:00
ZappoMan
abd7dfde8b added vector math timing test 2013-07-10 11:10:03 -07:00
ZappoMan
d89c3c8042 add version of recurse tree that uses pointer stack and allows timing breaks 2013-07-10 11:09:48 -07:00
Atlante45
56cde48e05 Merge branch 'master' of git://github.com/worklist/hifi 2013-07-10 10:30:04 -07:00
Stephen Birarda
9ba3bfc8b8 Merge pull request #632 from birarda/master 
remove warnings for wrong order member variable initialization
 2013-07-10 09:59:53 -07:00
Stephen Birarda
488a4affd3 fix member variable initialization order to remove warnings 2013-07-10 09:59:14 -07:00
Andrzej Kapolka
a116f5a636 Use InvenSense code to handle the rather complicated business of talking the 
sensor into giving us the compass reading.  We're getting it now, but I still
have to figure out how to incorporate it.
 2013-07-09 17:28:23 -07:00
Stephen Birarda
e910680fa4 Merge pull request #631 from Atlante45/19368 
Fixed broken shortcut (Turn on/off voxels is now Shift + V)
 2013-07-09 17:11:04 -07:00
Mark Peng
61ad33d9d0 Merge remote-tracking branch 'upstream/master' into eyecontact 2013-07-09 16:29:56 -07:00
Mark Peng
2a25c97446 Change LookAtPosition of Head to the eye level of another avatar, 
if looking at another avatar in Application.cpp.

Add eyePosition to Head class and bool isLookingAtOther.. in Application.cpp.
 2013-07-09 16:22:41 -07:00
Stephen Birarda
4b0bff409c Merge pull request #606 from Atlante45/19368 
Code Review for Job #19368
 2013-07-09 15:50:34 -07:00
Philip Rosedale
c61c541004 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-09 14:19:31 -07:00
Stephen Birarda
329e59f04e Merge pull request #629 from ZappoMan/bug_fixes 
make keyhole radius larger
 2013-07-09 13:53:48 -07:00
ZappoMan
f076eed9d2 more hacking on occlusion culling 2013-07-09 13:17:38 -07:00
ZappoMan
44357fcfb9 add 'level' param to tree recursion 2013-07-09 13:17:21 -07:00
ZappoMan
e85d5f3b14 make keyhole radius larger 2013-07-09 13:04:20 -07:00
atlante45
2e036a0e46 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 17:56:18 +02:00
atlante45
dbdbd7a8c4 Incorporating comments for code review (minecraft import) 2013-07-09 17:55:55 +02:00
atlante45
0171803bc8 Merge branch 'master' of git://github.com/worklist/hifi 2013-07-09 17:12:13 +02:00
atlante45
3433cf5a98 Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 16:34:12 +02:00
atlante45
2c438e8af3 Fixed broken shortcut (Turn on/off voxels is now Shift + V) 2013-07-09 16:20:55 +02:00
atlante45
4885f520e7 Merge branch 'master' of git://github.com/worklist/hifi 2013-07-09 15:54:10 +02:00
atlante45
b3c0f3fedb More code review for UI job 2013-07-09 15:29:12 +02:00
atlante45
c3b0be5c63 More consts for UI job 2013-07-09 14:49:01 +02:00
atlante45
c9d707796e Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 14:29:19 +02:00
atlante45
f0cf96353d Merge branch 'master' of git://github.com/worklist/hifi into 19368 2013-07-09 14:28:52 +02:00
atlante45
b297740070 Merge branch 'master' of git://github.com/worklist/hifi 2013-07-09 14:23:25 +02:00
atlante45
3c4f8f5120 put hard coded numbers into variables for UI job 2013-07-09 14:17:42 +02:00
atlante45
5d4d0ba43e Merge branch 'master' of git://github.com/worklist/hifi into 19373 2013-07-09 12:56:27 +02:00
atlante45
4dda71e830 Final code for minecraft import to review 2013-07-09 12:41:44 +02:00
atlante45
5703a60797 Merge branch 'master' of git://github.com/worklist/hifi into 19368 2013-07-09 10:25:58 +02:00
atlante45
d38c1f081c Modified code according to review for UI job 2013-07-09 10:25:46 +02:00
ZappoMan
1f0df9a945 added scanTreeWithOcclusion() for testing 2013-07-08 20:52:14 -07:00
Philip Rosedale
5a5492a722 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-08 17:04:35 -07:00
Philip Rosedale
e9f8e50d49 Merge pull request #623 from machinelevel/dev4 
Added safety checks to processEvents(), which was causing problems. Also...
 2013-07-08 17:04:06 -07:00
Philip Rosedale
4936676cc1 Merge pull request #627 from ey6es/kinected 
Basic depth camera support (only built in when OpenNI is available).
 2013-07-08 16:57:10 -07:00
Eric Johnston
c298f78ae9 Fixed multi-touch event loop problems by selectively processing just the touch events. 2013-07-08 16:31:28 -07:00
Eric Johnston
7de2281226 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-08 16:29:51 -07:00
Philip Rosedale
4bafea768e Merge branch 'master' of https://github.com/worklist/hifi 2013-07-08 16:18:15 -07:00
Philip Rosedale
95ac0a891f Merge 2013-07-08 16:17:51 -07:00
Stephen Birarda
c2ad02def2 Merge pull request #625 from PhilipRosedale/master 
Tuned smooth gyro look to feel better
 2013-07-08 15:55:52 -07:00
Eric Johnston
14374fb0df Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-08 15:31:11 -07:00
Stephen Birarda
aaaba9c42e more packet version refactoring 2013-07-08 15:14:18 -07:00
Stephen Birarda
b482f479b6 more packet version changes to various server targets 2013-07-08 15:09:14 -07:00
Stephen Birarda
c8b0e4bfe7 use packet version helpers for PACKET_TYPE_ENVIRONMENT_DATA 2013-07-08 15:04:49 -07:00
Stephen Birarda
185d5bb0a2 use packet version helpers for PACKET_TYPE_TRANSMITTER_DATA 2013-07-08 15:01:57 -07:00
Stephen Birarda
202d446f07 use packet version helpers for PACKET_TYPE_AVATAR_VOXEL_URL 2013-07-08 14:59:00 -07:00
Stephen Birarda
a287d6d940 use packet version helpers for PACKET_TYPE_VOXEL_DATA 2013-07-08 14:43:16 -07:00