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

16530 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
e6f37544fd Use deferred lighting for voxels as well as metavoxels. 2014-09-11 18:06:56 -07:00
Andrzej Kapolka
c2b58c9781 Move deferred lighting into its own class. 2014-09-11 16:39:17 -07:00
Andrzej Kapolka
1c50b32400 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-11 15:32:35 -07:00
Andrzej Kapolka
870b0c80cf Default blendshape mappings for Mixamo models. 2014-09-11 15:24:23 -07:00
Brad Hefta-Gaub
f33bd82ed8 Merge pull request #3395 from PhilipRosedale/master 
Updated move and butterfly scripts, entity renderer uses glutCube to temporarily fix crash
 2014-09-11 14:32:14 -07:00
Andrzej Kapolka
b731a234c2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-11 14:15:51 -07:00
Stephen Birarda
afef42509d Merge pull request #3397 from birarda/fix-stuck-drive-key 
fix for MyAvatar save crash
 2014-09-11 14:13:45 -07:00
Stephen Birarda
52176786d0 use prefix and not postfix operator 2014-09-11 14:13:39 -07:00
Stephen Birarda
81758c9df6 fix for drive key clear enumeration 2014-09-11 14:12:23 -07:00
Andrzej Kapolka
df192e297c Apply blendshapes to skeleton as well as head. 2014-09-11 14:01:11 -07:00
Andrzej Kapolka
1adf3d2878 Go ahead and generate mipmaps for all network-loaded textures. It is the 
21st century, after all.
 2014-09-11 12:41:12 -07:00
Philip Rosedale
5c77040235 remove debug print 2014-09-11 12:15:02 -07:00
Philip Rosedale
d16b42ff47 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-11 12:11:28 -07:00
Philip Rosedale
385c88619a Merge pull request #3394 from birarda/fix-stuck-drive-key 
fix for avatar drive keys
 2014-09-11 12:09:37 -07:00
Stephen Birarda
de24842cf0 fix stuck drive keys for Avatar when modifier released 2014-09-11 11:48:26 -07:00
AndrewMeadows
0e4de53c99 Merge pull request #3391 from chansensturm/audio-windows 
log audio device framing errors, don't assert
 2014-09-11 11:23:06 -07:00
Craig Hansen-Sturm
893d4686db comments 2014-09-11 11:18:05 -07:00
Craig Hansen-Sturm
0d5f28c7df audio buffer framing issue / comments 2014-09-11 11:05:27 -07:00
Craig Hansen-Sturm
63b8dd2d77 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows 2014-09-11 10:43:01 -07:00
AndrewMeadows
49af620665 Merge pull request #3393 from ey6es/master 
shared TextRenderer instances; hostname for Faceshift connection
 2014-09-11 09:20:47 -07:00
AndrewMeadows
d3d4717a92 Merge pull request #3385 from ctrlaltdavid/19933 
Code Review for Job #19933
 2014-09-11 08:39:51 -07:00
Andrzej Kapolka
b1cfafdbe7 Missed a spot in the TextRenderer conversion. 2014-09-10 23:09:03 -07:00
Andrzej Kapolka
7b3d06a783 Add option to change Faceshift hostname. 2014-09-10 19:34:21 -07:00
Philip Rosedale
634bfe5e1d remove renamed script 2014-09-10 19:02:22 -07:00
Philip Rosedale
0078b45a8f update headMove to have optional concept of a room that we cannot escape, update and rename butterflies script 2014-09-10 19:00:24 -07:00
Andrzej Kapolka
de8dd4cecc Share instances of TextRenderer. 2014-09-10 18:55:36 -07:00
Philip Rosedale
2216f89b8d Merge pull request #3392 from ey6es/master 
Fixes for 3DTV/Oculus (deferred lighting/ambient occlusion/glow/culling/pointers).
 2014-09-10 17:43:53 -07:00
Andrzej Kapolka
8762073853 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-10 17:04:57 -07:00
Andrzej Kapolka
146a6526be Fix for Oculus mouse pointer. 2014-09-10 17:02:04 -07:00
Craig Hansen-Sturm
18975aef57 log audio device framing errors, copy as much data as we can, but don't assert 2014-09-10 16:48:35 -07:00
Philip Rosedale
07eba40e33 Merge pull request #3390 from chansensturm/audio-windows 
Fix for stereo/mono and echo local server regression
 2014-09-10 16:40:51 -07:00
Andrzej Kapolka
590c8042f8 Attempting to fix a bug in the Oculus overlay. 2014-09-10 16:36:32 -07:00
Craig Hansen-Sturm
ca4d1375f5 fix for recent stereo/mono and echo local server regression 2014-09-10 16:21:06 -07:00
Andrzej Kapolka
fe249ef348 Make sure the frustum that we use for culling contains the current camera 
information.
 2014-09-10 15:51:10 -07:00
Andrzej Kapolka
34ccc2ab7b Use the FBO dimensions, which may differ from the widget dimensions (as with 
the Oculus).
 2014-09-10 15:13:07 -07:00
Andrzej Kapolka
b328304da4 Up/down, not top/bottom. 2014-09-10 14:15:00 -07:00
Andrzej Kapolka
600f36aa64 Fix for Oculus API. 2014-09-10 14:14:02 -07:00
Andrzej Kapolka
423e6d0594 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-10 13:51:46 -07:00
Andrzej Kapolka
2cba7b37bf Attempting to fix 3DTV/Oculus deferred lighting/ambient occlusion. 2014-09-10 13:51:14 -07:00
Andrzej Kapolka
c9ed83ac14 Merge pull request #3389 from chansensturm/audio-windows 
Windows/VS2013 Hot Fix
 2014-09-10 13:45:05 -07:00
Craig Hansen-Sturm
cb8e832257 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows 2014-09-10 13:14:21 -07:00
Craig Hansen-Sturm
cf6fd4a66f Merge branch 'audio-windows' of https://github.com/chansensturm/hifi into audio-windows 2014-09-10 13:07:18 -07:00
Craig Hansen-Sturm
015fdec6bd Merge branch 'audio-windows' of https://github.com/chansensturm/hifi into audio-windows 2014-09-10 13:05:52 -07:00
Andrzej Kapolka
c5ad603321 Fix for glow disabled in 3D TV mode. 2014-09-10 12:47:46 -07:00
Andrzej Kapolka
2fde67be72 Fix for deferred lighting with 3DTV (/Oculus, although I haven't tested that 
yet).
 2014-09-10 12:40:03 -07:00
wangyix
7a2897fb6b fixes/patches for win32/vs2013 startup and shutdown 2014-09-10 12:24:59 -07:00
AndrewMeadows
f3b8d68c65 Merge pull request #3381 from chansensturm/audio-noise 
Hot FIX:  pulse audio input device frame size
 2014-09-10 08:25:42 -07:00
Philip Rosedale
ccd57163d0 Merge pull request #3388 from ZappoMan/quietDebug 
silence some over active debug messages
 2014-09-09 20:58:54 -07:00
Philip Rosedale
da057b468e Merge pull request #3387 from ZappoMan/nonBlockingForms 
add support for non blocking forms
 2014-09-09 20:56:58 -07:00
Philip Rosedale
4294da20bc Merge pull request #3386 from ZappoMan/getUnscaledMeshExtents 
add getUnscaledMeshExtents to FBXGeometry
 2014-09-09 20:51:23 -07:00