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

1293 commits

Author SHA1 Message Date
Atlante45
3e84d4f1ed Quiet an unused variable warning 2015-07-08 14:35:56 -07:00
Stephen Birarda
59484fc3cf rename setType implementation in Packet 2015-07-08 14:33:08 -07:00
Stephen Birarda
822dd46228 use getType instead of readType in OctreeEditPacketSender 2015-07-08 14:32:20 -07:00
Stephen Birarda
4fe6102a7c change readPacketType and readPacketTypeVersion 2015-07-08 14:25:14 -07:00
Stephen Birarda
d8b03189e3 fixes for writes with new API 2015-07-08 14:21:26 -07:00
Stephen Birarda
1081e627fa Merge remote-tracking branch 'clement/protocol' into atp 2015-07-08 14:12:50 -07:00
Atlante45
7329ad6334 Templated read/write in Packet 2015-07-08 13:45:12 -07:00
Stephen Birarda
d9e10db011 use of new API in OctreeEditPacketSender 2015-07-08 13:43:37 -07:00
Stephen Birarda
e13360b1b6 initial changes to OctreeEditPacketSender for new API 2015-07-08 12:18:38 -07:00
Ryan Huffman
f1bf52602f Fix Packet::Type (PacketType::Value) 2015-07-08 11:54:50 -07:00
Ryan Huffman
8a415b2adb Register for packet types in NodeList 2015-07-08 11:15:00 -07:00
Ryan Huffman
9d0bffaa19 Add PacketReceiver to LimitedNodeList 2015-07-08 11:14:43 -07:00
Ryan Huffman
5940aee0e7 Rename PacketProcessor files 2015-07-08 10:50:26 -07:00
Ryan Huffman
44c34ac566 Rename PacketProcessor to PacketReceiver 2015-07-08 10:49:30 -07:00
Ryan Huffman
92462db4e1 Rename DatagramProcessor and add packet listener mutex 2015-07-08 10:49:00 -07:00
Stephen Birarda
78bc0979cc move the symmetric ping packet 2015-07-08 10:47:54 -07:00
Atlante45
7713219718 Compile fixes 2015-07-08 10:40:35 -07:00
Ryan Huffman
9d25612ff8 Move DatagramProcessor to PacketProcessor 2015-07-08 10:24:30 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
Stephen Birarda
a489c3558d move the assignment packet 2015-07-07 18:24:14 -07:00
Stephen Birarda
11fd43a094 fix for packet types in send assignment 2015-07-07 18:23:03 -07:00
Stephen Birarda
643e565170 resolve conflicts on merge with Atlante45/protocol 2015-07-07 18:20:41 -07:00
Stephen Birarda
07fe6f4699 more compile error fixes for broken NodeList 2015-07-07 18:19:21 -07:00
Atlante45
5d95a5c117 Compile fixes 2015-07-07 18:17:28 -07:00
Stephen Birarda
ca45c3f44d fix packet initialization in sendDomainServerCheckIn 2015-07-07 18:15:44 -07:00
Stephen Birarda
4131adc92b add API to send a packet to override sock addr 2015-07-07 18:15:00 -07:00
Stephen Birarda
c4da2d46c6 more compile fixes in NodeList 2015-07-07 18:11:56 -07:00
Stephen Birarda
c814fbbc93 fix packet list sending of JSON stats 2015-07-07 18:10:52 -07:00
Stephen Birarda
674d43864c add ICE packets to non sourced packets 2015-07-07 18:08:37 -07:00
Stephen Birarda
acd8b610a6 move icePacket before send to ice server 2015-07-07 18:05:29 -07:00
Stephen Birarda
e6f1fef6e4 remove numBytesForPacketHeader from sendStats 2015-07-07 18:02:08 -07:00
Stephen Birarda
e7e489af61 use new networking in sendPacketToIceServer 2015-07-07 18:01:17 -07:00
Stephen Birarda
402f7dc075 correct PingType_t pack and PacketList readData 2015-07-07 17:56:05 -07:00
Stephen Birarda
61960c80c8 fix PingType_t cast for icePingPacket 2015-07-07 17:53:08 -07:00
Stephen Birarda
e0aea7f955 fix QDataStream creations in LimitedNodeList 2015-07-07 17:52:33 -07:00
Stephen Birarda
7a9dbd7f2f repairs for NetworkPacket removal 2015-07-07 17:50:32 -07:00
Stephen Birarda
1cfa65a3df fix reference to NodePacketPair packet in PacketSender 2015-07-07 17:40:15 -07:00
Stephen Birarda
bf625f5af1 move JSON stats sending to a packet list 2015-07-07 17:39:58 -07:00
Stephen Birarda
88f8f692fb fix QDataStream creation with NLPacket 2015-07-07 17:31:14 -07:00
Stephen Birarda
ccb632cd39 Merge remote-tracking branch 'clement/protocol' into atp 2015-07-07 16:58:45 -07:00
Stephen Birarda
cc045c2a30 fix using for NodePacketPair typedef 2015-07-07 16:57:41 -07:00
Stephen Birarda
6c6143f21e remove NetworkPacket and replace with NodePacketPair 2015-07-07 16:56:05 -07:00
Stephen Birarda
30840422ad use NLPacket::createCopy in NetworkPacket 2015-07-07 16:35:59 -07:00
Atlante45
ac9e3b0326 More compile fixes 2015-07-07 16:34:52 -07:00
Atlante45
ac89571a79 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 16:28:21 -07:00
Atlante45
fcd11461c2 Added NLPacket::createCopy 2015-07-07 16:27:48 -07:00
Ryan Huffman
60538d4a82 Merge branch 'atp' of github.com:birarda/hifi into atp 
Conflicts:
	libraries/audio-client/src/AudioIOStats.cpp
 2015-07-07 16:26:22 -07:00
