Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 01:46:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29060 commits 25 branches 0 tags 1.1 GiB
Commit graph

10918 commits

Author SHA1 Message Date
Stephen Birarda
271575c832 remove unused octree method 2015-07-16 16:08:21 -07:00
Stephen Birarda
846506901a more removals from PacketHeaders 2015-07-16 16:06:56 -07:00
Stephen Birarda
1bb3e1789a remove more PacketHeader methods 2015-07-16 16:05:27 -07:00
Stephen Birarda
61653bd88d remove old PacketHeader methods 2015-07-16 16:04:12 -07:00
Stephen Birarda
648f9868f0 add back space in PacketHeaders 2015-07-16 15:58:34 -07:00
Stephen Birarda
83f98a3e57 remove line number comment for enum 2015-07-16 15:58:18 -07:00
Stephen Birarda
eb5fdd7214 clear unused types and push version to 10 2015-07-16 15:57:19 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
Stephen Birarda
a6641908fb check if audio mixer is alive before packet send 2015-07-16 15:49:15 -07:00
Stephen Birarda
c5047ec76d fix sequence number packing for audio injector 2015-07-16 15:47:25 -07:00
Atlante45
56886e479d Use BulkAvatarData packet type for AvatarMixer upstrea 2015-07-16 15:28:53 -07:00
Atlante45
7cb4afd718 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 14:22:40 -07:00
Stephen Birarda
f31675c4c6 fix ice-server packets 2015-07-16 14:21:37 -07:00
Ryan Huffman
b561014d77 Add head-lean reading back into AvatarData 2015-07-16 14:11:36 -07:00
Ryan Huffman
3429f0f57c Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-16 14:06:21 -07:00
Ryan Huffman
f8f47f99c6 Temporarily disable body lean in avatar 2015-07-16 14:03:36 -07:00
Atlante45
00fbff112f Process avatar data 2015-07-16 14:03:11 -07:00
Atlante45
a7754ad085 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 13:52:32 -07:00
Stephen Birarda
ed928e8a6b actual fix for AddressManager address with port 2015-07-16 13:52:18 -07:00
Atlante45
246b39a18a Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 13:42:08 -07:00
Stephen Birarda
5d84d2ec30 add port to current address if not default 2015-07-16 13:39:14 -07:00
Stephen Birarda
76d47eb4e7 mark the DataServerConfirm packet unused 2015-07-16 13:22:18 -07:00
Atlante45
b4121eb464 Remove unnecessary move 2015-07-16 13:14:17 -07:00
Stephen Birarda
05dd49a4c5 seek back after track of octree packet 2015-07-16 13:02:20 -07:00
Sam Gateau
50a521e1f2 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-16 12:38:47 -07:00
Stephen Birarda
60ae02e4e9 some formatting changes in entities 2015-07-16 12:38:39 -07:00
Sam Gateau
4ca333efe1 Adding the scissor rect in the Batch and a way to enable the scissor test locally for clear commands 2015-07-16 12:38:11 -07:00
Ryan Huffman
87f891288f Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-16 12:14:46 -07:00
Ryan Huffman
10c69fefe1 Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-16 12:14:36 -07:00
Ryan Huffman
1d1962d5f5 Fix avatar data processing 2015-07-16 12:10:28 -07:00
Stephen Birarda
7a48463f4e Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-16 12:09:55 -07:00
Stephen Birarda
8921f59e23 fix entity packet send from interface client 2015-07-16 12:09:35 -07:00
Stephen Birarda
61f23f6a5e Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-16 11:56:26 -07:00
Stephen Birarda
336967e580 fix edit packet sending from client 2015-07-16 11:17:49 -07:00
Atlante45
bf637f8f18 Fix broadcast to nodes 2015-07-16 10:50:05 -07:00
Atlante45
ae8e79750b Stop ping timer in handle node kill 2015-07-16 10:00:54 -07:00
Atlante45
8424e91ae1 Added sequence number to packets 2015-07-16 10:00:01 -07:00
Atlante45
c6f6dbd845 Fix QByteArray from rqw data 2015-07-16 09:59:15 -07:00
Niraj Venkat
022529f03f Render depth buffer to quad 
Useful for graphics debugging
 2015-07-16 09:46:28 -07:00
