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

3072 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
fc238c0382 Merge pull request #362 from ey6es/master 
Fix for matrix stack bug that was breaking Oculus rendering (if nothing else).
 2013-05-20 16:54:49 -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
28bab24e70 type squishes in AvatarData 2013-05-20 16:17:49 -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
ZappoMan
24f52ff2fc Merge pull request #360 from ey6es/master 
Dragging support for adding/deleting voxels, toggle for voxel noise texture, fix for threading issue with voxels (believe this is what caused the bad triangles).
 2013-05-20 15:50:04 -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
birarda
d194360cb2 Merge pull request #351 from Ventrella/master 
improved algorithm for eyeball lookat target
 2013-05-20 14:37:53 -07:00
Jeffrey Ventrella
44ef5d4bac fix 2013-05-20 14:37:09 -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
e9caa40d9a added exists bits to avatar data 2013-05-20 13:54:02 -07:00
ZappoMan
321d1952d6 first cut at exists bits 2013-05-20 12:56:59 -07:00
birarda
21f8a05baf Merge pull request #359 from birarda/master 
rearrange member variables in Oscilloscope constructor
 2013-05-20 12:51:47 -07:00
Stephen Birarda
6aafcc752d re-arrange member variable constructors for compiler warning 2013-05-20 12:51:21 -07:00
ZappoMan
b406df9029 Merge pull request #355 from birarda/master 
have the AudioInjectionManager use sensible defaults when nothing is set
 2013-05-20 12:50:36 -07:00
Stephen Birarda
c5bba41385 resolve conflicts on merge with upstream master 2013-05-20 12:49:49 -07:00
birarda
591bc67378 Merge pull request #358 from ZappoMan/master 
Move constructor as per Stephen's request
 2013-05-20 12:47:53 -07:00
ZappoMan
cf065a413c merge 2013-05-20 12:36:16 -07:00
ZappoMan
24b34b19b1 merge 2013-05-20 12:35:18 -07:00
ZappoMan
17c961f1b0 merge 2013-05-20 12:34:15 -07:00
ZappoMan
6cf8ec32a7 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
	libraries/avatars/src/AvatarData.h
 2013-05-20 12:31:35 -07:00
Stephen Birarda
d6ceca4f4b move constructor for AvatarData to implemenation file 2013-05-20 12:16:56 -07:00
ZappoMan
fe1f02beff moved constructor 2013-05-20 12:16:55 -07:00
Jeffrey Ventrella
545b928971 Merge remote-tracking branch 'upstream/master' 2013-05-20 12:16:40 -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
birarda
1e63bb8d20 Merge pull request #353 from ZappoMan/master 
fixed Philip's no animation problem
 2013-05-20 12:15:57 -07:00
ZappoMan
b06cc60665 moved constructor 2013-05-20 12:14:32 -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
ZappoMan
4caa690255 Merge pull request #356 from PhilipRosedale/master 
Made looking around with the mouse a menu option, defaults off
 2013-05-20 12:09:55 -07:00
Jeffrey Ventrella
a192a21ef0 added _lookatPosition to avatar Data 2013-05-20 12:08:58 -07:00
Andrzej Kapolka
2697453df4 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 12:03:00 -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