Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 16:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2845 commits 71 branches 56 tags 1.2 GiB
Commit graph

2845 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
ef2d27aba6 getting closer to working delete 2013-05-21 10:43:31 -07: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
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
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
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
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
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
Jeffrey Ventrella
4e6b2f9c50 test 2013-05-20 11:55:55 -07:00
Jeffrey Ventrella
570d2e104a test 2013-05-20 11:53:42 -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
ZappoMan
282ebbdcbb Merge pull request #354 from ey6es/master 
Added support for off-axis projection (via eye offset position/orientation parameters in camera/frustum).
 2013-05-20 11:34:37 -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