Atlante45
e0119e8767 Fix a couple packet types names 2015-07-07 16:26:20 -07:00
Atlante45
833f36e88e Comment deprecated methods 2015-07-07 16:25:39 -07:00
Ryan Huffman
3690ecc28f Add std::move to sendPacket calls 2015-07-07 16:24:11 -07:00
Stephen Birarda
20b0f4f3d1 force the unordered PacketList 2015-07-07 16:15:59 -07:00
Stephen Birarda
191ede4675 Merge remote-tracking branch 'huffman/atp' into atp 2015-07-07 16:15:03 -07:00
Stephen Birarda
6d502405ef resolve conflicts on merge with Atlante45/protocol 2015-07-07 16:12:07 -07:00
Stephen Birarda
018831e230 Merge remote-tracking branch 'huffman/protocol' into atp 2015-07-07 16:10:07 -07:00
Stephen Birarda
71e8c0f5cf use getPayload instead of constData in PacketList 2015-07-07 16:07:54 -07:00
Stephen Birarda
b5eb4945ab fix packet segmentation in PacketList 2015-07-07 16:06:09 -07:00
Stephen Birarda
bb15326676 repair send of path query packet 2015-07-07 16:02:21 -07:00
Stephen Birarda
05be8199c8 make broadcastToNodes take NLPacket unique ptr 2015-07-07 15:55:33 -07:00
Stephen Birarda
5728cf5056 fix ping methods in LNL 2015-07-07 15:54:18 -07:00
Atlante45
d496b33ae6 Compile fixes 2015-07-07 15:51:29 -07:00
Atlante45
1932703fec Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-07 15:49:45 -07:00
Atlante45
79d1a9f6c8 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 15:45:12 -07:00
Ryan Huffman
b502239cca Disable isOrdered = true in PacketList 2015-07-07 15:44:03 -07:00
Ryan Huffman
57b69d1501 Add PacketList::getNumPackets 2015-07-07 15:43:21 -07:00
Atlante45
b4ab6828bb Added setPacketType to Packet class 2015-07-07 15:43:16 -07:00
Stephen Birarda
c90c5900ce make unreliable packet take unique ptr ref 2015-07-07 15:42:02 -07:00
Stephen Birarda
03b17cc5dc fix methods for packet pointers in LNL 2015-07-07 15:38:52 -07:00
Stephen Birarda
45b549398d use PacketList for application nack packets 2015-07-07 15:31:58 -07:00
Stephen Birarda
089cb8a39e fix signature for packet send calls 2015-07-07 15:24:48 -07:00
Stephen Birarda
6064a2d4e2 CR fixes for DomainServer 2015-07-07 15:21:20 -07:00
Ryan Huffman
399b749033 Fix method and const names in NetworkPacket 2015-07-07 15:17:16 -07:00
Stephen Birarda
c8a03ebff8 cleanup NAK packets in OctreeInboundPacketProcessor 2015-07-07 15:14:27 -07:00
Atlante45
11c58ebc9e Added Packet::createCopy and getData 2015-07-07 15:07:14 -07:00
Stephen Birarda
ffa6edc904 fix spaces created by xcode find/replace 2015-07-07 15:01:19 -07:00
Stephen Birarda
f879ea2f35 Merge remote-tracking branch 'huffman/protocol' into atp 2015-07-07 13:47:39 -07:00
Stephen Birarda
f5dad95184 Merge remote-tracking branch 'clement/protocol' into atp 2015-07-07 13:47:21 -07:00
Atlante45
422bef4e18 Merge branch 'protocol' of https://github.com/highfidelity/hifi into protocol 2015-07-07 12:54:54 -07:00
Atlante45
e2bd9532b7 Implement move ctor/assignment 2015-07-07 12:47:23 -07:00
Ryan Huffman
419eec4ca7 Merge pull request #5267 from huffman/protocol 
Protocol
 2015-07-07 12:43:43 -07:00
