Andrzej Kapolka
f4b47ea443
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-14 11:09:35 -08:00
ZappoMan
cd137b2b12
tweak to reload scripts
2014-02-13 21:00:20 -08:00
ZappoMan
9d841ce918
add Stop All Scripts and Reload All Scripts
2014-02-13 18:19:20 -08:00
Andrzej Kapolka
91fac4eebe
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-13 17:38:23 -08:00
Andrzej Kapolka
1afd3ab712
Fixes for OS X warnings.
2014-02-13 17:07:57 -08:00
Andrzej Kapolka
b08d452749
Fix for head appearing at wrong position for a single frame.
2014-02-13 16:49:42 -08:00
Andrzej Kapolka
5f38c328d5
Removed debugging code.
2014-02-13 16:25:04 -08:00
Andrzej Kapolka
078b15c02d
Add some hysteresis on the LOD switching to prevent rapid switching back
...
and forth.
2014-02-13 16:20:43 -08:00
Andrzej Kapolka
ff01470850
Wait until each LOD level is actually requested before we start loading;
...
before a level is loaded, try to use the closest already-loaded level.
2014-02-13 14:25:01 -08:00
Andrew Meadows
50d864901e
Improved comment about limitation of collision check.
2014-02-13 14:02:25 -08:00
Andrzej Kapolka
684a43da64
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-13 13:40:17 -08:00
Andrzej Kapolka
6a39290bf5
Basic LOD switching based on distance to camera.
2014-02-13 13:37:29 -08:00
Andrew Meadows
439cbe3f87
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
...
Conflicts:
interface/src/avatar/Hand.h
interface/src/avatar/MyAvatar.cpp
2014-02-13 12:36:01 -08:00
Andrew Meadows
b75de42802
Making the lean recovery use more tuneable parameters.
2014-02-13 12:22:40 -08:00
Andrew Meadows
d9b50359a6
Hand-face collisions now work (sorta).
2014-02-13 12:21:28 -08:00
ZappoMan
156fa6dc5a
more tweaks, removed old clouds
2014-02-13 11:03:35 -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
Andrzej Kapolka
23169c098e
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-13 10:27:36 -08:00
Andrew Meadows
312bc7521f
Making arm restoration rate independent of FPS and easier to tune.
2014-02-13 10:04:58 -08:00
Andrew Meadows
9523ea7d03
Only do slaps for MyAvatar.
2014-02-13 10:03:39 -08:00
Andrew Meadows
e793c207f9
Minor whitespace removal.
2014-02-13 10:03:14 -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
Andrew Meadows
cc70e099bf
Merge branch 'avatar-interaction' of ssh://github.com/AndrewMeadows/hifi into avatar-interaction
2014-02-12 08:31:05 -08:00
Andrew Meadows
04bc05cfe6
Moving hand-avatar collision trigger calls into MyAvatar
...
Also renaming some methods in Model to be more descriptive.
2014-02-12 08:29:22 -08:00
Philip Rosedale
0322c8b934
Added minimum sample counting method for noise reduction
2014-02-11 23:44:22 -08:00
Andrzej Kapolka
3b1b067418
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-11 16:03:41 -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
Andrew Meadows
6c4ecb0246
Splitting hand collisions between other avatars and ourself.
2014-02-11 14:38:31 -08:00
Andrzej Kapolka
edf8361cfc
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-11 14:22:45 -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
3b3359abce
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-11 14:02:08 -08:00
Andrew Meadows
d0f9b78710
Adding avatar body-body collisions to prevent near-clipping.
2014-02-11 13:48: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
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
07a2849b92
Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js
2014-02-10 19:56:05 -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
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
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
ZappoMan
991c72006c
moving the hydra grab behavior to JS
2014-02-10 17:25:14 -08:00
Andrew Meadows
8529858134
Remove experimental joining of hand-avatar and avatar-avatar collision logic.
2014-02-10 17:12:25 -08:00
