ZappoMan
e517125cfb
Merge pull request #1938 from AndrewMeadows/fix-mouselook
...
Fix mouselook
2014-02-07 18:34:09 -08:00
Andrew Meadows
6b2c7c556d
Fixing mouselook.
...
Faceshift head rotations are stored separately and then integrated into
the final (rendered) head rotation at the right times but do not affect
the camera.
2014-02-07 17:46:14 -08:00
Andrew Meadows
8c3ba5b2de
Cruft removal. We don't use Head::YawRate stuff.
2014-02-07 17:45:25 -08:00
Andrew Meadows
3894fc0cb8
Minor comment change.
2014-02-07 17:44:43 -08:00
Stephen Birarda
a90ca59027
pools are allowed to have dashes
2014-02-07 17:30:32 -08:00
ZappoMan
235673b7fe
Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting
2014-02-07 16:27:52 -08:00
ZappoMan
e9070b1d70
add an example of adding a voxel when clicking on a voxel
2014-02-07 15:48:46 -08:00
Andrzej Kapolka
d16242f980
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-07 15:43:45 -08:00
Leonardo Murillo
d5b8d1c0d6
Merge pull request #1936 from birarda/master
...
fix a bug in domain-server and ping timing
2014-02-07 17:38:02 -06:00
Stephen Birarda
cf05600d73
fix miss of pingType in timePingReply, closes #1934
2014-02-07 15:27:44 -08:00
Stephen Birarda
f237b77fa7
fix a bad cast to Assignment, closes #1935
2014-02-07 15:26:18 -08:00
ZappoMan
ac05c6d4c3
add example code
2014-02-07 15:21:16 -08:00
Andrzej Kapolka
de95585c9c
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-07 15:12:38 -08:00
Stephen Birarda
acf21af893
Merge pull request #1932 from birarda/master
...
switch back to proper data-server
2014-02-07 15:07:16 -08:00
Stephen Birarda
3e13608e19
switch back to proper data-server
2014-02-07 15:06:57 -08:00
ZappoMan
802f72c732
more ray picking and intersection work
2014-02-07 15:06:32 -08:00
ZappoMan
70a4ff1e75
fix cmake qt issue
2014-02-07 14:54:50 -08:00
ZappoMan
e162aa4a40
Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting
2014-02-07 14:47:25 -08:00
Andrzej Kapolka
a49ec2f11b
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-07 14:45:03 -08:00
AndrewMeadows
64efdb2ffb
Merge pull request #1930 from birarda/authentication
...
groundwork for more secure node communication
2014-02-07 14:44:23 -08:00
Andrzej Kapolka
f6ca042ffc
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-07 14:33:25 -08:00
Stephen Birarda
f945aac5cd
bump version on unverified packets whose header format has changed
2014-02-07 14:32:09 -08:00
Stephen Birarda
a1a4a3db8a
HifiSockAddr to SharedNodePointer changes in MetavoxelServer
2014-02-07 14:27:10 -08:00
Andrzej Kapolka
9c3624d0d9
Fix for texture on jellyrob_blue_blender.fbx; apparently you can map textures,
...
as well as materials, by polygon. Closes #1844 .
2014-02-07 14:25:48 -08:00
Stephen Birarda
5bfc77a899
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-07 14:15:04 -08:00
AndrewMeadows
086140c33d
Merge pull request #1928 from birarda/mesh-through-mixer
...
move avatar mesh and skeleton back through mixer
2014-02-07 14:12:20 -08:00
Stephen Birarda
3bf0ed719c
remove a comment in HifiSockAddr
2014-02-07 14:08:42 -08:00
Stephen Birarda
dd4d944dea
ping inactive nodes in conjunction with domain server check in
2014-02-07 14:06:42 -08:00
Stephen Birarda
94c449e10c
Merge branch 'mesh-through-mixer' into authentication
2014-02-07 13:50:39 -08:00
Stephen Birarda
72a3e6f22c
fix long column in NodeList
2014-02-07 13:49:59 -08:00
Stephen Birarda
05f086ae74
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-07 13:48:28 -08:00
Stephen Birarda
7c6d3cd01f
fix broken build from NetworkPacket
2014-02-07 13:46:59 -08:00
Stephen Birarda
455442088c
Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer
2014-02-07 13:45:14 -08:00
Stephen Birarda
3ad8e7260e
fix an accidental DOS and remove getNodeActiveSocketOrPing API
2014-02-07 13:42:52 -08:00
ZappoMan
e78a40a557
Merge pull request #1927 from ey6es/master
...
Have eyes converge on hovered avatar/voxel.
2014-02-07 13:40:06 -08:00
Stephen Birarda
a5636d2dc0
make ThreadedAssignment subclasses handle QUdpSocket readyRead, closes #1895
2014-02-07 12:25:43 -08:00
Andrzej Kapolka
3e2ba9fb7e
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-07 11:26:55 -08:00
Andrzej Kapolka
67bef20f93
Have eyes converge on hovered avatar/voxel. Closes #1883 .
2014-02-07 11:26:15 -08:00
ZappoMan
c64b934d33
first cut at ray cast scripting
2014-02-07 11:23:04 -08:00
Philip Rosedale
8ca7a60927
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-07 11:21:26 -08:00
Philip Rosedale
72de486671
Merge pull request #1920 from ZappoMan/scriptable_camera
...
Scriptable camera
2014-02-07 11:21:12 -08:00
Stephen Birarda
66d4eeb805
enforce both a version and hash match for packets
2014-02-07 11:10:38 -08:00
Andrew Meadows
2e65592048
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-07 10:50:36 -08:00
Andrew Meadows
7a8186f1da
Adding ModelCollisionInfo struct to get more info about collisions against avatars.
...
Had to disable some collisions. Will go back and make them work again soon.
2014-02-07 10:48:30 -08:00
Andrew Meadows
0a4eec448e
Removing findSpherePenetration() from AvatarData class
2014-02-07 10:47:00 -08:00
Philip Rosedale
263d94b1e3
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-07 10:34:26 -08:00
Stephen Birarda
997bea708d
fix a PacketTypeVoxelQuery typo
2014-02-07 10:32:48 -08:00
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