Ryan Huffman
d8b1cc0aa9 Update NetworkPacket to correctly use move semantics 2015-07-07 12:38:58 -07:00
Stephen Birarda
01b1c46237 more networking API changes in octree classes 2015-07-07 12:31:22 -07:00
Atlante45
9889dcdd64 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 12:29:00 -07:00
Atlante45
712b35c4dc Couple changes to packets header size computation 2015-07-07 12:26:35 -07:00
Ryan Huffman
308335ff69 Update PacketSender to use NLPacket 2015-07-07 12:16:30 -07:00
Ryan Huffman
ebd223ecba Update NetworkPacket to use NLPacket 2015-07-07 12:15:44 -07:00
Stephen Birarda
fca23cc69b make SentPacketHistory use NLPacket 2015-07-07 12:14:40 -07:00
Stephen Birarda
74924bc5f1 initial changes to OctreeQueryNode for new APIs 2015-07-07 12:08:01 -07:00
Atlante45
7eddcf383c Merge Packet and PacketPayload 2015-07-07 11:33:33 -07:00
Stephen Birarda
edf7a96b58 update audio client packet send to NLPacket 2015-07-07 10:53:55 -07:00
Atlante45
a07a24788d Cast type to int before arithmetique packing 2015-07-07 10:36:15 -07:00
Atlante45
c23e3c0ec2 Change Packet.h header to NLPacket 2015-07-07 10:35:11 -07:00
Atlante45
8e7580d58d Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 10:32:54 -07:00
Atlante45
8e5b040627 Packet setters 2015-07-07 10:32:31 -07:00
Atlante45
91496d37c7 Move NLPacket to its own file 2015-07-07 10:31:54 -07:00
Stephen Birarda
e1c098233a use sendUnreliablePacket for repeated send in AI 2015-07-06 18:03:41 -07:00
Stephen Birarda
ac6c8c9c3a add stubs for new send methods in LNL 2015-07-06 17:40:53 -07:00
Stephen Birarda
76fb120f67 remove call to NodeListPacket in NodeList 2015-07-06 17:23:48 -07:00
Stephen Birarda
453f8605c0 finish cleanup of NodeListPacket in LimitedNodeList 2015-07-06 17:22:55 -07:00
Stephen Birarda
c0d1953df3 use NLPacket in LimitedNodeList 2015-07-06 17:21:05 -07:00
Stephen Birarda
d64d49d004 remove PacketByteArray from networking 2015-07-06 17:15:27 -07:00
Atlante45
d87679f115 Partially fill packet header on construction 2015-07-06 17:13:03 -07:00
Stephen Birarda
f8e6344678 have PacketList use Packet instead of PacketPayload 2015-07-06 17:10:55 -07:00
Stephen Birarda
02f97702d3 switch path query packets to new networking API 2015-07-06 17:08:12 -07:00
Stephen Birarda
3fa785c545 fix domain check in packets for new API 2015-07-06 17:03:26 -07:00
Atlante45
12edec7bea Packet class polishing 2015-07-06 17:02:55 -07:00
Atlante45
0c7dc1e28f Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-06 16:40:47 -07:00
Stephen Birarda
922dd5a739 keep track of size used in PacketPayload 2015-07-06 16:35:29 -07:00
Stephen Birarda
6187cff766 add a constData method to PacketPayload 2015-07-06 16:20:56 -07:00
Stephen Birarda
33a9a04d9e allow a packet to be created with extended header 2015-07-06 16:18:49 -07:00
ZappoMan
05f28064bf add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor 2015-07-06 16:03:42 -07:00
Stephen Birarda
3ae8ba2922 add segment calls to PacketList 2015-07-06 15:53:26 -07:00
Stephen Birarda
2ab2888260 add the complicated writeData method for PacketList 2015-07-06 15:50:54 -07:00
Atlante45
43354c3b28 More Packet class work + NLPacket shell 2015-07-06 15:03:00 -07:00
Stephen Birarda
25e82d4b92 initial version of PacketList QIODevice subclass 2015-07-06 14:29:24 -07:00
Stephen Birarda
cbba8263cd fix writeData and readData for PacketPayload 2015-07-06 14:27:20 -07:00
Stephen Birarda
93ac2704e8 fix header guard comment in PacketPayload 2015-07-06 12:38:49 -07:00
Stephen Birarda
1867f259d6 keep track of max written in PacketPayload 2015-07-06 11:55:49 -07:00
Stephen Birarda
b660c80988 leverage QIODevice for much of PacketPayload functionality 2015-07-06 11:51:20 -07:00
Stephen Birarda
57d76f488c make PacketPayload a QIODevice subclass 2015-07-06 11:33:46 -07:00
Stephen Birarda
8dc385bd62 initial setup for a PacketByteArray 2015-07-06 11:08:51 -07:00
Stephen Birarda
a9420d4212 replace controlled broadcast to nodes in Application 2015-07-02 17:55:26 -07:00
Stephen Birarda
8dd91b8795 don't force source ID on ICE ping packets 2015-07-02 17:34:52 -07:00
Stephen Birarda
b3c3e5a6c8 more PacketType to PacketType::Value replacements 2015-07-02 16:49:19 -07:00
Stephen Birarda
1c20aa47c3 remove replacement of namespace itself 2015-07-02 16:41:07 -07:00
Stephen Birarda
0d64e82fe2 replace PacketType declarations with PacketType::Value 2015-07-02 16:38:52 -07:00
Stephen Birarda
5ed332ea2c missed changes in PacketHeaders, comment old header calls 2015-07-02 16:35:17 -07:00
Stephen Birarda
1dfa592a13 use new enum across PacketHeaders 2015-07-02 16:31:33 -07:00
Stephen Birarda
f057be0982 Merge remote-tracking branch 'clement/protocol' into atp 2015-07-02 16:19:07 -07:00
Stephen Birarda
3a5701e02e first changes for new network API 2015-07-02 16:18:44 -07:00
Atlante45
3edc29bd4b Packet class squeleton 2015-07-02 16:15:20 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership 
Actions over wire and improved simulation ownership
 2015-07-02 14:57:27 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Brad Davis
