Atlante45
bd4e8a172d
typo
2014-10-22 13:40:58 -07:00
Atlante45
fc9010dd6b
missing endif
2014-10-22 13:38:49 -07:00
Atlante45
ad2eb08964
Correctly link in cmake
2014-10-22 13:11:45 -07:00
Atlante45
ccc8e0d876
Statically link gverb
2014-10-22 12:56:44 -07:00
Atlante45
e496304f7e
Changed include dir
2014-10-22 11:36:23 -07:00
Atlante45
1739cf019d
Gverb library CMakeLists
2014-10-22 11:35:51 -07:00
Atlante45
e9d3729238
Remove unnecessary header
2014-10-22 10:30:46 -07:00
Atlante45
d81158f941
Remove Gverb source code
2014-10-21 17:45:21 -07:00
Atlante45
9a7ca8b132
Fix header
2014-10-20 17:23:58 -07:00
Atlante45
ee4c7c25bf
Header fix
2014-10-20 16:50:49 -07:00
Atlante45
7c54da033c
Changed reverb time label
2014-10-20 16:29:19 -07:00
Atlante45
5854036296
cmake fix for ubuntu
2014-10-20 16:02:59 -07:00
Atlante45
588b106f5e
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-20 15:38:31 -07:00
Atlante45
94f66ef37a
Reverb logic tweaks
2014-10-20 15:35:01 -07:00
Atlante45
6f9557fe67
Do not destroy script reverb settings
2014-10-20 15:06:02 -07:00
Atlante45
5a11104bdf
Updated script
2014-10-20 13:45:16 -07:00
Atlante45
997f1db835
handle JSON for audioEffectOptions args
2014-10-20 13:37: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
Atlante45
ce949b7350
Coding Standard default values
2014-10-20 12:11:29 -07:00
Andrzej Kapolka
662189159d
Fix for Xcode warning.
2014-10-20 12:09:33 -07:00
Atlante45
85d56824a0
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-20 11:51:39 -07:00
Atlante45
37b47b52d3
Stream reverb settings from mixer to interface
2014-10-20 11:49:57 -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
Atlante45
86b87770c2
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-17 16:50:19 -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
Atlante45
89cb464eaa
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-17 14:03:11 -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