Stephen Birarda
|
822dd46228
|
use getType instead of readType in OctreeEditPacketSender
|
2015-07-08 14:32:20 -07:00 |
|
Stephen Birarda
|
948e8f7163
|
actually return packet from initialize packet
|
2015-07-08 14:27:16 -07:00 |
|
Sam Gateau
|
4c44eb63da
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-07-08 14:25:41 -07:00 |
|
Stephen Birarda
|
4fe6102a7c
|
change readPacketType and readPacketTypeVersion
|
2015-07-08 14:25:14 -07:00 |
|
Sam Gateau
|
f992e875b4
|
Adding intrsumentation for nsight and hiding the nsight specific code in cpp
|
2015-07-08 14:25:13 -07:00 |
|
Stephen Birarda
|
b983f662ee
|
use templated write for sequence number in OctreeEditPacketSender
|
2015-07-08 14:24:32 -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 |
|
Stephen Birarda
|
fa71c781f4
|
cleanup edit message memory management in octree packet sending
|
2015-07-08 14:12:04 -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
|
1e34a63234
|
Merge remote-tracking branch 'clement/protocol' into atp
|
2015-07-08 12:19:04 -07:00 |
|
Stephen Birarda
|
e13360b1b6
|
initial changes to OctreeEditPacketSender for new API
|
2015-07-08 12:18:38 -07:00 |
|
Philip Rosedale
|
afdd4c862c
|
Merge pull request #5275 from howard-stearns/sword-button-away-hit-points
Add a button to create/toggle-away sword.
|
2015-07-08 12:11:51 -07:00 |
|
Howard Stearns
|
ef4620cabb
|
Add a button to create/toggle-away sword.
When brandished, display hit points (in overlay for this user).
|
2015-07-08 11:52:37 -07:00 |
|
Philip Rosedale
|
49baa711eb
|
Merge pull request #5273 from cozza13/20609
CR for Job #20609 - Remove lobby.js from default scripts
|
2015-07-08 11:42:11 -07:00 |
|
Philip Rosedale
|
574758eae9
|
Merge pull request #5252 from ctrlaltdavid/20601
DO NOT MERGE - QA for #20601 - Fix and improve eye gaze
|
2015-07-08 11:37:40 -07:00 |
|
Andrew Meadows
|
58c32dbf20
|
remove whitespace from end of lines
|
2015-07-08 11:30:04 -07:00 |
|
Atlante45
|
10f843b197
|
Packet type fixes in audio client
|
2015-07-08 11:28:11 -07:00 |
|
Atlante45
|
b3dd532392
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-08 11:20:24 -07:00 |
|
Atlante45
|
fef51682d5
|
Jurisdiction map uses new packet API
|
2015-07-08 11:19:57 -07:00 |
|
Chris Collins
|
16e79cc85f
|
Remove lobby.js from the default scripts
Lobby.js has some bugs that are not going to be fixed in the short
term. Therefore we are removing it from default scripts.
|
2015-07-08 11:17:03 -07:00 |
|
Stephen Birarda
|
bb6065e7dd
|
resolve conflicts on merge with clement/protocol
|
2015-07-08 10:55:05 -07:00 |
|
Stephen Birarda
|
dcf1465a0c
|
fix reference to packet pos in AudioInjector
|
2015-07-08 10:54:04 -07:00 |
|
Stephen Birarda
|
f725ca09b2
|
remaining fixes for write and pos in AudioInjector
|
2015-07-08 10:52:29 -07:00 |
|
Atlante45
|
6bf05fbf1f
|
Pointer fixes
|
2015-07-08 10:50:51 -07:00 |
|
Stephen Birarda
|
1b9f523f68
|
fix construction of QDataStream in AudioInjector
|
2015-07-08 10:50:47 -07:00 |
|
Atlante45
|
302354aa5d
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-08 10:50:40 -07:00 |
|
Stephen Birarda
|
78bc0979cc
|
move the symmetric ping packet
|
2015-07-08 10:47:54 -07:00 |
|
Stephen Birarda
|
122fd61451
|
fix a bad replacement in DatagramProcessor
|
2015-07-08 10:44:40 -07:00 |
|
Stephen Birarda
|
04b3ca3efd
|
fix a bad replacement in AvatarMixer
|
2015-07-08 10:43:05 -07:00 |
|
Atlante45
|
7713219718
|
Compile fixes
|
2015-07-08 10:40:35 -07:00 |
|
Stephen Birarda
|
818521864b
|
fix missed bad PacketType replacement
|
2015-07-08 10:27:32 -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
|
161fcf185c
|
resolve conflicts on merge with Atlante45/protocol
|
2015-07-07 18:23:44 -07:00 |
|
Stephen Birarda
|
11fd43a094
|
fix for packet types in send assignment
|
2015-07-07 18:23:03 -07:00 |
|
Atlante45
|
0e97b9dc81
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-07 18:22:21 -07:00 |
|
Atlante45
|
737d85c597
|
Compile fixes
|
2015-07-07 18:22:06 -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 |
|