Andrzej Kapolka
861ae12151
Added Visage stuff to .gitignore.
2014-02-13 16:53:17 -08:00
Andrzej Kapolka
1fba28d45e
Merge branch 'master' of https://github.com/highfidelity/hifi into kissage
2014-02-13 16:51:44 -08:00
Philip Rosedale
7bb7271976
Merge pull request #1993 from ZappoMan/removesomedefaultsettings
...
More menu tweaks
2014-02-13 11:26:52 -08:00
ZappoMan
156fa6dc5a
more tweaks, removed old clouds
2014-02-13 11:03:35 -08:00
Philip Rosedale
40f9e0a029
Merge pull request #1991 from ZappoMan/removesomedefaultsettings
...
DO NOT MERGE: tweaks to default menus for alpha
2014-02-13 11:01:26 -08:00
ZappoMan
6d75efd2b0
tweaks to default menus for alpha, make Gravity false so we don't fall into abyss
2014-02-13 10:46:28 -08:00
ZappoMan
5ad74a04f1
Merge pull request #1989 from PhilipRosedale/master
...
Improved EditVoxels script, improve and cleanup noise reduction
2014-02-13 00:14:40 -08:00
Philip Rosedale
50df17dc10
fix windows build buster
2014-02-12 23:37:19 -08:00
Philip Rosedale
595eb38c72
comment out debug
2014-02-12 22:57:13 -08:00
Philip Rosedale
be7d1a5723
Adjustments to noise gate, commit to min sampling method
2014-02-12 22:53:46 -08:00
Philip Rosedale
3a807c1914
comment out debugging spam, improved EditVoxels
2014-02-12 17:57:52 -08:00
Philip Rosedale
0322c8b934
Added minimum sample counting method for noise reduction
2014-02-11 23:44:22 -08:00
Andrzej Kapolka
8206f8d2b3
Fixes for Windows. Compiles, but the license doesn't work yet.
2014-02-11 19:00:41 -08:00
Andrzej Kapolka
c078012614
Sniffing glue, wrong day, etc.
2014-02-11 17:26:31 -08:00
Andrzej Kapolka
87f7e2465f
Missed a spot.
2014-02-11 17:25:25 -08:00
Andrzej Kapolka
a9b415b0f9
More build settings.
2014-02-11 17:22:40 -08:00
Andrzej Kapolka
b3fba320fc
We need the dependencies, too.
2014-02-11 17:03:24 -08:00
Andrzej Kapolka
25066f8b4f
Starting on Visage integration.
2014-02-11 16:44:25 -08:00
Andrzej Kapolka
9851d01411
Merge branch 'master' of https://github.com/highfidelity/hifi into kissage
2014-02-11 16:04:04 -08:00
Andrzej Kapolka
78e15e0212
Starting on Visage support.
2014-02-11 16:03:23 -08:00
Andrzej Kapolka
e29d6210bb
Merge pull request #1981 from AndrewMeadows/avatar-interaction
...
Avatar body-body collisions
2014-02-11 16:02:43 -08:00
Andrew Meadows
66dc4e17ad
Fixing formatting to be KR
2014-02-11 15:59:35 -08:00
Philip Rosedale
1412d49a2f
merge fix
2014-02-11 15:08:49 -08:00
Philip Rosedale
b6edd7be7b
add Vec3::subtract in JS
2014-02-11 15:07:25 -08:00
Andrzej Kapolka
3c535e6c9c
These need to be FST files, too.
2014-02-11 14:38:44 -08:00
Andrzej Kapolka
edf8361cfc
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-11 14:22:45 -08:00
Philip Rosedale
cd057af1e3
Merge pull request #1972 from ZappoMan/move_hydra_flying_to_js
...
Move Hydra movement code from C++ to JS
2014-02-11 14:22:22 -08:00
Andrzej Kapolka
b6d77ec637
Switched from loading FBX and FST simultaneously to loading FST first, then
...
using its filename and texdir properties (as Faceshift does) to locate the
corresponding model. Also fixed a bug with the fallback models (they were
invisible after second failure).
2014-02-11 14:20:52 -08:00
Andrew Meadows
d0f9b78710
Adding avatar body-body collisions to prevent near-clipping.
2014-02-11 13:48:48 -08:00
ZappoMan
1fca763b9d
removed whitespace to get build to run
2014-02-11 12:43:48 -08:00
ZappoMan
5688e22e6c
Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js
2014-02-11 11:37:32 -08:00
Philip Rosedale
803d0fd7c7
Merge pull request #1976 from AndrewMeadows/fix-mouselook
...
Fix mouselook roll
2014-02-11 09:38:48 -08:00
Andrew Meadows
887fa0c938
Only resolve our hand collisions that would not move the other avatar.
...
This helps us only penetrate the moveable parts of other avatars.
2014-02-11 09:23:40 -08:00
Andrew Meadows
861778347f
Fixing windows compile warnings about signed vs unsigned compare.
2014-02-11 08:54:40 -08:00
Andrew Meadows
ed610c0739
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-mouselook
2014-02-11 08:47:02 -08:00
Andrew Meadows
7840b351dd
Fix for #1968 : head does not roll
2014-02-11 08:43:56 -08:00
ZappoMan
9244180cb4
removed debug
2014-02-10 20:27:39 -08:00
ZappoMan
07a2849b92
Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js
2014-02-10 19:56:05 -08:00
ZappoMan
4b2ddc9021
remove dead comment
2014-02-10 19:53:34 -08:00
ZappoMan
91740f89f8
Merge pull request #1971 from ey6es/master
...
Ignore extra "=1"'s that Faceshift appends to FST files, fall back to default head/body on failure to load.
2014-02-10 19:50:26 -08:00
ZappoMan
4b5e633258
tweaks to hydraMove.js, added scale to MyAvatar JS
2014-02-10 19:48:51 -08:00
Andrzej Kapolka
f9e9d62fe3
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-10 19:02:58 -08:00
Andrzej Kapolka
2071da2c8a
Provide a means to specify a fallback for when we fail to load a model. Also
...
added missing associated resources for default model. Closes #1960 .
2014-02-10 18:50:36 -08:00
Andrzej Kapolka
bbb8e2a45f
Ignore the =1's that Faceshift appends to our custom data in the FST.
2014-02-10 17:41:57 -08:00
Philip Rosedale
990f0ef3a5
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-10 17:41:56 -08:00
ZappoMan
98211a832c
Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js
2014-02-10 17:41:21 -08:00
Philip Rosedale
0527cf886e
Merge pull request #1965 from AndrewMeadows/avatar-interaction
...
Avatar interaction first pass
2014-02-10 17:36:54 -08:00
ZappoMan
8b45e0e3a8
Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js
2014-02-10 17:34:35 -08:00
Philip Rosedale
49292a478e
EditVoxels.js: Added new voxel making in front of camera with ‘9’
2014-02-10 17:28:24 -08:00
ZappoMan
991c72006c
moving the hydra grab behavior to JS
2014-02-10 17:25:14 -08:00
