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

1109 commits

Author SHA1 Message Date
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
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