Ryan Huffman
6f112f38c3 Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-16 07:57:18 -07:00
Stephen Birarda
039ef0750c set jurisdiction listener object name for thread identification 2015-07-15 18:52:59 -07:00
Stephen Birarda
6fa17dafff open packets for write with ReadWrite 2015-07-15 18:27:43 -07:00
Stephen Birarda
000232a55d fix copied packet buffer creation 2015-07-15 17:59:37 -07:00
Stephen Birarda
863cc3390a fix send of mixed audio stream packet from AM 2015-07-15 17:41:00 -07:00
Stephen Birarda
765e8cbb87 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-15 17:37:51 -07:00
Stephen Birarda
333cd77d9c cleanup call to parseAudioData 2015-07-15 17:20:02 -07:00
samcake
b7ac84e174 Merge pull request #5342 from ZappoMan/removeNakeGL 
remove some more dead code and naked gl
 2015-07-15 17:07:55 -07:00
Stephen Birarda
9318f464a4 fix position of read in InboundAudioStream 2015-07-15 16:42:58 -07:00
Atlante45
6c98c23524 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:36:22 -07:00
ZappoMan
5165210e11 fix Sams comment about comments 2015-07-15 16:35:20 -07:00
Stephen Birarda
273e92f1fd pass correct size for audio read 2015-07-15 16:34:00 -07:00
Atlante45
43e2961810 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:33:24 -07:00
Stephen Birarda
3cba3d0dcd fix packet receiver cleanup 2015-07-15 16:33:12 -07:00
Atlante45
ce5bcb8de1 Check ptr 2015-07-15 16:33:04 -07:00
Ryan Huffman
6502359f04 Update NodeList's PacketReceiver to be a pointer 2015-07-15 16:29:15 -07:00
Atlante45
cb64b0353e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:26:11 -07:00
Stephen Birarda
8f8845d78d remove accidentally re-added PacketHeaders 2015-07-15 16:25:04 -07:00
Atlante45
a2644752a4 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:20:11 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
Stephen Birarda
00c1dce3e5 disconnect readyRead in LimitedNodeList dtor 2015-07-15 16:16:26 -07:00
Atlante45
2b27918953 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:10:51 -07:00
Stephen Birarda
dd4c2eaccd add seek back for ping packet 2015-07-15 16:10:32 -07:00
Atlante45
644545b965 Seek to start of ping packet 2015-07-15 16:10:08 -07:00
Sam Gateau
9657d146f7 Clearing Model.cpp from naked gl call references 2015-07-15 16:09:53 -07:00
Atlante45
4db2a77f9f Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 15:58:28 -07:00
Atlante45
f065638748 Ping code cleanup 2015-07-15 15:58:14 -07:00
Stephen Birarda
97936c82f2 add a missing library link 2015-07-15 15:58:05 -07:00
Stephen Birarda
85a5d7059c fix naming of variable in timePingReply 2015-07-15 15:56:31 -07:00
ZappoMan
d1e511efcb more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl 2015-07-15 15:52:12 -07:00
Ryan Huffman
c6b14ec9fb Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-15 15:51:56 -07:00
Stephen Birarda
52fdce4a44 fix fromRawData call for silent audio packet 2015-07-15 15:41:45 -07:00
ZappoMan
2ad2c4d554 remove some dead code 2015-07-15 15:33:28 -07:00
ZappoMan
293ccc1713 remove some dead code 2015-07-15 15:32:02 -07:00
Atlante45
725383e43a Check ptr, not addr 2015-07-15 15:30:54 -07:00
Atlante45
8483b168be Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 15:26:34 -07:00
Atlante45
85391cefbb Bug fixes 2015-07-15 15:26:22 -07:00
Stephen Birarda
5a2d59c530 fix ScriptEngine cleanup for Agent 2015-07-15 15:07:34 -07:00
Ryan Huffman
9a3ba20f11 Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-15 15:02:17 -07:00
Ryan Huffman
07e3cf1348 Add COMPARE_DATA to QTestExtensions 2015-07-15 15:01:56 -07:00
Ryan Huffman
ad61c3db41 Fix bytesLeftToRead 2015-07-15 15:01:27 -07:00
Ryan Huffman
2d86e807b0 Move PACKET_WRITE_ERROR to Packet class 2015-07-15 15:00:59 -07:00
samcake
de7aed1abc Merge pull request #5338 from ZappoMan/removeGlowEffect 
Remove the glow effect.
 2015-07-15 14:50:15 -07:00