1d16d80c0c Comments from CR 2015-07-01 14:55:24 -07:00
Brad Davis
1e1f199fdb Undoing unwisdom 2015-07-01 14:54:26 -07:00
Brad Davis
4c200d75bc Tweaking packet processing locking 2015-07-01 14:53:08 -07:00
Seth Alves
5e2f7204b4 responses to code review 2015-07-01 10:29:42 -07:00
Brad Davis
d4d6f8f5d5 Eliminate per-packet locking for processing 2015-07-01 10:06:04 -07:00
Seth Alves
1d122060a6 merge andrew's sim-ownership branch 2015-06-29 09:50:38 -07:00
Andrew Meadows
f274958beb fix bad merge during rebase 2015-06-26 22:13:06 -07:00
Andrew Meadows
12fc18092b SimulationOwner as one property 2015-06-26 21:58:03 -07:00
Andrew Meadows
8afd9a5e1d add EntityItem::_simulatorPriority as uint8_t 2015-06-26 21:57:04 -07:00
Seth Alves
5ecc39b811 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 20:06:10 -07:00
Stephen Birarda
8fd309027f add a forced failover for hanging STUN dns lookup 2015-06-26 17:35:14 -07:00
Seth Alves
70aa762f61 merge from upstream 2015-06-26 15:34:10 -07:00
Stephen Birarda
ff33922716 handle conflicts on merge with upstream master 2015-06-26 15:33:35 -07:00
ZappoMan
ccbc048f64 repair bad ordering of PROP_SCRIPT_TIMESTAMP 2015-06-26 14:59:40 -07:00
Stephen Birarda
9b84eabd18 Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo 2015-06-26 14:40:01 -07:00
Seth Alves
bc7271769c merge from master 2015-06-26 14:29:40 -07:00
Stephen Birarda
18e2b62ecc initial image replacement for hyperlink preview 2015-06-26 14:12:26 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Seth Alves
9e8113a63c bump protocol version 2015-06-26 12:36:10 -07:00
Seth Alves
005bd8bda5 merge from upstream 2015-06-26 12:33:35 -07:00
Brad Hefta-Gaub
2c30711229 Merge pull request #5210 from bwent/faceCameraProp 
Added faceCamera property for text entities
 2015-06-26 12:29:25 -07:00
bwent
aa865680ab Added faceCamera property to Text Entities 
…and removed from base
 2015-06-25 15:38:38 -07:00
