Stephen Birarda
c903d284bb
fix for arguments that are now const NLPacket&
2015-07-09 11:32:00 -07:00
Atlante45
d4e01742e5
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
2015-07-08 18:40:18 -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
f37d3c9bd6
fix primitive type writing in OctreeSceneStats
2015-07-08 16:44:45 -07:00
Stephen Birarda
480cb80f4f
fix primitive writing in OctreeEditPacketSender
2015-07-08 16:42:43 -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
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
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
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
Atlante45
fef51682d5
Jurisdiction map uses new packet API
2015-07-08 11:19:57 -07:00
Atlante45
7713219718
Compile fixes
2015-07-08 10:40:35 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
Stephen Birarda
55a775de38
add TODO for EntityEditNack read fix
2015-07-07 15:35:45 -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
e953b36f58
handle stats + data packet combination in OctreeSendThread
2015-07-07 12:56:20 -07:00
Stephen Birarda
01b1c46237
more networking API changes in octree classes
2015-07-07 12:31:22 -07:00
Ryan Huffman
18dd61ec7e
Update JurisdictionListener to use NLPacket
2015-07-07 12:09:54 -07:00
ZappoMan
c4a5160b89
CR feedback
2015-07-04 19:13:35 -07:00
ZappoMan
40cdd8646e
add packets per second to octree processing stats
2015-07-03 15:53:53 -07:00
ZappoMan
2aa345dfc6
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-03 15:04:59 -07:00
ZappoMan
29a7584ee6
remove dead code
2015-07-03 11:29:59 -07:00
ZappoMan
e1530b3ce9
added a FIXME STUTTER note
2015-07-02 18:15:24 -07:00
ZappoMan
a54cf67064
add stats for processing time per packet
2015-07-02 17:28:53 -07:00
ZappoMan
8916dd2056
add stats for elements and entities per second
2015-07-02 17:00:35 -07:00
Stephen Birarda
b3c3e5a6c8
more PacketType to PacketType::Value replacements
2015-07-02 16:49:19 -07:00
Stephen Birarda
0d64e82fe2
replace PacketType declarations with PacketType::Value
2015-07-02 16:38:52 -07:00
ZappoMan
0c0b8dbbc1
add stats for elements and entities per incoming packet
2015-07-02 16:19:13 -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
ZappoMan
24b4614703
add more detailed edit timing to entity server
2015-07-01 16:11:08 -07:00
Andrew Meadows
426b343e2c
remove cruft canAppendBytes() method
2015-06-26 23:12:48 -07:00
Andrew Meadows
4d4b97fe59
add priority promotion to reduce volunteer races
...
also fix priority inheritance from chained collisions
2015-06-26 22:30:06 -07:00
Andrew Meadows
12fc18092b
SimulationOwner as one property
2015-06-26 21:58:03 -07:00
Andrew Meadows
cf74dbe1dc
partial progress toward sim ownership negotiations
...
works well for just a few objects but fails for piles
committing some debug stuff that will have to be torn out later
2015-06-26 21:57:04 -07:00
Anthony J. Thibault
3853395298
Bug fixes for switching between head/body and full body avatars
...
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Philip Rosedale
6ef7e486b1
Merge pull request #5165 from ctrlaltdavid/20582
...
CR for #20582 - Fix the issue with Domain backups
2015-06-22 17:02:38 -07:00