Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-12 19:04:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17957 commits 25 branches 0 tags 1.1 GiB
Commit graph

17957 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
5ecdb58e20 generate a new keypair on every interface launch 2014-10-17 16:55:50 -07:00
Andrzej Kapolka
1b9b0f9fc9 Look for and store the "Skeleton" type flag so that we can offer only skeleton 
joints in the dropdown.
 2014-10-17 16:51:55 -07:00
ZappoMan
61b53701f3 fix some comments 2014-10-17 16:07:08 -07:00
Brad Hefta-Gaub
023d47918f Merge pull request #3620 from birarda/domain-tunnel 
repairs to domain change reset to correctly clear nodes
 2014-10-17 16:05:28 -07:00
Brad Hefta-Gaub
af9090cadf Merge pull request #3618 from birarda/master 
styling fixes for locked table settings in domain-server
 2014-10-17 16:05:04 -07:00
AndrewMeadows
415c7375cb Merge pull request #3614 from ZappoMan/removeParticles 
Remove particles
 2014-10-17 15:53:19 -07:00
Andrzej Kapolka
1e6aee1872 Basic heightfield conversion. 2014-10-17 15:23:54 -07:00
Stephen Birarda
7cb8cbfdd4 repairs to domain change reset to clear nodes 2014-10-17 14:49:25 -07:00
Stephen Birarda
e72b86059e Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-17 14:48:43 -07:00
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
Ryan Huffman
2a4092f287 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-new 2014-10-17 12:44:11 -07:00
Stephen Birarda
1e4eaed7fd don't show domain ID selection button if in master config 2014-10-17 12:25:23 -07:00
Andrzej Kapolka
f115416a5d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-17 11:41:01 -07:00
Stephen Birarda
0d99beb344 add styling to locked table 2014-10-17 11:33:29 -07:00
Stephen Birarda
796b519fe0 remove change buttons for a locked table 2014-10-17 11:24:51 -07:00
Stephen Birarda
7c24186baa don't allow the creation of new table rows if table locked 2014-10-17 11:23:39 -07:00
Stephen Birarda
5b0ccd7091 fix for for clickable labels and locked table 2014-10-17 11:22:42 -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
ZappoMan
e29188bacd fix SVOs to render again 2014-10-17 11:01:25 -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
ZappoMan
6fdd489715 more Particles to Entities migration 2014-10-17 10:25:52 -07:00
ZappoMan
a1ecad683a more Particles to Entities migration 2014-10-17 10:17:18 -07:00
ZappoMan
0ff6c491d4 more Particles to Entities migration 2014-10-17 10:11:47 -07:00
ZappoMan
25270efa42 more Particles to Entities migration 2014-10-17 10:01:08 -07:00
ZappoMan
aaa76f6071 more Particles to Entities migration 2014-10-17 09:59:03 -07:00
ZappoMan
597bfa33b9 more Particles to Entities migration 2014-10-17 09:53:53 -07:00
ZappoMan
e5b665cc30 more Particles to Entities migration 2014-10-17 09:50:15 -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
ZappoMan
c5c44e7cec more Particles to Entities migration 2014-10-16 21:13:34 -07:00
ZappoMan
7ca4c95d4a more Particles to Entities migration 2014-10-16 21:03:40 -07:00
ZappoMan
ce638dd14d more Particles to Entities migration 2014-10-16 20:52:38 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
Andrzej Kapolka
1fdfb51600 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-16 18:54:03 -07:00
Andrzej Kapolka
131486c8f7 More progress on voxelizing heightfields. 2014-10-16 18:53:42 -07:00
Sam Gateau
a8c3b18e78 Adding the Batch class to GPU and fixing the compilation issues 2014-10-16 17:29:40 -07:00
Sam Gateau
f09133f413 Adding the Batch class to GPU 2014-10-16 17:23:31 -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
Andrzej Kapolka
fc6f0afb93 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-16 15:03:29 -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