bwent
99cd9bada1 Added Billboard entity property and enabled billboarding for text entities 2015-06-23 16:22:34 -07:00
Seth Alves
f75506bf1b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 15:37:10 -07:00
Stephen Birarda
a9eccb687a fix for double store on index path lookup 2015-06-22 11:26:17 -07:00
Seth Alves
77cb3c0caa quiet valgrind 2015-06-21 18:13:13 -07:00
Seth Alves
717c8ed3ad formatting 2015-06-21 18:12:24 -07:00
Niraj Venkat
482f12be8c Returning ref to stack to view controller 2015-06-19 16:05:45 -07:00
Niraj Venkat
1494aa4faa Adding new icon and getters 2015-06-19 11:18:16 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
David Rowe
6623d0c552 Add "Reload" button associated with entity editor's script URL field 
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
 2015-06-17 16:11:32 -07:00
Stephen Birarda
bc20ea6ed2 fix for path handling on return of place info 2015-06-17 11:18:43 -07:00
Stephen Birarda
dc4ae082f8 make goToUser public again 2015-06-17 10:13:53 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Stephen Birarda
e9bdf7e73a add missing bools to handleViewpoint call 2015-06-16 13:39:11 -07:00
Stephen Birarda
1af4b1c54c cleanup handleUrl call, add disabling of Menu items 2015-06-16 13:17:13 -07:00
Stephen Birarda
ef62f7e9f0 fix relative path lookup effect on history 2015-06-16 08:46:04 -07:00
Stephen Birarda
8e46043f14 add fixed back/forward, buttons to menu 2015-06-16 08:41:21 -07:00
Stephen Birarda
1112841586 fix indentation in AddressManager 2015-06-09 19:01:03 -07:00
Stephen Birarda
8b67710022 store an in-memory history of the last addresses 2015-06-09 18:59:58 -07:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Niraj Venkat
141ff70a60 Some changes to constants 2015-06-05 15:36:42 -07:00
Niraj Venkat
a3f19e9d4c Fixing title bar update on teleport 2015-06-05 13:33:14 -07:00
Niraj Venkat
a2165e3a8a Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 10:42:20 -07:00
Niraj Venkat
c8236f867b Address manager changes to support domain ID 2015-06-05 10:40:17 -07:00
Eric Levin
e7c5a24e3d fixed packet number increment logic 2015-06-02 09:38:45 -07:00
Eric Levin
f51ad6b8da merged master 2015-06-01 15:39:05 -07:00
Stephen Birarda
33fde7c66d remove extra debug 2015-05-29 13:21:24 -07:00
Stephen Birarda
2207bfaf40 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls 2015-05-29 12:06:12 -07:00
Stephen Birarda
e253687dcd fix fail case for DS pings 2015-05-29 12:06:07 -07:00
Seth Alves
b0f6826d17 Merge pull request #4995 from birarda/domain-dtls 
speed up initial connection to domains
 2015-05-29 10:50:01 -07:00
Stephen Birarda
e91ee7e7e3 only send add packet for nodes in interest set 2015-05-29 09:49:54 -07:00
Stephen Birarda
046828ee5d make the LNL the parent of any Nodes it adds 2015-05-28 16:58:58 -07:00
Stephen Birarda
29d3ca85d9 cleanup debug logs for DS/node ping punch 2015-05-28 16:53:13 -07:00
Stephen Birarda
265e0f3da6 remove NetworkPeer dtor debug, fix ICE socket 2015-05-28 16:44:34 -07:00
Stephen Birarda
493a9da43e make sure DS log handler is cleaned up 2015-05-28 16:23:14 -07:00
Stephen Birarda
9d2e1773a0 fix memory issues for immediate ice pings 2015-05-28 15:31:21 -07:00
Stephen Birarda
da0c9fbc31 fix send of existing peer to querier 2015-05-28 14:37:16 -07:00
Stephen Birarda
e096cbe040 have ice-server immediately send peer to DS 2015-05-28 14:25:18 -07:00
Stephen Birarda
531ef1fa1c change ice-server heartbeat behaviour 2015-05-28 14:05:43 -07:00
Stephen Birarda
eb6b80133b immediately ping the ICE DS every 25ms 2015-05-28 13:17:48 -07:00
Stephen Birarda
81c23e9ca0 output if pinged node cannot be reached 2015-05-28 11:22:27 -07:00
Stephen Birarda
cee058c4ce handle immediate add packets in NodeList 2015-05-28 11:02:45 -07:00
Stephen Birarda
5c75863af4 immediately send add packet from DS for new node 2015-05-28 10:45:03 -07:00
Stephen Birarda
667df66963 add packet type for DS node add 2015-05-27 18:25:38 -07:00
Stephen Birarda
0cb67cce2c add ping timer tied to NetworkPeer 2015-05-27 18:22:23 -07:00
Stephen Birarda
757d02a600 fix reset on address lookup 2015-05-27 16:00:56 -07:00
Stephen Birarda
e6e2c4b95d look for connection steps in LimitedNodeList 2015-05-27 15:54:39 -07:00
Stephen Birarda
734798a365 fix move of connection steps to LNL 2015-05-27 15:50:31 -07:00
Stephen Birarda
c7c542ef4c decouple STUN from DS check in 2015-05-27 14:24:15 -07:00
David Rowe
a2272d3f42 Fix Windows C4351 build warning 
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
 2015-05-27 11:49:00 -07:00
