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
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
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
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
ZappoMan
991c72006c
moving the hydra grab behavior to JS
2014-02-10 17:25:14 -08:00
Andrew Meadows
728f3c7b78
Merge branch 'avatar-interaction' of ssh://github.com/AndrewMeadows/hifi into avatar-interaction
2014-02-10 17:14:43 -08:00
Andrew Meadows
8529858134
Remove experimental joining of hand-avatar and avatar-avatar collision logic.
2014-02-10 17:12:25 -08:00
Andrew Meadows
f6be83b63c
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 17:02:46 -08:00
Andrzej Kapolka
1445fc3820
Merge pull request #1966 from AndrewMeadows/windows-fix
...
Theoretical fix for windows build of tests/metavoxels
2014-02-10 16:38:25 -08:00
Andrzej Kapolka
c16e539bcc
Merge pull request #1967 from ey6es/metavoxels
...
This should fix the remaining signed/unsigned warning on Windows.
2014-02-10 16:37:33 -08:00
Andrzej Kapolka
b9a5b13f0a
This should fix the remaining signed/unsigned warning on Windows.
2014-02-10 16:33:35 -08:00
Andrew Meadows
c8bb539a0c
Theoretical fix for windows build of tests/metavoxels
2014-02-10 16:24:10 -08:00
Andrew Meadows
ab25fd03af
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 16:01:36 -08:00
Philip Rosedale
dabf3e34d6
Merge pull request #1964 from ZappoMan/multiple_voxel_scripts_crash
...
Fixes various crashes in running multiple voxel scripts simultaneously
2014-02-10 15:43:37 -08:00
Andrew Meadows
4edc6cd88b
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 15:42:56 -08:00
Philip Rosedale
ac9e2732b9
Merge pull request #1963 from birarda/authentication
...
default avatar head and body URLS
2014-02-10 15:42:53 -08:00
Philip Rosedale
64736fe290
Merge pull request #1961 from ZappoMan/silence_bad_edit_packet_warning
...
clean up bad edit packet warnings to help reduce log clutter
2014-02-10 15:42:23 -08:00
ZappoMan
3f73b61a76
renamed hydraMove.js
2014-02-10 15:38:19 -08:00
ZappoMan
0c547a8160
added Quat.safeEulerAngles() for JS
2014-02-10 15:37:49 -08:00
AndrewMeadows
8844b375d3
Merge pull request #1956 from ey6es/metavoxels
...
Fixes for streaming, added test application for metavoxel stuff (currently, datagram transmissions), Windows crash fix, fixes for Windows warnings that Brad reported.
2014-02-10 15:36:11 -08:00
ZappoMan
c68abb3499
nodelist bug
2014-02-10 15:33:07 -08:00
ZappoMan
8acb6d13d5
move hydra thrust and view code into JS example
2014-02-10 15:25:09 -08:00
AndrewMeadows
c517675edb
Merge pull request #1931 from ey6es/master
...
Fix for textures on Blender FBX exports (such as jellyrob_blue_blender.fbx).
2014-02-10 14:27:44 -08:00
Andrew Meadows
e73c9f7095
It is now possible to "poke" moveable parts of the avatar skeleton.
2014-02-10 14:07:50 -08:00
Andrew Meadows
e2e02fc855
Removing bounding sphere measurement of hands -- not useful yet.
2014-02-10 14:04:32 -08:00
ZappoMan
4bb7bb2b77
make pending packets thread safe
2014-02-10 12:48:45 -08:00
ZappoMan
f8a24a2e99
fix crash in multiple voxel edit scripts running simultaneously
2014-02-10 12:19:46 -08:00
Stephen Birarda
37d7872677
fix a bug in version mismatched packets
2014-02-10 12:06:08 -08:00
Stephen Birarda
988c98d4d7
remove an antequated comment
2014-02-10 12:04:52 -08:00
Stephen Birarda
3e90bcd523
use shorter default URLs, set as placeholder text in prefs
2014-02-10 11:28:22 -08:00
ZappoMan
d743df902a
Merge pull request #1959 from birarda/authentication
...
default domain is root again
2014-02-10 11:25:44 -08:00
ZappoMan
a0789d3a29
clean up bad edit packet warnings to help reduce log clutter
2014-02-10 11:21:27 -08:00
Stephen Birarda
712692f8bf
add fallback default URLs for head and body models
2014-02-10 11:15:35 -08:00
Stephen Birarda
230caf5b27
add the default body and head to the resources directory
2014-02-10 10:26:28 -08:00
Stephen Birarda
27305c7a43
change default domain to root, don't double load domains on startup
2014-02-10 10:23:06 -08:00