Niraj Venkat
0ee916fb6f Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-15 14:10:42 -07:00
Niraj Venkat
1b13f837bd Porting AO to new pipeline 2015-07-15 14:10:17 -07:00
Stephen Birarda
3d02cfc6ad only print no listener for packet one time 2015-07-15 14:06:19 -07:00
Stephen Birarda
6c06d4c49e use fromRawData for writeDatagram, correct type for PingReply 2015-07-15 13:59:58 -07:00
Stephen Birarda
7207bdfe2b Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-15 13:50:40 -07:00
Stephen Birarda
7dfbb74d67 ping packets are verified packets 2015-07-15 13:49:34 -07:00
Atlante45
43c6fba94a Register DomainServerAddedNode 2015-07-15 13:49:06 -07:00
Atlante45
8b5a577a5d Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 13:42:14 -07:00
Atlante45
5a5a396b62 Check we have an AM before sending packet 2015-07-15 13:41:35 -07:00
Stephen Birarda
d4680ee1dd fix for no current packet in PacketList 2015-07-15 13:41:28 -07:00
Stephen Birarda
312780a2f6 fix offset for source UUID and verification hash 2015-07-15 13:31:36 -07:00
Stephen Birarda
6b05b7ef31 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-15 13:17:38 -07:00
Stephen Birarda
a79c8ab193 fix check for writing of packet header 2015-07-15 13:17:32 -07:00
Atlante45
2730201a3e erge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 13:14:21 -07:00
Atlante45
f3800cacda Don't unregister packet listeners when no nodelist 2015-07-15 13:10:16 -07:00
ZappoMan
c17794849d more GlowEctomy 2015-07-15 12:58:15 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
Stephen Birarda
e90ace6231 fix child assignment UUID, adjust for NLPacket after unpack 2015-07-15 12:37:30 -07:00
Stephen Birarda
c4a97de985 fix verification of source but unverified packets 2015-07-15 12:12:04 -07:00
Atlante45
e744e08577 Missed one connection secret 2015-07-15 11:56:01 -07:00
Stephen Birarda
432048addf use macro for AvatarMixer, show type for unknown 2015-07-15 11:55:50 -07:00
Atlante45
edc14ec6eb Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 11:53:11 -07:00
Atlante45
cee1734006 Remove helper function 2015-07-15 11:48:30 -07:00
Stephen Birarda
0b700d690a fix bad assert for payload size 2015-07-15 11:48:27 -07:00
Stephen Birarda
7631af99e0 fix compile for new data size method 2015-07-15 11:46:31 -07:00
Stephen Birarda
4a90e0f14f resolve conflicts on merge with clement/protcol 2015-07-15 11:45:17 -07:00
Atlante45
0b32a5d935 Write session uuid and connection hash in packet header 2015-07-15 11:42:35 -07:00
Stephen Birarda
8b5026a817 cleanup some warnings 2015-07-15 11:20:55 -07:00
Stephen Birarda
ca3285b0e4 add a comment for getPayloadCapacity() 2015-07-15 11:02:42 -07:00
Stephen Birarda
95f401fa0f add comments to Packet methods 2015-07-15 11:00:33 -07:00
Stephen Birarda
b115bd1a55 resolve conflicts on merge with huffman/receive_packets 2015-07-15 10:52:07 -07:00
Ryan Huffman
44c99ef89a Replace bytesAvailable with bytesLefToRead 2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Stephen Birarda
7d313c4a2b remove extra debugs in PacketReceiver 2015-07-15 10:13:57 -07:00
samcake
9df26c8488 removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs 2015-07-15 00:24:43 -07:00
samcake
a6148ab73d Remove naked gl call 2015-07-14 22:59:55 -07:00
Stephen Birarda
9204f004c0 remove an extra line 2015-07-14 21:15:39 -07:00
Stephen Birarda
e00dc8bfaa remove an Xcode vim accidentalism 2015-07-14 21:15:22 -07:00
Stephen Birarda
89c44ded38 repairs for domain-server PacketList sending 2015-07-14 21:01:26 -07:00
Stephen Birarda
0327a8d477 fix bytesAvailable, don't double seek in Packet 2015-07-14 20:47:16 -07:00
Stephen Birarda
c210b0db1c don't double seek in Packet::writeData 2015-07-14 20:18:28 -07:00
Stephen Birarda
a5ca1f7125 fix variable setup in Packet constructor 2015-07-14 19:15:18 -07:00
Stephen Birarda
88f419dfd7 repairs to packet sending/receiving 2015-07-14 18:59:33 -07:00
Sam Gateau
98a3141e11 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-14 18:38:21 -07:00
Sam Gateau
440464f884 Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile 2015-07-14 18:35:11 -07:00
ZappoMan
47dad82d50 removed dead code 2015-07-14 18:09:58 -07:00
Stephen Birarda
3858e6933f open packets for reading and writing 2015-07-14 17:30:01 -07:00
Stephen Birarda
2bec2f0590 make model depend on octree for ViewFrustum 2015-07-14 17:21:46 -07:00
Stephen Birarda
1450036b59 move EntityEditPacketSender method to slot 2015-07-14 17:18:28 -07:00
Stephen Birarda
c154e6cc74 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-14 17:16:42 -07:00
Stephen Birarda
5163354dd7 more cleanup for PacketReceiver error message 2015-07-14 17:15:18 -07:00
Stephen Birarda
aa696ca8d3 fix listener for AudioStreamStats, more verbose debug 2015-07-14 17:14:27 -07:00
Atlante45
02e1eaf452 Merge fixes 2015-07-14 17:08:36 -07:00
Atlante45
bfb9166b8e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:07:47 -07:00
Stephen Birarda
bc309e5b59 put back Q_ASSERT instead of assert 2015-07-14 17:06:13 -07:00
Stephen Birarda
3cb4be6c02 fix order of setup at startup 2015-07-14 17:04:45 -07:00
Atlante45
3abde577e2 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 16:58:26 -07:00
ZappoMan
d19c7125da remove naked gl calls 2015-07-14 16:49:43 -07:00
ZappoMan
bc251de43c delete dead code 2015-07-14 16:49:22 -07:00
Stephen Birarda
251387159a go back to Q_ASSERT for methodIndex 2015-07-14 16:48:55 -07:00
Stephen Birarda
15ca129005 fix for registration of methods with typedef 2015-07-14 16:46:17 -07:00
Atlante45
f0a2e921b7 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 16:45:01 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Stephen Birarda
b1650c0d8c fix ::get<NodeList> in DS code, make processSTUNResponse a slot 2015-07-14 16:36:05 -07:00
Ryan Huffman
d36ed9cd0d Fix missing semicolon 2015-07-14 16:12:47 -07:00
Atlante45
aca759aa2f Implement brodcastToNodes 2015-07-14 16:03:42 -07:00
Ryan Huffman
bd345cdccd Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/PacketReceiver.cpp
 2015-07-14 15:59:16 -07:00