Stephen Birarda
4b6b34836d repair anomalies in timing table 2015-05-27 10:30:45 -07:00
Stephen Birarda
9cb6ccaa46 thread safe timing of domain connection 2015-05-26 16:49:18 -07:00
Stephen Birarda
d1489c50fe add connection times getter to NodeList 2015-05-26 14:18:58 -07:00
Stephen Birarda
626f22191c add a QAbstractTableModel for domain connection steps 2015-05-26 14:17:02 -07:00
Stephen Birarda
f9251471da add audio connection to final part of connection steps 2015-05-26 10:44:45 -07:00
Stephen Birarda
f28ade1075 log connection times for eventual stats display 2015-05-26 10:37:44 -07:00
Stephen Birarda
27717db9d1 fire off DS check immediately once DS info is known 2015-05-22 16:38:26 -07:00
Stephen Birarda
69f1cd80e6 immediately send ICE heartbeat once data present 2015-05-22 16:29:01 -07:00
Andrew Meadows
461d08c0a9 merge upstream/master into andrew/bispinor 2015-05-22 11:35:02 -07:00
Eric Levin
fe99941de3 fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp 2015-05-21 19:35:27 -07:00
Seth Alves
52ce26d80d Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-21 09:20:56 -07:00
Seth Alves
aa1d3eb82a respond to code review 2015-05-20 17:31:57 -07:00
Stephen Birarda
7373bb6817 contain QSharedMemory for local server port to reader 2015-05-20 17:11:08 -07:00
Seth Alves
4a59dc24c5 split entity-add and entity-edit messages 2015-05-20 14:52:03 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
b32e069f1d bump protocol version 2015-05-19 14:45:01 -07:00
Andrew Meadows
ead1d9f4d1 formatting 2015-05-19 14:15:09 -07:00
Stephen Birarda
2eb796eca6 resolve conflicts on merge with upstream/master 2015-05-18 10:25:24 -07:00
Stephen Birarda
5645fdc8b9 send user to token creation page 2015-05-14 15:21:33 -07:00
Andrew Meadows
d28c400cea add restitution and friction Entity properties 2015-05-14 12:36:59 -07:00
Howard Stearns
ef187b390b Server versioning. 2015-05-13 15:52:05 -07:00
Stephen Birarda
ca87d64dc7 fix for audio-mixer shutdown hang, removing spaces 2015-05-13 12:03:21 -07:00
Philip Rosedale
349886c146 Merge pull request #4847 from birarda/domain-paths 
add initial support for local paths in domain
 2015-05-12 17:09:13 -07:00
Seth Alves
db704874b9 bump protocol version for line entities 2015-05-12 16:02:45 -07:00
Stephen Birarda
332601b91c final fixes for path query from DS 2015-05-12 14:34:14 -07:00
Stephen Birarda
7330e5255d handle path query response from DS in NL/AM 2015-05-12 13:48:41 -07:00
Stephen Birarda
0562fee82a Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths 2015-05-12 12:39:05 -07:00
Stephen Birarda
e0ccc986b1 add a method to DS to respond to path query 2015-05-12 12:29:09 -07:00
Stephen Birarda
d8b17ffeb0 add packets for a path query and path response 2015-05-12 12:00:03 -07:00
Anthony Thibault
e1cbfcd901 Merge branch 'master' into ajt/particle-system-improvements 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-05-11 19:24:13 -07:00
Anthony Thibault
b3af515224 Particle entity improvements based on code review. 
* Updated variable naming to match coding standards.
* Changed particle raw float arrays to vectors.
* Bug fix: changing maxParticles will no longer lead to memory corruption.
* Made particle ring buffer more explicit, added _particleTailIndex.
* Added getLivingParticleCount() private method.
* Moved integration and bounds code into private methods.
* Bug fix: high emit rates now properly integrate particles forward for the
  remaing frame time, not the entire frame.
