Stephen Birarda
|
d39cccde77
|
add a method to find a node and upate based on packet
|
2014-02-07 10:32:16 -08:00 |
|
Stephen Birarda
|
7ceacd2751
|
remove blank if and fix ping reply construction
|
2014-02-07 10:24:01 -08:00 |
|
Stephen Birarda
|
fa1825fa32
|
repairs to ping-reply, removal of deconstructPacketHeader to simply return UUID
|
2014-02-07 10:20:50 -08:00 |
|
Philip Rosedale
|
eaa05df9f7
|
Merge pull request #1924 from ey6es/metavoxels
Changes from Philip's code review.
|
2014-02-07 10:17:55 -08:00 |
|
Andrzej Kapolka
|
d3b005112e
|
Changes from Philip's code review.
|
2014-02-07 10:03:23 -08:00 |
|
Stephen Birarda
|
b988308a8d
|
leverage writeDatagram helper in NodeList, ping if no active socket
|
2014-02-07 09:49:54 -08:00 |
|
ZappoMan
|
2157349804
|
added Camera.computePickRay()
|
2014-02-07 09:40:52 -08:00 |
|
ZappoMan
|
41f6650b20
|
implement movable independent camera with hydra
|
2014-02-07 01:23:30 -08:00 |
|
ZappoMan
|
e50f6389ca
|
add more JS Quat features
|
2014-02-07 00:00:30 -08:00 |
|
ZappoMan
|
7379f9c923
|
tweaks to scriptable camera
|
2014-02-06 23:59:46 -08:00 |
|
Philip Rosedale
|
f3c3820f48
|
Merge pull request #1918 from ey6es/metavoxels
Various forms of metavoxel progress. Basic generic object editing, object streaming, parameterized scripts, reliable transfer.
|
2014-02-06 20:53:01 -08:00 |
|
ZappoMan
|
666393fdad
|
removed dead code
|
2014-02-06 20:05:48 -08:00 |
|
ZappoMan
|
77e7f336d5
|
scriptable camera
|
2014-02-06 20:03:57 -08:00 |
|
Andrzej Kapolka
|
d7df4173e5
|
Cleaner component creation.
|
2014-02-06 18:58:36 -08:00 |
|
Andrzej Kapolka
|
0a6288bda4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-06 15:42:37 -08:00 |
|
Andrzej Kapolka
|
be21eee704
|
More work on parameterized scripts.
|
2014-02-06 15:41:21 -08:00 |
|
Stephen Birarda
|
c1132726bf
|
use SharedNodePointer in place of Node where appropriate
|
2014-02-06 14:58:03 -08:00 |
|
Andrew Meadows
|
eae0f8b2e6
|
updateCollisionsWithAvatars() --> updateCollisionWithAvatars()
|
2014-02-06 14:49:25 -08:00 |
|
Andrew Meadows
|
d2d32d0ed9
|
Changing updateAvatarCollisions() to be updateCollisionsWithAvatars()
To agree with names of other similar methods.
|
2014-02-06 14:46:44 -08:00 |
|
Stephen Birarda
|
97a7369c76
|
remove senderWithAddress from NodeList
|
2014-02-06 14:43:46 -08:00 |
|
Andrew Meadows
|
082b7cf1a9
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
|
2014-02-06 14:37:19 -08:00 |
|
Stephen Birarda
|
a823722d27
|
add writeDatagram helper to NodeList to insert md5 hash
|
2014-02-06 14:28:58 -08:00 |
|
Andrew Meadows
|
802967512a
|
Splitting rendering of avatars and their collision proxies.
Also disabling old hand-avatar interactions and trying to use new stuff.
|
2014-02-06 14:14:48 -08:00 |
|
Andrew Meadows
|
b230f046a7
|
Minor formating fixes.
|
2014-02-06 14:11:11 -08:00 |
|
Andrew Meadows
|
64ca66a2b7
|
Making renderCollisionProxies() public and measuring bounding volumes of hands.
|
2014-02-06 14:09:08 -08:00 |
|
Andrzej Kapolka
|
f6320d3a81
|
I think this covers the basic bits necessary for the reliable streaming. Of
course, I haven't tested it yet.
|
2014-02-06 12:27:46 -08:00 |
|
Stephen Birarda
|
cb6316bf4d
|
fix KeyState enum spacing
|
2014-02-06 11:45:52 -08:00 |
|
Stephen Birarda
|
f10404b31e
|
allow setting of avatar URLs via AvatarData properties
|
2014-02-06 11:45:37 -08:00 |
|
Stephen Birarda
|
e72f6d16cc
|
rename NodeList ownerUUID to sessionUUID
|
2014-02-06 11:43:23 -08:00 |
|
Stephen Birarda
|
f02e1aaf47
|
cleanup the alive half of connection secrets when node dies
|
2014-02-06 11:37:52 -08:00 |
|
Stephen Birarda
|
3dca04aacb
|
have the domain-server generate connection secrets, closes #1837
|
2014-02-06 11:30:53 -08:00 |
|
Stephen Birarda
|
6f638fa62c
|
have domain-server create a UUID for unidentified nodes, closes #1840
|
2014-02-06 10:34:34 -08:00 |
|
Stephen Birarda
|
f92f9ec0c2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-02-06 09:28:03 -08:00 |
|
Philip Rosedale
|
96e8f339f5
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-02-06 08:55:52 -08:00 |
|
Philip Rosedale
|
4d55f35b1b
|
Merge pull request #1903 from ZappoMan/delete_voxel_glitch
fix slight glitch in last child delete from larger voxel
|
2014-02-06 08:17:51 -08:00 |
|
Philip Rosedale
|
a9b330baff
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-02-06 07:46:26 -08:00 |
|
Philip Rosedale
|
c1ab02b79d
|
Merge pull request #1901 from ZappoMan/fix_stutter_on_spin
fix stutter while spinning
|
2014-02-06 07:45:33 -08:00 |
|
Brad Hefta-Gaub
|
8fbce35944
|
fix slight glitch in last child delete from larger voxel
|
2014-02-06 03:44:21 -08:00 |
|
Brad Hefta-Gaub
|
a16b3a34e4
|
fix stutter while spinning
|
2014-02-06 02:18:28 -08:00 |
|
Philip Rosedale
|
0148742bc2
|
Merge pull request #1898 from ZappoMan/remove_local_cache
remove local cache option
|
2014-02-06 00:06:21 -08:00 |
|
Andrzej Kapolka
|
6b4c8b62c6
|
Back down the rabbit hole I go, weee!
|
2014-02-05 21:28:36 -08:00 |
|
ZappoMan
|
1c47ab9fcb
|
Merge branch 'master' of https://github.com/worklist/hifi into remove_local_cache
|
2014-02-05 20:57:47 -08:00 |
|
ZappoMan
|
979d323aef
|
Merge pull request #1899 from ZappoMan/fix_warning
fix warning
|
2014-02-05 20:57:33 -08:00 |
|
ZappoMan
|
4410fbb3f2
|
Merge branch 'master' of https://github.com/worklist/hifi into remove_local_cache
|
2014-02-05 20:47:35 -08:00 |
|
Brad Hefta-Gaub
|
4f5a27796f
|
fix warning
|
2014-02-05 20:46:17 -08:00 |
|
ZappoMan
|
3e4ce72b47
|
Merge pull request #1896 from birarda/library-cleanup
library and ScriptEngine cleanup
|
2014-02-05 20:34:31 -08:00 |
|
ZappoMan
|
6e6eece814
|
Merge pull request #1894 from AndrewMeadows/issue-1880
fix for visibility of head geometry when in first-person
|
2014-02-05 20:34:05 -08:00 |
|
ZappoMan
|
7c8858c7b6
|
Merge pull request #1887 from ZappoMan/fixwindowsbuild
fix windows build errors and warnings
|
2014-02-05 20:32:51 -08:00 |
|
ZappoMan
|
7e41d3b7ed
|
Merge pull request #1886 from ZappoMan/bugfixes
fix spacebar capture
|
2014-02-05 20:32:31 -08:00 |
|
ZappoMan
|
f657a3efe9
|
remove local cache option
|
2014-02-05 20:02:01 -08:00 |
|