Stephen Birarda
5edb809cd1 remove header packet methods from LimitedNodeList 2015-07-14 15:54:23 -07:00
Ryan Huffman
a61fbff018 Add error handling when reading path query response 2015-07-14 15:52:28 -07:00
Stephen Birarda
b4d01c4644 fix variable name for coding standard 2015-07-14 15:52:16 -07:00
Stephen Birarda
fb7cb7ff53 add the option for PacketReceiver to drop packets 2015-07-14 15:49:54 -07:00
Ryan Huffman
38591a8edb Update avatar billboard loading to use packet.readAll() 2015-07-14 15:43:15 -07:00
Stephen Birarda
b7b2cb73ef remove check for shutting down 2015-07-14 15:43:10 -07:00
Stephen Birarda
ca47165d72 compare bytesAvailable to 0 2015-07-14 15:42:28 -07:00
Stephen Birarda
55eb24e69e call right method from packetReceiver 2015-07-14 15:41:31 -07:00
Philip Rosedale
221a92eeee Merge pull request #5322 from ctrlaltdavid/fix-eye-direction 
Fix eye directions so that they're correct when avatar leans backwards
 2015-07-14 15:38:56 -07:00
Atlante45
774a0626b3 Bump all packet version 2015-07-14 15:36:56 -07:00
Stephen Birarda
e749b9727f have threaded assignment de-register for packets in finished 2015-07-14 15:33:05 -07:00
Atlante45
fd1648c0d7 Code cleanup 2015-07-14 15:30:41 -07:00
Atlante45
c05105e2f9 Added takeFront method to PacketList 2015-07-14 15:29:49 -07:00
Stephen Birarda
19c1ce2d6f remove the QUDPSocket readyRead hack 2015-07-14 15:29:41 -07:00
Stephen Birarda
789235b8c7 make NodeList deleter be deleteLater 2015-07-14 15:28:38 -07:00
Ryan Huffman
ef7a91af8f Make NLPacket read SourceID/VerificaitionHash methods protected 2015-07-14 15:27:38 -07:00
Ryan Huffman
47f3aad437 Update use of sendingNode->getUUID() to use packet->getSourceID instead 2015-07-14 15:23:41 -07:00
Ryan Huffman
96bd650b55 Fix NLPacket::localHeaderSize 2015-07-14 15:22:35 -07:00
Ryan Huffman
7bd10afbf2 Remove packetVersionMatch from LimitedNodeList 2015-07-14 15:22:16 -07:00
Atlante45
22f0dbdefb CR 2015-07-14 15:16:00 -07:00
Ryan Huffman
86e4d5f631 Remove PacketReceiverListener 2015-07-14 15:12:32 -07:00
Ryan Huffman
0c02933e66 Remove LimitedNodeList::processKillNode(const QByteArray& datagram) 2015-07-14 15:09:45 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
 2015-07-14 14:53:45 -07:00
