Andrzej Kapolka
45fb31cd08
Basic network simulation for metavoxels.
2014-10-20 18:43:41 -07:00
Andrzej Kapolka
b796e1bedd
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-20 16:17:16 -07:00
Andrzej Kapolka
d64b43693d
Networking fix.
2014-10-20 15:33:46 -07:00
Andrzej Kapolka
e586b6e29b
Remove nodes with no opaque elements.
2014-10-20 12:27:49 -07:00
Andrzej Kapolka
b719f00547
Merge pull request #3625 from ey6es/metavoxels
...
Fix for Xcode warning.
2014-10-20 12:13:44 -07:00
Andrzej Kapolka
662189159d
Fix for Xcode warning.
2014-10-20 12:09:33 -07:00
AndrewMeadows
2569f70ac3
Merge pull request #3623 from ey6es/master
...
For FBX files with marked "skeleton" joints, only show those marked nodes in the upload dialog. Also added some more default node names to look for on upload.
2014-10-20 09:00:06 -07:00
AndrewMeadows
2e958599aa
Merge pull request #3621 from ey6es/metavoxels
...
Sculpt brush, very rough conversion of heightfield patches to dual contour surfaces on edit.
2014-10-20 08:55:01 -07:00
AndrewMeadows
7a97634a78
Merge pull request #3616 from ZappoMan/fixSVOs
...
fix SVOs to render again
2014-10-20 08:33:42 -07:00
AndrewMeadows
f7c4804f33
Merge pull request #3613 from ctrlaltdavid/20112
...
CR for Job #20112 - chat alerts persist
2014-10-20 08:32:32 -07:00
Andrzej Kapolka
32c5f6e40e
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-17 18:28:16 -07:00
Andrzej Kapolka
da60a17b45
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-10-17 18:27:31 -07:00
Andrzej Kapolka
e98b99fe84
Merge pull request #3622 from birarda/domain-tunnel
...
work around double login issue by generating keypair on each launch
2014-10-17 18:05:45 -07:00
Andrzej Kapolka
c979ace924
Read the unit scale factor and include it in the offset scale.
2014-10-17 17:34:27 -07:00
Stephen Birarda
5882001311
Merge pull request #3619 from ZappoMan/modelOverlayRayPick
...
ray picking support for Model and 3D volume overlays
2014-10-17 17:03:37 -07:00
Andrzej Kapolka
1940fe67a0
Add jointEyeLeft/jointEyeRight/jointNeck to list of nodes we check for on
...
upload.
2014-10-17 16:57:15 -07:00
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
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
