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

5719 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
ecc6d41523 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-20 16:07:54 -07:00
Andrzej Kapolka
d5c66f6b67 Default to diffuse/add mode, fix for interacting with ambient occlusion. 
Unfortunately, I managed to break the diffusion somehow.
 2013-08-20 16:07:12 -07:00
ZappoMan
86f2cbe8d4 Merge pull request #873 from birarda/master 
switch OS X base SDK to 10.7
 2013-08-20 15:45:46 -07:00
ZappoMan
a6a38b4ebe Merge pull request #872 from ey6es/ssao 
Performance improvement for the SSAO blur step, cleanup.
 2013-08-20 15:40:48 -07:00
ZappoMan
b61e2810b2 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-20 15:37:51 -07:00
ZappoMan
222849986e Merge pull request #874 from Atlante45/master 
Several VoxelSystems can have different view frustum
 2013-08-20 15:37:29 -07:00
atlante45
22a2603eaa Several VoxelSystems can have different view frustum 2013-08-20 15:28:08 -07:00
Stephen Birarda
7e1b682663 switch OS X base SDK to 10.7 2013-08-20 14:55:29 -07:00
Andrzej Kapolka
5b923bc6f2 More cleanup. 2013-08-20 13:46:13 -07:00
Andrzej Kapolka
11be8c752b Cleanup. 2013-08-20 13:40:45 -07:00
Andrzej Kapolka
edd119ccdc Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-20 13:24:32 -07:00
Stephen Birarda
11311f33ba Merge pull request #871 from birarda/master 
fix for logitech USB reporting only one channel
 2013-08-20 13:07:22 -07:00
Stephen Birarda
146e9176eb switch to one channel from PortAudio to resolve USB error 2013-08-20 13:06:30 -07:00
ZappoMan
af140bbeb2 fixed build buster 2013-08-20 12:16:25 -07:00
ZappoMan
96bdcd6a4a attempt to fix build buster 2013-08-20 12:10:34 -07:00
ZappoMan
db6e327741 fixed build buster 2013-08-20 12:00:07 -07:00
Andrzej Kapolka
22598ceb4f Optimizations for occlusion blur (the main one being that we only need to 
sample the texture four, not sixteen, times if we turn on linear filtering
and sample between the texels).
 2013-08-20 11:52:43 -07:00
ZappoMan
d5f94d0f05 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-20 11:42:51 -07:00
ZappoMan
50532bc67d added NodeListHook to JurisdictionListener to properly remove nodes that are killed 2013-08-20 11:42:30 -07:00
ZappoMan
526270e408 removed debug 2013-08-20 11:30:05 -07:00
ZappoMan
b0664163a7 removed debug 2013-08-20 11:27:31 -07:00
ZappoMan
da6bd2e3b0 cleanup, handle no JurisdictionMap case in JurisidictionSender 2013-08-20 11:22:51 -07:00
ZappoMan
436f70ab5d removed dead code 2013-08-20 11:12:22 -07:00
ZappoMan
f581b58fbc spacing fix 2013-08-20 11:11:28 -07:00
ZappoMan
0f7ea55e82 make animation-server work with jurisdictions 2013-08-20 11:08:20 -07:00
Andrzej Kapolka
8ded40476e Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-20 10:54:17 -07:00
Andrzej Kapolka
15cf909fce Merge pull request #869 from ey6es/master 
Need to #ifdef this out to avoid linking against nonexistent quazip on L...
 2013-08-20 10:53:09 -07:00
Andrzej Kapolka
1d74860877 Need to #ifdef this out to avoid linking against nonexistent quazip on Linux. 2013-08-20 10:51:55 -07:00
Andrzej Kapolka
7f4557fe1a Add blur scale uniform. 2013-08-20 10:50:25 -07:00
Andrzej Kapolka
dcbfb914e9 Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-20 10:38:28 -07:00
Stephen Birarda
d0ab8317c4 Merge pull request #865 from ey6es/ssao 
Basic screen space ambient occlusion effect.  Defaults to off, because at the moment it slows things down substantially.
 2013-08-20 10:37:01 -07:00
Andrzej Kapolka
7ab0f18622 Merge pull request #868 from birarda/fervor 
changes to update flow to prepare for gazzlab
 2013-08-20 10:34:10 -07:00
Stephen Birarda
13f5b7f68d change application name to Interface 2013-08-20 10:02:06 -07:00
Stephen Birarda
05c9ca7131 remove unneeded package finds in interface CMakeLists 2013-08-20 09:56:50 -07:00
Stephen Birarda
71edaa2472 replace appcast url with highfidelity s3 bucket link 2013-08-20 09:55:48 -07:00
ZappoMan
5e7e6fc9d7 First cut at JurisdictionListener and PACKET_TYPE_VOXEL_JURISDICTION_REQUEST 2013-08-19 20:15:46 -07:00
Stephen Birarda
329253d8e4 move update checking later in init, add menu option 2013-08-19 17:17:26 -07:00
Stephen Birarda
65a63fb73e move checkForUpdates to menu to have option in menu 2013-08-19 16:16:27 -07:00
Stephen Birarda
54d637119f updates required for fervor updater with Qt5 2013-08-19 16:05:37 -07:00
atlante45
24531fdd10 Dialogbox for import fully functionnal 2013-08-19 15:54:51 -07:00
Andrzej Kapolka
98a9cbefc7 Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-19 14:00:20 -07:00
Leonardo Murillo
16f8bb0cb4 Merge pull request #866 from birarda/master 
changes to jobs DSL for interface OS X build
 2013-08-19 13:19:38 -07:00
Andrzej Kapolka
dea95200a3 Merge pull request #867 from ey6es/master 
Restore the gyro-only lean behavior based on linear accelerometer data.
 2013-08-19 13:19:07 -07:00
Stephen Birarda
42c69ba77f rename missed variable in last commit 2013-08-19 13:19:02 -07:00
Andrzej Kapolka
222e026662 Use a small default lean scale. 2013-08-19 13:18:20 -07:00
Stephen Birarda
d8798b7ed6 coalesce interfaceAppleJob name with name of generated job 2013-08-19 13:16:16 -07:00
Andrzej Kapolka
8d65323345 Restore the gyro-only lean behavior based on linear accelerometer data. 2013-08-19 13:14:35 -07:00
Stephen Birarda
9ee66288ab switch to shallow clone for checkouts, os x build from stable 2013-08-19 13:09:05 -07:00
Stephen Birarda
f8cd138054 changes to jobs.groovy to build on OS X 2013-08-19 12:36:50 -07:00
Andrzej Kapolka
dec4a4c422 Added toggle for ambient occlusion (defaults to off). 2013-08-19 11:45:43 -07:00