Commit graph

27934 commits

Author SHA1 Message Date
Stephen Birarda
658ad6bd02 fix eachNode lambda in Application 2015-07-08 18:55:26 -07:00
Atlante45
4bc71bb39e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-08 18:55:14 -07:00
Brad Davis
f2beb79d23 Updating buffer parser to use new heapless API 2015-07-08 18:54:38 -07:00
Stephen Birarda
86a218ad20 fix for templated read/write in PacketList 2015-07-08 18:52:15 -07:00
Stephen Birarda
b0b8dd2e7d add back readDatagram to get to build 2015-07-08 18:46:06 -07:00
Stephen Birarda
da3502eb6c resolve conflicts on merge with upstream/master 2015-07-08 18:41:48 -07:00
Atlante45
d4e01742e5 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-08 18:40:18 -07:00
Brad Davis
49a14e3446 Merge remote-tracking branch 'upstream/master' into entity_parsing 2015-07-08 18:37:41 -07:00
Stephen Birarda
cf15cbc62f fix a cast, move a packet 2015-07-08 18:37:25 -07:00
Stephen Birarda
c5840d085c replace packet header size check with 0 2015-07-08 18:35:56 -07:00
Stephen Birarda
dfa5be1a0c fix for killPacket in MyAvatar and DatagramProcessor header check 2015-07-08 18:35:04 -07:00
Brad Davis
625cc86f83 Merge pull request #5283 from ZappoMan/optimizeByteCountCoded
Optimize ByteCountCoded<> to not do extra heap allocations
2015-07-08 18:35:02 -07:00
Stephen Birarda
dc7c268467 fixes for changed API in Application 2015-07-08 18:27:10 -07:00
Atlante45
e2718d5c94 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-08 18:26:36 -07:00
Stephen Birarda
791c7e2de1 re-expose readDatagram to get back to build for writes 2015-07-08 18:25:56 -07:00
Stephen Birarda
9c18277e9c packet fixes in script-engine and Application 2015-07-08 18:24:49 -07:00
ZappoMan
7790e35d24 added bytes consumed result to decode, and exit early after bytes consumed 2015-07-08 18:19:12 -07:00
Brad Davis
600e9cbf52 Fixing template specialization compilation error on gcc/clang 2015-07-08 18:17:03 -07:00
Stephen Birarda
5dc09692b4 more packet creation fixes for entitites 2015-07-08 18:13:06 -07:00
Seth Alves
7bea4a54a3 Merge pull request #5274 from AndrewMeadows/argon
cleanup of EntityActionInterface and friends
2015-07-08 17:54:52 -07:00
ZappoMan
c0cdf3256c comment and dead code 2015-07-08 17:34:36 -07:00
ZappoMan
e885ac1821 improved performance of ByteCountCoding<> decode 2015-07-08 17:32:51 -07:00
Brad Davis
98e0688e98 Reducing heap allocation in network packet parsing 2015-07-08 17:21:38 -07:00
Philip Rosedale
61be0beba1 Merge pull request #5281 from howard-stearns/sword-offset-only-for-mosue
sword-offset-only-for-mouse
2015-07-08 17:13:45 -07:00
Howard Stearns
c8da325213 Fudge the offset so that operates only when using the mouse. 2015-07-08 16:59:54 -07:00
Stephen Birarda
ac40790841 remove a bad replacement from PacketType in EntityTree 2015-07-08 16:54:56 -07:00
Stephen Birarda
72b713e32f fix for more primitive writes in AudioClient 2015-07-08 16:53:57 -07:00
Bing Shearer
ba4049754a Restored indentatioN 2015-07-08 16:53:55 -07:00
Stephen Birarda
964041d8d3 missed API fixes in AudioClient and AvatarData 2015-07-08 16:53:04 -07:00
Stephen Birarda
2ac833c904 fix another primitive write in AudioClient 2015-07-08 16:50:49 -07:00
Stephen Birarda
4d3659b627 update packet creation in AvatarData to new API 2015-07-08 16:50:35 -07:00
Stephen Birarda
546268be55 fix primitive type writing in AudioClient 2015-07-08 16:46:11 -07:00
Stephen Birarda
f37d3c9bd6 fix primitive type writing in OctreeSceneStats 2015-07-08 16:44:45 -07:00
Stephen Birarda
dec11ef4ea fix for primitive writing in AudioIOStats 2015-07-08 16:43:42 -07:00
Stephen Birarda
480cb80f4f fix primitive writing in OctreeEditPacketSender 2015-07-08 16:42:43 -07:00
Stephen Birarda
f3eb6982e6 fix writing to packet in AudioInjector 2015-07-08 16:39:24 -07:00
Stephen Birarda
c162d53908 fix writes in JurisdictionMap 2015-07-08 16:38:17 -07:00
Stephen Birarda
9f4e4f1948 fix templated write/read and various write calls 2015-07-08 16:36:09 -07:00
Bing Shearer
6080ec4509 Air Hockey UI now follows window border 2015-07-08 16:29:43 -07:00
Bing Shearer
25a1108b61 Fixed spelling error 2015-07-08 16:24:23 -07:00
Philip Rosedale
82cad5dab3 Merge pull request #5279 from howard-stearns/sword-toolbar
Sword:
2015-07-08 15:34:48 -07:00
Howard Stearns
6813a3afe1 Sword:
+ init hands.
+ toolbar of brandishToggle/makeTarget/cleanup.
+ initial hit flash using overlays instead of ogl "fade".
2015-07-08 15:27:45 -07:00
ZappoMan
6a9344a3f6 fix bug in old version of decode 2015-07-08 15:14:24 -07:00
Ryan Huffman
1b5d526444 Add new packet processing to AvatarManager 2015-07-08 15:06:50 -07:00
Stephen Birarda
7a2be74f34 Merge remote-tracking branch 'clement/protocol' into atp 2015-07-08 15:04:48 -07:00
Stephen Birarda
ecb6309932 fix HEADER_LENGTH in Octree 2015-07-08 15:02:57 -07:00
Stephen Birarda
07c8bb24b4 fix query packet send in OctreeHeadlessViewer 2015-07-08 15:02:02 -07:00
Stephen Birarda
1597491894 add back missing underscore 2015-07-08 14:58:27 -07:00
Stephen Birarda
3dbe7f7827 fix writes for templated API in OctreeSceneStats 2015-07-08 14:57:45 -07:00
Stephen Birarda
9fb43b71d4 use std::unordered_maps in OctreeEditPacketSender 2015-07-08 14:52:14 -07:00