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
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
Philip Rosedale
65121aefb6
EditVoxels.js: Added color changing with number keys, better audio
2014-02-10 16:42:05 -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
stojce
38b5dbe4c3
Merge branch 'master' of https://github.com/worklist/hifi into 19494
2014-02-10 23:53:01 +01: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
stojce
1ac583edca
Merge branch 'master' of https://github.com/worklist/hifi into 19494
2014-02-10 22:57:55 +01: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
Andrzej Kapolka
200a2d77c2
Incorporated fixes for warnings that Brad reported on Windows.
2014-02-10 10:13:52 -08:00
Andrew Meadows
e5a700bf79
Fix crash -- use correct index.
2014-02-10 09:59:22 -08:00
Andrzej Kapolka
d48b7b8ede
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-10 09:48:24 -08:00
Andrew Meadows
be1aaee359
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 09:05:08 -08:00
Andrew Meadows
10296577f4
More info when colliding with meshes + stubbery for poking avatar.
2014-02-10 09:02:29 -08:00
Philip Rosedale
f61fe77058
Merge pull request #1950 from ZappoMan/camera_lookat_support
...
Camera lookat support
2014-02-10 08:58:12 -08:00
Andrzej Kapolka
c39f9f6271
Fix (hopefully) for Windows runtime error.
2014-02-10 00:59:51 -08:00
Andrzej Kapolka
e9579feef5
Reordering testing.
2014-02-10 00:41:15 -08:00
Andrzej Kapolka
ee2984ce6d
Streaming fixes.
2014-02-09 23:38:33 -08:00
ZappoMan
bdf5c7a6b7
changed stopKeepLookingAt() to stopLooking()
2014-02-09 23:26:46 -08:00
ZappoMan
221a5c75c7
remove debug
2014-02-09 23:22:10 -08:00
Andrzej Kapolka
f81a9d9fe8
Circular buffer work.
2014-02-09 22:29:23 -08:00
