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

5693 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
213f04f55e fix comment 2013-08-21 16:37:58 -07:00
ZappoMan
25e21f862c flush delete queue after encode is complete 2013-08-21 16:23:55 -07:00
ZappoMan
f19477dd63 dead code cleanup 2013-08-21 15:57:25 -07:00
ZappoMan
bb5a432c74 removed old dead code 2013-08-21 15:21:58 -07:00
ZappoMan
bb9a81939c threads for persist and packet processing 2013-08-21 15:17:32 -07:00
ZappoMan
e524ed889e Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server 
Conflicts:
	libraries/voxels/src/VoxelTree.cpp
	libraries/voxels/src/VoxelTree.h
 2013-08-21 13:48:23 -07:00
ZappoMan
18dbfd5cc7 Merge pull request #877 from Atlante45/separate_import_with_preview 
New paste behaviour
 2013-08-21 13:44:17 -07:00
atlante45
bae0f7fa1b New paste behaviour 2013-08-21 13:21:15 -07:00
Stephen Birarda
1995788c2b Merge pull request #870 from ZappoMan/animation_server_jurisdictions 
Improve Animation Server to support Jurisdictions in Multi-voxel-server environment
 2013-08-21 13:18:19 -07:00
ZappoMan
4fd23a0cd9 CR feedback 2013-08-21 13:09:51 -07:00
ZappoMan
4bdaf7589f Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-21 12:16:09 -07:00
ZappoMan
4e7b4bdbaa Merge pull request #876 from Atlante45/separate_import_with_preview 
Separate import with preview
 2013-08-21 12:15:50 -07:00
atlante45
bda6e03117 Changed name of copySubTreeIntoNewTree destinationTree argument 2013-08-21 12:11:34 -07:00
ZappoMan
2c362e6288 adding support for better multithreading in VoxelTree 2013-08-21 12:09:00 -07:00
atlante45
9003a7d40b PR comments 2013-08-21 12:06:47 -07:00
atlante45
9fb864a699 Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview 2013-08-21 11:37:18 -07:00
atlante45
867303e673 Code cleanup 2013-08-21 11:33:10 -07:00
atlante45
27b0338294 Fixed clipboard not being previewed 2013-08-21 10:31:56 -07:00
atlante45
3eb5ace715 merge + few efficiency ameliorations to importDialog 2013-08-20 18:04:25 -07:00
ZappoMan
c320a87d5a Merge pull request #875 from ey6es/master 
Fix for diffuse glow with SSAO, made diffuse glow the default, improved performance, added debug statements.
 2013-08-20 18:04:10 -07:00
Andrzej Kapolka
571131d42e No glow effect on the avatar, fixed OS X warning. 2013-08-20 17:25:54 -07:00
Andrzej Kapolka
f3a32a7934 Might as well convert the divide to a multiply. 2013-08-20 17:04:29 -07:00
Andrzej Kapolka
590672d035 Fewer texture lookups when diffusing. 2013-08-20 17:02:35 -07:00
Andrzej Kapolka
49da612a4e Turns out we do have to initialize the "odd frame" field. 2013-08-20 16:37:23 -07:00
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