* Bug fix: new particles were not initiaized to origin.
* Added more particles to ajt-test.js.
* Bug fix: ajt-test.js script was not shutting down properly.
* Removed random seed, unless we have a psudo random number generator per
  particle system instance, it's unlikely that this will preserve sync.
* Bumped packet version number.
 2015-05-11 19:21:33 -07:00
Seth Alves
866a6fba9b Merge pull request #4823 from birarda/master 
repairs to AC stop and clean shutdown
 2015-05-11 18:11:52 -07:00
Brad Davis
c12b74ebd0 Merge pull request #4816 from ctrlaltdavid/fix-pragma 
Disable pragma that Windows doesn't know about
 2015-05-11 12:30:54 -07:00
Stephen Birarda
8c6715e4fc resolve conflicts on merge with upstream/master 2015-05-11 11:10:22 -07:00
Clément Brisset
5160eb5b94 Merge pull request #4819 from ZappoMan/moreZoneProperties 
More Zone Atmosphere Work: add automatic day/hour calculation
 2015-05-11 19:38:27 +02:00
Seth Alves
d86b22f7c8 Merge pull request #4824 from howard-stearns/cache-mod-time 
Cache mod time
 2015-05-11 10:38:23 -07:00
Clément Brisset
421ebeb3d7 Merge pull request #4795 from birarda/sequence-numbers 
add sequence number support to NL, don't double send data from AvatarMixer
 2015-05-11 19:23:33 +02:00
Howard Stearns
cdef09c9dd Add comment (and force previous change to the right branch). 2015-05-11 10:12:03 -07:00
Howard Stearns
aed165809c Use resource cache as long as it is no older than network resource. 
This allows chache to be used when cdn provides different values for get-vs-head, or for cdn with different resource times in different requests of different sessions.
 2015-05-11 10:01:49 -07:00