Stephen Birarda
23548a99bc move NACK packet disabling to EntityEditPacketSender 2015-07-14 14:43:01 -07:00
Ryan Huffman
d49c71d132 Update a shared ptr NLPacket parameter to use NLPacket& 2015-07-14 14:42:03 -07:00
Ryan Huffman
027d131b2a Move sequence number updating to PacketReceiver 2015-07-14 14:40:39 -07:00
Stephen Birarda
1f4ac0f17c emit mutedByMixer signal for a noisy mute 2015-07-14 14:30:46 -07:00
Stephen Birarda
d617b71232 remove SharedNodePointer from some packet callbacks 2015-07-14 14:27:26 -07:00
Ryan Huffman
64bed72ae6 Add Packet::peekPrimitive 2015-07-14 14:23:10 -07:00
Atlante45
bbb00b9d3a Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 14:11:41 -07:00
Stephen Birarda
fbd287472d make NodeData parseData take only packet 2015-07-14 14:09:00 -07:00
David Rowe
bfad3ee02a Fix eye directions so that they're correct when avatar leans backwards 2015-07-14 14:07:32 -07:00
Stephen Birarda
fa9372875e fix headers in AvatarHashMap 2015-07-14 13:54:10 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Atlante45
8fb69ecc96 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 13:50:58 -07:00
Clément Brisset
17c6f41db6 Merge pull request #5306 from ctrlaltdavid/20606 
CR for 20606 - If an external texture isn't found, still display the model
 2015-07-14 13:49:00 -07:00
