Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 04:25:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3071 commits 75 branches 59 tags 1.2 GiB
Commit graph

1501 commits

Author SHA1 Message Date
Andrzej Kapolka
7e5418f8db Fix for default environment, better capsule placement. 2013-05-22 10:53:58 -07:00
Geenz
fb553fce80 Refactor startup timing a little by getting the current time the moment the application enters its main function, then passing that to Application's constructor. Also fix the titlebar bug by setting the title bar at the end of initializeGL() instead of at the end of the first frame (which would actually further the inaccuracy of the startup time). 2013-05-22 10:53:35 -04:00
Philip Rosedale
0d231b5550 Added lift to transmitter with finger, for true god-like flight! 2013-05-21 23:24:58 -07:00
ZappoMan
a311e40f25 hopefully fix unix build buster 2013-05-21 23:10:57 -07:00
Philip Rosedale
2edd085941 Added sensor fusion with gravity to transmitter to stabilize drift offset in pitch and roll. 2013-05-21 22:40:13 -07:00
Andrzej Kapolka
8d255f7685 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:38:23 -07:00
Andrzej Kapolka
c7e840e0d4 The end parameter to glDrawRangeElements is inclusive. 2013-05-21 22:36:27 -07:00
Andrzej Kapolka
8b1362636e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:29:46 -07:00
Philip Rosedale
8b65fcae75 Merge pull request #352 from tschw/master 
refactors logging, adds comments, and revises names & formatting in all submitted code
 2013-05-21 22:10:10 -07:00
Andrzej Kapolka
a864a6f8c6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 21:34:09 -07:00
Andrzej Kapolka
fd98982fa6 Support for multiple environments, collisions with notional planet surfaces. 2013-05-21 21:33:08 -07:00
Philip Rosedale
47d9035def Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 20:34:55 -07:00
Jeffrey Ventrella
9f82b9fb43 test 2013-05-21 17:51:41 -07:00
Jeffrey Ventrella
e219cd8223 Merge remote-tracking branch 'upstream/master' 2013-05-21 17:44:45 -07:00
Jeffrey Ventrella
006fc3268e thingy 2013-05-21 17:44:24 -07:00
birarda
63fcb2eeef Merge pull request #367 from ZappoMan/voxel_animation 
Fixes "Delete" voxel behavior
 2013-05-21 17:43:36 -07:00
Jeffrey Ventrella
6e5f036eeb test 2013-05-21 17:41:50 -07:00
Jeffrey Ventrella
25dfc7bc4b Merge remote-tracking branch 'upstream/master' 2013-05-21 17:38:36 -07:00
Jeffrey Ventrella
c32d621d5f improving lookat behavior 2013-05-21 17:38:17 -07:00
Stephen Birarda
3ac20849d6 remove old menu code and glew implemenation file 2013-05-21 16:21:33 -07:00
Jeffrey Ventrella
0b7e0ef43d test 2013-05-21 16:13:41 -07:00
Philip Rosedale
f7e75ee57c Fixed conflict 2013-05-21 15:47:15 -07:00
Philip Rosedale
6ff4b88ea4 starting tweaks to head gyro motion 2013-05-21 15:46:11 -07:00
Jeffrey Ventrella
b881507f51 fixed mouth and added a test for transmitting look at 2013-05-21 15:43:40 -07:00
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
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
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
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
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
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
Philip Rosedale
71a875042a Updated transmitter class to handle correct orientation of gyros 2013-05-21 11:57:14 -07:00
ZappoMan
7c9be4b9f5 cleanup code 2013-05-21 11:42:13 -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
tosh
bfaeb4a4d9 Merge branch 'master' of git://github.com/worklist/hifi 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2013-05-21 18:46:20 +02:00
Philip Rosedale
3539ec858e Added hand movement and body motion to transmitter. Feel much better - like dancing. 2013-05-20 23:22:28 -07:00
Philip Rosedale
7728a54d26 Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter 2013-05-20 19:00:49 -07:00
Jeffrey Ventrella
9d3e76efe2 operating on head. patient under anesthesia 2013-05-20 17:53:55 -07:00
Jeffrey Ventrella
6e994ed425 Merge remote-tracking branch 'upstream/master' 2013-05-20 17:33:27 -07:00
Jeffrey Ventrella
72f8f447a1 starting a rework of Head renderer 2013-05-20 17:30:13 -07:00
Philip Rosedale
6392bb0045 Merge pull request #363 from birarda/head-changes 
move lean sideways and lean forwards to the head data class
 2013-05-20 17:25:05 -07:00
Andrzej Kapolka
1be859ede9 Use glDrawRangeElements, which indicates the range of used indices. It may or 
may not make a difference in performance, but it won't hurt.
 2013-05-20 17:14:41 -07:00
