Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 01:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9354 commits 71 branches 56 tags 1.2 GiB
Commit graph

9354 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
df4e2c4273 revert 2014-02-08 11:01:32 -08:00
ZappoMan
b3ec273e33 remove animation server from unix to see if that addresses build buster, temporary solution 2014-02-08 10:53:33 -08:00
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
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
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
AndrewMeadows
64efdb2ffb Merge pull request #1930 from birarda/authentication 
groundwork for more secure node communication
 2014-02-07 14:44:23 -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
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
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
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
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
Stephen Birarda
97a7369c76 remove senderWithAddress from NodeList 2014-02-06 14:43:46 -08:00
Stephen Birarda
a823722d27 add writeDatagram helper to NodeList to insert md5 hash 2014-02-06 14:28:58 -08:00