Clément Brisset
573b3e3997 Merge pull request #5321 from howard-stearns/fst-packager-free-joints 
Fix https://app.asana.com/0/32622044445063/39927009585710
 2015-07-14 13:46:48 -07:00
Howard Stearns
3cd1e318b2 Fix https://app.asana.com/0/32622044445063/39927009585710 2015-07-14 13:15:24 -07:00
Stephen Birarda
c63d714400 remove variables for out in PacketReceiver 2015-07-14 12:54:43 -07:00
Atlante45
a32f54da2f Cleanup 2015-07-14 12:36:18 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
Seth Alves
9b37b83eb6 Merge pull request #5320 from AndrewMeadows/barium 
fix grab.js when using the spring action
 2015-07-14 11:02:42 -07:00
Brad Hefta-Gaub
f88163b99c Merge pull request #5314 from jherico/homer 
Qt 5.5 fixes
 2015-07-14 10:35:12 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Brad Davis
1c8ec3b1c9 preventing unused warnings 2015-07-14 10:16:06 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
Andrew Meadows
7610fe48c2 filter action updates during simulation ownership 
This fixes a bug where actions can be thrashed (created/deleted)
by late entity update echos from the entity-server.
 2015-07-14 09:24:37 -07:00
Brad Davis
684d466b44 Merge pull request #5308 from venkatn93/avatar 
Avatars rendered correctly based on Scene.shouldRenderAvatars
 2015-07-14 09:06:49 -07:00
Marcel Verhagen
fac497dadc Removed the file where the directory is stripped off the RelativeFilename, and replace \ with /. 
However this introduces a new problem with the current fbx files who do not have their textures in the original dir but moved it to the dir where the fbx file lives.

Suppose there should be some logic when the texture is not found to look if the texture lives in the dir above the RelativeFilename.
In any case it is not obvious when there is a texture missing on a model, it simply renders black.
 2015-07-14 15:31:56 +02:00
Niraj Venkat
ef3c6b25e0 More coding standard changes 2015-07-14 00:45:38 -07:00
samcake
99ae0326ad FIxing th ecompilation issue on mac, ready to ship 2015-07-13 19:17:09 -07:00
David Rowe
2bab7d1c03 Add parentheses 2015-07-13 16:38:51 -07:00
Sam Gateau
5555ccd225 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-13 16:19:09 -07:00
Sam Gateau
4743bbad80 Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js 2015-07-13 16:18:39 -07:00
Stephen Birarda
8d38cd5670 use a specific packet type for AC child status 2015-07-13 15:58:44 -07:00
Clément Brisset
24eb4c8263 Merge pull request #5309 from sethalves/quiet-compiler 
quiet compiler
 2015-07-13 15:55:35 -07:00