Stephen Birarda
564244ddd3 move _leanSideways and _leanForwards to HeadData 2013-05-20 17:13:40 -07:00
ZappoMan
d1554e0150 Merge pull request #361 from birarda/head-changes 
add a HeadData class to reduce redundancy for head member variables
 2013-05-20 17:08:09 -07:00
Andrzej Kapolka
5b0640bbbf Whoops--fixed a matrix stack issue that was breaking Oculus rendering. 2013-05-20 16:52:40 -07:00
Stephen Birarda
570dfba934 code review comments, cleanup Avatar constructor 2013-05-20 16:12:38 -07:00
tosh
a86b8a1d93 refactors logging 2013-05-21 01:00:10 +02:00
tosh
4385fc31e8 adds missing include "InterfaceConfig.h" for OpenGL types 2013-05-21 00:59:29 +02:00
ZappoMan
e1c89aac87 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-20 15:52:04 -07:00
ZappoMan
a53f84fcb9 latest hacking 2013-05-20 15:51:47 -07:00
Stephen Birarda
de84b7803f move _lookAtPosition to HeadData class 2013-05-20 15:51:40 -07:00
Andrzej Kapolka
06c78c2f12 Tweak: let the reader know when it needs to load the full VBO. 2013-05-20 15:41:19 -07:00
Stephen Birarda
257a1d1f2e move head rotations to new HeadData class to be used for transmission 2013-05-20 15:21:02 -07:00
Andrzej Kapolka
8d522cd3ed I believe the problem with voxel rendering is caused by the update thread's 
writing the data while the render thread is attempting to read it.  This
should fix the issue.
 2013-05-20 15:15:44 -07:00
Andrzej Kapolka
8c71741843 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 15:13:36 -07:00
tosh
e70efe7481 fixes improper merge / changes 2013-05-20 23:37:06 +02:00
Jeffrey Ventrella
b42d093b4a Merge remote-tracking branch 'upstream/master' 2013-05-20 14:36:13 -07:00
Jeffrey Ventrella
d144fb7f84 fix 2013-05-20 14:34:39 -07:00
tosh
06288e8366 Merge branch 'master' of git://github.com/worklist/hifi 
Conflicts:
	interface/src/Oscilloscope.cpp
 2013-05-20 23:15:06 +02:00
ZappoMan
4298b922a2 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2013-05-20 13:55:01 -07:00
ZappoMan
321d1952d6 first cut at exists bits 2013-05-20 12:56:59 -07:00
Stephen Birarda
6aafcc752d re-arrange member variable constructors for compiler warning 2013-05-20 12:51:21 -07:00
Jeffrey Ventrella
1e9b04d28f cleanup 2013-05-20 12:16:18 -07:00
Stephen Birarda
7b21b8520e Merge branch 'master' of github.com:worklist/hifi 2013-05-20 12:16:10 -07:00
Andrzej Kapolka
616285f4c7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 12:13:53 -07:00
Andrzej Kapolka
3f0fd2f976 Added toggle for voxel textures; they may be slowing some machines down. 2013-05-20 12:13:23 -07:00
Jeffrey Ventrella
677f0b5d2e Merge remote-tracking branch 'upstream/master' 2013-05-20 12:13:21 -07:00
Jeffrey Ventrella
f09cbca00b cleanup 2013-05-20 12:12:46 -07:00
Jeffrey Ventrella
a192a21ef0 added _lookatPosition to avatar Data 2013-05-20 12:08:58 -07:00
Andrzej Kapolka
85dc14bb94 Drag support for adding/removing (as well as coloring) voxels. I had to 
ensure that the "last" voxel edited was the one under the cursor after the
operation, not the one operated on.
 2013-05-20 12:01:33 -07:00
Jeffrey Ventrella
d384e36af1 test 2013-05-20 11:59:19 -07:00
Philip Rosedale
956ffe223f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 11:56:47 -07:00
Philip Rosedale
28581e33cc turn off audio echo rendering (it's for debug) 2013-05-20 11:56:40 -07:00
Philip Rosedale
50ee9b9ee4 Added options menu choice for 'MouseLook', defaults off 2013-05-20 11:50:04 -07:00
Stephen Birarda
dae7bf8674 use AgentList defaults when AIM has no socket or address set 2013-05-20 11:48:50 -07:00
Jeffrey Ventrella
aa9783a88d Merge remote-tracking branch 'upstream/master' 2013-05-20 11:41:45 -07:00
Jeffrey Ventrella
ffbc70814a preparing to add transmitted lookat position data 2013-05-20 11:41:21 -07:00
Andrzej Kapolka
0f2f4ee8f9 Add the discussed four lines to disable blending and enable backface culling. 2013-05-20 11:32:32 -07:00
Andrzej Kapolka
85bca558f5 Tabs -> spaces, spacing fix. 2013-05-20 09:38:01 -07:00