Commit graph

928 commits

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