Commit graph

28031 commits

Author SHA1 Message Date
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -07:00
Stephen Birarda
f3d5b8f7c6 add a missing semicolon 2015-07-13 11:18:20 -07:00
Stephen Birarda
e5d8a39dde update DomainServer to new packet receive API 2015-07-13 11:11:52 -07:00
Stephen Birarda
1dccc144e7 fix compile errors after PacketReceiver changes 2015-07-13 10:10:22 -07:00
Stephen Birarda
c23899aec2 repairs to packet listener registration 2015-07-13 10:02:53 -07:00
Stephen Birarda
3d62162812 cleanup octree networking code to use new API 2015-07-13 09:40:26 -07:00
Brad Hefta-Gaub
db8d8a34bf Merge pull request #5310 from sethalves/improve-voxel.js
allow voxels.js to work on an empty voxel-space
2015-07-13 07:17:12 -07:00
Seth Alves
fb23eb0faf Merge pull request #5301 from samcake/yellow
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
2015-07-12 11:36:03 -07:00
Seth Alves
87152a4de2 Merge pull request #5302 from AndrewMeadows/astatine
cleanup of ObjectActionSpring and AvatarActionHold
2015-07-12 11:17:09 -07:00
Seth Alves
c56b2918a4 allow voxels.js to work on an empty voxel-space 2015-07-12 10:35:44 -07:00
Andrew Meadows
9ce9c541de fix activation of object when action changes 2015-07-10 18:45:40 -07:00
Stephen Birarda
ffcd8e1613 update connection for packet version mismatch 2015-07-10 17:54:51 -07:00
Stephen Birarda
9ee62a8a38 fix for connection denied packet in Application 2015-07-10 17:52:51 -07:00
Stephen Birarda
d85fbbfb74 update NodeList for new packet receive code 2015-07-10 17:45:23 -07:00
Philip Rosedale
2480402515 Merge pull request #5305 from howard-stearns/sword-update
Functional sword script
2015-07-10 17:05:24 -07:00
Brad Hefta-Gaub
2439e4faab Merge pull request #5304 from jherico/homer
Removing heap allocation from property flag parsing, adding some manual tests
2015-07-10 17:04:50 -07:00
Stephen Birarda
4442bb55d6 resolve conflicts on merge with huffman/receive_packets 2015-07-10 16:47:27 -07:00
Stephen Birarda
990f7b7332 changes for new packet receive API 2015-07-10 16:45:44 -07:00
Ryan Huffman
cc7bfd90f1 Move audio packet handling to listener in Agent 2015-07-10 16:27:42 -07:00
Ryan Huffman
fe5b17f061 Remove readPendingDatagrams from ThreadedAssignment 2015-07-10 16:15:05 -07:00
Ryan Huffman
910836fa5a Remove readPendingDatagrams from AudioMixer 2015-07-10 16:14:40 -07:00
Ryan Huffman
0d920c7b7c Update method name in AssignmentClient 2015-07-10 16:14:23 -07:00
Ryan Huffman
5c831efe64 Remove avatar packet processing from Agent 2015-07-10 16:13:57 -07:00
Brad Davis
eb9d52fbb3 Helps to actually commit the fix 2015-07-10 16:11:56 -07:00
Brad Davis
c1b72db18d Still trying to get jenkins builds to work 2015-07-10 16:00:51 -07:00
Ryan Huffman
1fb4c13b3c Update AssignmentClient to use PacketReceiver 2015-07-10 15:51:12 -07:00
Howard Stearns
c340d336dc Functional sword script:
Mouse and hydra.
Switchable hands.
Scores above buttons (2d) and above head in-world.
Adds avatar hit sound while sword is brandished.
2015-07-10 15:43:56 -07:00
Brad Davis
3db3676fae Fixing compile failure 2015-07-10 15:26:22 -07:00
Sam Gateau
98f10e72ec fix the wrong function name that happened missing a merge 2015-07-10 15:20:49 -07:00
Brad Davis
2ce8dba819 Removing heap allocation from property flag parsing, adding some manual tests 2015-07-10 15:08:10 -07:00
Ryan Huffman
1c212ba1a1 Disable disabling of entity nack packet temporarily 2015-07-10 15:01:45 -07:00
Ryan Huffman
d74ce12098 Remove declaration processAvatarMixerDatagram from AvatarHashMap 2015-07-10 15:01:21 -07:00
Ryan Huffman
dee117500b Remove process() from OctreePacketProcessor 2015-07-10 15:00:46 -07:00
Ryan Huffman
99aaefbd03 Fix and update signature of Application::handleDomainConnectionDeniedPacket 2015-07-10 15:00:29 -07:00
Ryan Huffman
6e53a5ad97 Update OctreePacketProcessor to use SharedNodePointer 2015-07-10 14:23:09 -07:00
Ryan Huffman
74afbd7de7 Fix AudioMixer packetReceiver calls 2015-07-10 14:22:46 -07:00
Brad Davis
200cbd7e8d Merge pull request #5303 from ZappoMan/animationGlitch
fix motor proteins in cell science
2015-07-10 12:59:50 -07:00
ZappoMan
1dd40af162 fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change 2015-07-10 12:43:35 -07:00
Andrew Meadows
9cb7e86877 cleanup of AvatarActionHold deserialization 2015-07-10 12:34:12 -07:00
Stephen Birarda
2d1c3e27da fix parameter matching in PacketReceiver 2015-07-10 12:27:44 -07:00
Andrew Meadows
294c1ba367 always serialize ACTION_TYPE_SPRING 2015-07-10 12:25:11 -07:00
Andrew Meadows
56f00a526d cleanup of ObjectActionSpring 2015-07-10 12:25:11 -07:00
Andrew Meadows
90ae1fea8b handle case where action params are missing 2015-07-10 12:25:11 -07:00
Andrew Meadows
71440dfbc5 add checks for NaN 2015-07-10 12:25:11 -07:00
Ryan Huffman
972c465bdb Remove PacketReceiver copy ctor and = operator 2015-07-10 12:25:01 -07:00
Ryan Huffman
2f0c21a603 Temporarily disable packet dispatching in PacketReceiver 2015-07-10 12:24:35 -07:00
Ryan Huffman
5a862739aa Fix shared ptr call in AvatarHashMap 2015-07-10 12:24:17 -07:00
Ryan Huffman
09f978207b Add packet handling to OctreeServer 2015-07-10 12:23:58 -07:00
Ryan Huffman
1ee7a83927 Add EntityServer packet handling 2015-07-10 12:23:35 -07:00