David Rowe
662f07a921 Better #if condition for clang 2015-05-11 09:31:12 -07:00
Seth Alves
e6023c59c1 if _reply is NULL, it doesn't make sense to worry about if it's finished loading or not. 2015-05-10 17:15:48 -07:00
ZappoMan
17c3c1a18d add support for automatic hour/day calculations and backward compatibility on stage properties 2015-05-10 15:22:02 -07:00
David Rowe
70f7329a7e Disable pragma that Windows doesn't know about 2015-05-09 17:59:10 -07:00
Stephen Birarda
897ed84cca remove debug calls used to find ACApp stall 2015-05-08 14:56:49 -07:00
Stephen Birarda
0a295bada1 add debugging to catch AC kill hang 2015-05-08 14:32:16 -07:00
Stephen Birarda
99a9f2df90 don't allow an AC monitor to take over other local ACs 2015-05-08 14:02:19 -07:00
Stephen Birarda
be58347aec consider assignment completed when worker thread is gone 2015-05-08 10:40:04 -07:00
Stephen Birarda
0f71e93c7f ensure no new OST creation on OctreeServer shutdown 2015-05-08 10:12:14 -07:00
Stephen Birarda
a3ce02181e fix ThreadedAssignment setFinished debug 2015-05-07 17:06:09 -07:00
Stephen Birarda
d75d204ff6 standardize cleanup of ThreadedAssignments 2015-05-07 17:03:43 -07:00
Stephen Birarda
305835ea79 Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers 2015-05-07 15:38:35 -07:00
Stephen Birarda
bfccf02912 use lamdbas for linkedDataCreateCallback 2015-05-07 15:37:02 -07:00
Stephen Birarda
e3acf861ff fix for unverified datagram writes 2015-05-07 14:07:14 -07:00
Stephen Birarda
e540a6dbb3 fix packet sequence number unmarshal 2015-05-06 14:48:10 -07:00
Stephen Birarda
ff676958e8 fix hash replacement in PacketHeaders 2015-05-06 14:24:11 -07:00
Stephen Birarda
c5e189bbf2 use new PacketHeaders calls from LimitedNodeList 2015-05-06 11:52:03 -07:00
Stephen Birarda
ba9ed12415 store last sequence number sent with data 2015-05-06 11:35:34 -07:00
Stephen Birarda
e2986f5702 add get seq num, cleanup PacketHeaders methods 2015-05-06 11:34:58 -07:00
Stephen Birarda
b0c7af1714 store last seq for node/packet type combo 2015-05-06 10:41:41 -07:00
Stephen Birarda
5b1514a390 Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers 2015-05-06 10:12:17 -07:00
ZappoMan
0cb14650b6 added skybox group properties to zones 2015-05-05 14:12:02 -07:00
Stephen Birarda
a481c57315 fix for writeDatagram with hash and sequence number 2015-05-05 12:44:47 -07:00
Stephen Birarda
6b3cf1ba4a remove dependency of PacketHeaders on NodeList 2015-05-05 12:19:42 -07:00
Stephen Birarda
c76ae56d64 allow optional sequence numbers in packets 2015-05-05 11:00:27 -07:00
ZappoMan
77232e35f8 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones 2015-05-04 17:16:33 -07:00
Stephen Birarda
ff89831894 fix for object below array in JSONBreakableMarshal 2015-05-04 16:32:26 -07:00
ZappoMan
78f7870cbb more tweaks to atmosphere properties 2015-05-04 11:13:05 -07:00
Stephen Birarda
fb7646b02b add a QDebug for failed conversion in fromString 2015-05-04 10:32:49 -07:00
Stephen Birarda
edade7baba resolve conflicts on merge with upstream master 2015-05-01 16:24:16 -07:00
Stephen Birarda
5e2a22a006 perform requested interpolation when unpacking 2015-05-01 15:58:22 -07:00
Stephen Birarda
99bddcc102 insert usernames to JSONBreakableMarshal interpolate map 2015-05-01 15:45:53 -07:00
Stephen Birarda
4b777f09e6 repairs to JSONBreakableMarshal for array values 2015-05-01 15:14:41 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Ryan Huffman
b49a04c638 Add name property to entities 2015-05-01 08:40:24 -07:00
Stephen Birarda
5b55a52a04 add check in AvatarMixer for next adjustment 2015-04-30 15:36:31 -07:00
Stephen Birarda
b50545f414 use symlink for DS resources, add AM bandwidth 2015-04-30 13:53:44 -07:00
Stephen Birarda
4c4af81d3d fix kbps comment in NetworkPeer 2015-04-30 08:58:26 -07:00
Stephen Birarda
3a10da688f switch the avatar stat to kbps 2015-04-30 08:56:08 -07:00
Stephen Birarda
2c0604afd1 fix string JSON unmarshal, add basic avatar values 2015-04-30 08:55:08 -07:00
Seth Alves
09eea83461 don't give timers owners while also keeping track of them in as class instance variables 2015-04-29 19:18:58 -07:00
Seth Alves
e985f56b12 cleanups 2015-04-29 15:30:13 -07:00
Seth Alves
009bb9dc71 all 4 types of assignment-client appear to exit cleanly, now 2015-04-29 15:16:00 -07:00
Stephen Birarda
31c067cac5 fix change of keypath after handling array index 2015-04-29 15:10:04 -07:00
Stephen Birarda
b55889597d complete unmarshal of breakable json using QVariant 2015-04-29 15:03:49 -07:00
Stephen Birarda
b17191a20f add method to convert a QStringList back to QJsonObject 2015-04-29 12:40:24 -07:00
Seth Alves
e7d8bccd5d cleanups 2015-04-29 12:03:54 -07:00
Seth Alves
d2cd4fc405 types 0 and 1 exit cleanly, type 6 crashes 2015-04-29 11:56:45 -07:00
Stephen Birarda
24576574ae add breaking of marshaled buffer to QStringList 2015-04-29 11:20:07 -07:00
Stephen Birarda
c7a7bc1646 handle sending of JSONBreakableMarshal data via sendStats 2015-04-29 10:44:17 -07:00
Seth Alves
02fd9987c7 rework audio mixer so it can exit cleanly 2015-04-28 18:38:41 -07:00
Stephen Birarda
68998f4423 cleanup AudioMixer stats to be properly nested 2015-04-28 18:19:16 -07:00
Stephen Birarda
4e6979cac8 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-mixer-throttling 2015-04-28 16:50:07 -07:00
Stephen Birarda
698fcdfbbf add JSONBreakableMarshal to help with MTU stats sending 2015-04-28 16:50:00 -07:00
Stephen Birarda
404cd67bb7 Merge pull request #4716 from sethalves/assignment-client-exits 
assignment-client shouldn't try to save contents of its nonexistent address bar
 2015-04-28 19:40:44 -04:00
Seth Alves
a234c02d7d Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-exits 2015-04-28 13:41:56 -07:00
Seth Alves
28ad80936a assignment-client shouldn't try to save contents of its nonexistent address bar. interface still needs to save the address. 2015-04-28 13:21:14 -07:00
Seth Alves
f9c0493c61 when a login is completed, reset the node list in order to force a re-connection to the domain-server (thereby giving the interface any new rights it deserves, such as the ability to edit entities) 2015-04-28 10:23:08 -07:00