Stephen Birarda
57c3f0fd20 fix unmatched diagnostic pop 2015-07-13 15:40:20 -07:00
Stephen Birarda
9d4f9aa21e final fixes to get ACs building again 2015-07-13 15:38:45 -07:00
Atlante45
eb56999077 Make PacketList class NLPacketList inherits from 2015-07-13 15:30:41 -07:00
Atlante45
44c5d4a2bf Couple fixes SharedNodePointer > Node& 2015-07-13 15:29:41 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
ZappoMan
5676246d75 fix the lingering model parts sometimes left behind when switching domains 2015-07-13 15:26:52 -07:00
Atlante45
4a22f18add Setup udt namespace/move relevant files 2015-07-13 15:25:25 -07:00
Stephen Birarda
f06636d45e repairs for other ThreadedAssignment subclasses 2015-07-13 15:16:55 -07:00
Stephen Birarda
26be492475 use same listener for many packets in AudioMixer 2015-07-13 14:46:56 -07:00
Stephen Birarda
775c1b7310 Merge branch 'receive_packets' of https://github.com/huffman/hifi into atp 2015-07-13 14:26:23 -07:00
Stephen Birarda
ede39515d8 update parseData for new network API 2015-07-13 14:26:10 -07:00
Stephen Birarda
859122db5d update signature of callbacks for avatar packets 2015-07-13 13:32:46 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Atlante45
7a160db8dd sendPacketList first implementation 2015-07-13 12:58:26 -07:00
Ryan Huffman
2efa2877da Update LimitedNodeList::processKillNode to work with NLPacket 2015-07-13 12:07:21 -07:00
Ryan Huffman
6a7cd7417c Update AvatarData packet processing to work with NLPacket 2015-07-13 12:07:01 -07:00
Atlante45
77bff0c4f2 First draft at sendPacket type method impl 2015-07-13 11:57:56 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -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
David Rowe
d44743563b Merge branch 'master' into 20606 
Conflicts:
	libraries/render-utils/src/Model.cpp
 2015-07-13 07:53:04 -07:00
Seth Alves
5aca0c28ef quiet compiler 2015-07-13 07:37:59 -07:00
Brad Davis
d3cdfb5084 Merge remote-tracking branch 'upstream/master' into homer 2015-07-12 18:52:27 -07:00
Brad Davis
29333d0cad Qt5.5 fixes 2015-07-12 18:52:15 -07:00
Seth Alves
848e5bcebf this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit 2015-07-12 13:43:21 -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
c17c9f1818 quiet compiler 2015-07-12 10:29:43 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
Andrew Meadows
9ce9c541de fix activation of object when action changes 2015-07-10 18:45:40 -07:00
Stephen Birarda
d85fbbfb74 update NodeList for new packet receive code 2015-07-10 17:45:23 -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
fe5b17f061 Remove readPendingDatagrams from ThreadedAssignment 2015-07-10 16:15:05 -07:00
David Rowe
8ecefdfe39 If an external texture isn't found, still display the model 
If the texture is present the next Interface is run then it will be used.
 2015-07-10 16:03:27 -07:00
Brad Davis
c1b72db18d Still trying to get jenkins builds to work 2015-07-10 16:00:51 -07:00
Atlante45
c11864acf3 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-10 15:57:40 -07:00
Atlante45
ec7e1df8c0 Move and rename menu item 2015-07-10 15:47:46 -07:00
Atlante45
a3848f08d2 Conditionnal fixes. 2015-07-10 15:36:17 -07:00
Atlante45
49993695a5 Made geometry refresh safe 2015-07-10 15:20:19 -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
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
Atlante45
5cfa1605df Made Texture safe with resource refresh 2015-07-10 12:28:06 -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
Stephen Birarda
528fac6b84 rework of PacketReceiver registration API, HifiSockAddr packet getter 2015-07-10 12:22:25 -07:00
Atlante45
6c591131ba Made Animations safe for resource reload 2015-07-10 12:01:51 -07:00
Sam Gateau
6c04e6d382 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-10 11:59:31 -07:00
samcake
014802fd45 Merge pull request #5277 from venkatn93/gpuquery 
GPU Query infrastructure
 2015-07-10 11:59:08 -07:00
Niraj Venkat
2e5fd04d9e Fix to get build working on Linux 2015-07-10 11:27:34 -07:00
Sam Gateau
2c05349b06 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers. 2015-07-10 11:03:12 -07:00
Atlante45
4702b39130 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-10 10:56:11 -07:00
Ryan Huffman
83dedd0a15 Add todo to move PacketReceiver to its own thread 2015-07-10 09:37:43 -07:00
Ryan Huffman
d009bf826e Update PacketReceiver to use QSharedPointer<NLPacket> 2015-07-10 08:46:21 -07:00
Ryan Huffman
ec0fc81b86 Update EntityEditPacketSender to use QSharedPointer<NLPacket> 2015-07-10 08:46:11 -07:00
Ryan Huffman
4db3b309b5 Update AvatarHashMap to use QSharedPointer<NLPacket> 2015-07-10 08:45:54 -07:00
Ryan Huffman
28a1059232 Update AudioClient to use QSharedPointer<NLPacket> 2015-07-10 08:45:39 -07:00
Brad Hefta-Gaub
89231adc19 Merge pull request #5299 from jherico/homer 
Performance optimizations in transform buffers and geometry cache
 2015-07-09 19:16:15 -07:00
