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

17855 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
70d718178d make all volume3DOverlays handle proper ray picking against their rotated bounding box, make model overlays property ray pick as well 2014-10-17 13:36:37 -07:00
Stephen Birarda
8e047f2f9f Merge pull request #3617 from birarda/master 
@birarda is dumb and bad at conditionals
 2014-10-17 11:07:24 -07:00
Stephen Birarda
c89daa30da fix another dumb conditional mistake in domain-server 2014-10-17 11:07:02 -07:00
Stephen Birarda
94da712af0 Merge pull request #3615 from birarda/master 
flip domain-server local connect conditional
 2014-10-17 10:56:05 -07:00
Stephen Birarda
9a842e2202 flip domain-server local connect conditional 2014-10-17 10:52:36 -07:00
Leonardo Murillo
005f56c19b Merge pull request #3612 from birarda/master 
fix for pub key format returned to data-server
 2014-10-17 10:45:09 -06:00
Stephen Birarda
d00e11541e fix for pub key format returned to data-server 2014-10-17 09:39:04 -07:00
Brad Hefta-Gaub
a46610a7c1 Merge pull request #3609 from ZappoMan/groupMaterialsRendering 
small optimization to model rendering
 2014-10-16 16:24:28 -07:00
Brad Hefta-Gaub
5c5e47fb14 Merge pull request #3611 from AndrewMeadows/inertia 
longer lengths for experimental hair
 2014-10-16 16:23:39 -07:00
Brad Hefta-Gaub
90e9c85ea4 Merge pull request #3610 from samcake/temp10 
Check for msdev version and appropriate window sdk
 2014-10-16 16:23:23 -07:00
Andrew Meadows
c44a592032 longer lengths for experimental hair 2014-10-16 16:21:59 -07:00
Sam Gateau
843a64eeee Check for msdev version and appropriate window sdk 2014-10-16 16:15:01 -07:00
ZappoMan
47f5d499f6 small optimization 2014-10-16 15:26:01 -07:00
Stephen Birarda
5759b5b787 Merge pull request #3608 from birarda/master 
use OPENSSL_free to free DER public and private key buffers
 2014-10-16 15:15:12 -07:00
Stephen Birarda
1fb2dd4460 use OPENSSL_free to free DER private and public key buffers 2014-10-16 15:13:45 -07:00
Leonardo Murillo
10674ebec4 Merge pull request #3607 from birarda/master 
fix for key deletes in generateRSAKeyPair
 2014-10-16 15:53:38 -06:00
Stephen Birarda
f9e9a743fb fix error handled instances of key deletes 2014-10-16 14:49:12 -07:00
Stephen Birarda
f00a4aead6 fix for key deletes in generateRSAKeyPair 2014-10-16 14:44:17 -07:00
samcake
a6b9fe34b5 Merge pull request #3606 from ZappoMan/groupMaterialsRendering 
More Model::render() improvements
 2014-10-16 14:42:37 -07:00
ZappoMan
148b880bb1 handle case of meshes with multiple parts with different materials better, don't mix them in with single material meshes 2014-10-16 14:32:07 -07:00
ZappoMan
d1f263ecc5 group materials together when rendering models 2014-10-16 14:05:35 -07:00
Stephen Birarda
e856191bf3 Merge pull request #3605 from birarda/master 
fix for interest list pull when node requests domain list
 2014-10-16 12:05:25 -07:00
Stephen Birarda
9ba636314e Merge pull request #3595 from Atlante45/attenuation_zones 
Coefficients reordering
 2014-10-16 12:01:57 -07:00
Stephen Birarda
7bbaaf6b78 cleanup some username signature debug, fix interest list pull 2014-10-16 11:54:55 -07:00
Atlante45
d7d0a45990 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-16 11:09:33 -07:00
AndrewMeadows
e75d2a167a Merge pull request #3602 from ZappoMan/frustumCullModelParts 
More Model::render() improvements
 2014-10-16 11:04:57 -07:00
Atlante45
9019ae4f89 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
 2014-10-16 10:55:46 -07:00
Brad Hefta-Gaub
866b3d40fc Merge pull request #3604 from AndrewMeadows/inertia 
experimental hair tuning
 2014-10-16 10:53:31 -07:00
AndrewMeadows
4fbc589606 Merge pull request #3598 from birarda/domain-tunnel 
initial pass at using keypairs for username verification for basic domain-server ACL
 2014-10-16 10:49:03 -07:00
Andrew Meadows
8b54569480 experimental hair tuning submitted by Ryan 2014-10-16 10:20:12 -07:00
ZappoMan
ffb7bcf9d3 wire up different culling options to debug menus 2014-10-16 09:32:24 -07:00
Brad Hefta-Gaub
ec647ca488 Merge pull request #3603 from huffman/entity-tools 
Camera easing for entity edit tools
 2014-10-16 09:23:15 -07:00
ZappoMan
d238d06df5 build a cached lookup table for the shouldRenderMesh() LOD method 2014-10-16 01:00:32 -07:00
ZappoMan
bf77adc4bc add support for LOD occulsion for too small meshes in Model::render() 2014-10-16 00:30:24 -07:00
Brad Hefta-Gaub
8ee26923da Merge pull request #3600 from birarda/master 
some dead code removal
 2014-10-15 20:23:59 -07:00
ZappoMan
4c7ecba579 spelling change 2014-10-15 20:23:04 -07:00
ZappoMan
921a3fb8c0 switch QList<> to QVector<> and add some guards against out of range indices 2014-10-15 20:18:04 -07:00
samcake
01b64d78e3 Merge pull request #3601 from ZappoMan/frustumCullModelParts 
Implement "segregation" of mesh groups
 2014-10-15 18:09:48 -07:00
Atlante45
0ae4392d0a missing 's' 2014-10-15 17:11:24 -07:00
Atlante45
3f67f6fae7 hide panels if only advanced settings 2014-10-15 17:09:10 -07:00
ZappoMan
56b4d58f18 implement mesh groups and pull out shader programs in renderMeshes() to outside the loop based on group 2014-10-15 17:08:47 -07:00
Atlante45
ad48009ecd Switch buffers back to advanced 2014-10-15 17:08:45 -07:00
ZappoMan
952a604d77 added some more rendering stats 2014-10-15 16:49:09 -07:00
Atlante45
0cf4483c5a factor text-align and font-size 2014-10-15 15:52:59 -07:00
Atlante45
0688379b74 changed buttons class names 2014-10-15 15:15:19 -07:00
Stephen Birarda
fcd73858b8 remove Faceplus as a face tracker option 2014-10-15 15:13:52 -07:00
Stephen Birarda
a2b3ba2551 remove the Doxyfile, not used for documentation 2014-10-15 14:57:54 -07:00
Stephen Birarda
449ce065d7 remove hifi.podspec, currently unused 2014-10-15 14:56:44 -07:00
Stephen Birarda
72f0bc61a2 remove some extra spaces 2014-10-15 14:54:28 -07:00
ZappoMan
8a83511942 first cut at separating opaque from transparent meshes 2014-10-15 14:40:42 -07:00