Brad Hefta-Gaub
74ef91550c Merge pull request #5296 from venkatn93/master 
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
 2015-07-09 18:54:06 -07:00
Atlante45
90edf055f7 Clear unused resources before refresh 2015-07-09 18:00:07 -07:00
Brad Davis
6c5d7b8789 Performance optimizations in transform buffers and geometry cache 2015-07-09 17:53:26 -07:00
Brad Davis
cf7f3336d0 Merge pull request #5297 from samcake/daft 
Remove unecessary dependencies in DeferredLightingEffect
 2015-07-09 17:51:26 -07:00
Andrew Meadows
270ea7af9e Merge pull request #5292 from sethalves/palm-rotation 
action changes to allow "hold" action to track palm rotation
 2015-07-09 17:44:28 -07:00
Sam Gateau
11f2d74030 Simple cleaning to remove dependancies on the viewStateInterface in the deferredLightingEffect 2015-07-09 17:33:25 -07:00
Niraj Venkat
706f85e4ce Fixes to comply with coding standard 2015-07-09 17:31:38 -07:00
Seth Alves
bf6fce4e45 remove unneeded const 2015-07-09 17:05:15 -07:00
Atlante45
bfeb095fb4 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-09 16:30:56 -07:00
Niraj Venkat
bd91daf712 Removing debug code 2015-07-09 16:27:23 -07:00
Niraj Venkat
1dce5f80cc Entities are now added/removed from rendering based on Scene.shouldRenderEntities 2015-07-09 16:17:58 -07:00
Ryan Huffman
976d14736d Update PacketReceiver to pass NLPacket as NLPacket& 2015-07-09 16:06:21 -07:00
Philip Rosedale
cac239ad88 Merge pull request #5291 from ZappoMan/waitToSendAllEdits 
Allow Assignment Client scripts to do edits in their shutdown handler
 2015-07-09 15:42:31 -07:00
Ryan Huffman
f8b4c84903 Add missing header in SentPacketHistory 2015-07-09 15:34:20 -07:00
Ryan Huffman
b7fe91ccc6 Fix errors PacketReceiver 2015-07-09 15:34:02 -07:00
Ryan Huffman
672c5cc5b3 Properly create QByteArray in EntityEditPacketSender 2015-07-09 15:33:00 -07:00
Ryan Huffman
5737b3b770 Fix call to size() in AvatarHashMap 2015-07-09 15:32:19 -07:00
Ryan Huffman
5e65f422fa Move mute environment handling to Application 2015-07-09 15:30:25 -07:00
Brad Hefta-Gaub
f0a1bc15a9 Merge pull request #5286 from samcake/daft 
Migrating the rendering openGL calls from DeferredLightingEffect to gpu::Batch
 2015-07-09 15:23:45 -07:00
Seth Alves
2dc4922da3 bring over code from entity-level-locking branch 2015-07-09 15:23:05 -07:00
Sam Gateau
8c178d03df Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-09 15:16:52 -07:00
Brad Hefta-Gaub
81c74dda1f Merge pull request #5289 from jherico/marge 
Improve batched font rendering smoothing
 2015-07-09 15:09:07 -07:00
samcake
1f13106f51 FIxed the issue on mac due to the abs function not correctly executing 2015-07-09 15:05:03 -07:00
ZappoMan
a8a4c99529 on script shutdown, wait to process all pending edit messages before ending the script engine 2015-07-09 15:01:16 -07:00