Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 18:18:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

771 commits

Author SHA1 Message Date
Stephen Birarda
8921f59e23 fix entity packet send from interface client 2015-07-16 12:09:35 -07:00
Stephen Birarda
336967e580 fix edit packet sending from client 2015-07-16 11:17:49 -07:00
Stephen Birarda
039ef0750c set jurisdiction listener object name for thread identification 2015-07-15 18:52:59 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
Stephen Birarda
b115bd1a55 resolve conflicts on merge with huffman/receive_packets 2015-07-15 10:52:07 -07:00
Ryan Huffman
44c99ef89a Replace bytesAvailable with bytesLefToRead 2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Stephen Birarda
0327a8d477 fix bytesAvailable, don't double seek in Packet 2015-07-14 20:47:16 -07:00
ZappoMan
bc251de43c delete dead code 2015-07-14 16:49:22 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Ryan Huffman
bd345cdccd Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/PacketReceiver.cpp
 2015-07-14 15:59:16 -07:00
Stephen Birarda
ca47165d72 compare bytesAvailable to 0 2015-07-14 15:42:28 -07:00
Ryan Huffman
47f3aad437 Update use of sendingNode->getUUID() to use packet->getSourceID instead 2015-07-14 15:23:41 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
 2015-07-14 14:53:45 -07:00
Stephen Birarda
fbd287472d make NodeData parseData take only packet 2015-07-14 14:09:00 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Stephen Birarda
9d4f9aa21e final fixes to get ACs building again 2015-07-13 15:38:45 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Stephen Birarda
f06636d45e repairs for other ThreadedAssignment subclasses 2015-07-13 15:16:55 -07:00
Stephen Birarda
ede39515d8 update parseData for new network API 2015-07-13 14:26:10 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
ericrius1
0ce6737b34 merged and normals flipping 2015-07-13 09:43:15 -07:00
Stephen Birarda
3d62162812 cleanup octree networking code to use new API 2015-07-13 09:40:26 -07:00
Atlante45
c77310019d Some .get() cleanup 2015-07-09 14:03:32 -07:00
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
ericrius1
ad97b28734 fixed merge conflicts 2015-07-02 11:01:40 -07:00
ericrius1
43b1751db3 fixed network bug for polylines 2015-07-01 18:33:42 -07:00
ZappoMan
24b4614703 add more detailed edit timing to entity server 2015-07-01 16:11:08 -07:00
ericrius1
55508aa3a4 in process of adding support for a property which is a QVector of floats" 2015-06-30 15:44:19 -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
Brad Davis
1b44c220a7 Prep work for procedural stars & stuff 2015-06-22 09:43:12 -07:00
Bradley Austin Davis
4ccdc78866 Fixing frustum perspective bug 2015-06-21 15:53:24 -07:00
David Rowe
709508857c Delete maximum rolling backup file if it exists before rolling backup 2015-06-18 17:39:31 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Atlante45
a9d2bb1e1c Coding standard 2015-06-18 15:23:50 +02:00
Seth Alves
610bfc63e8 check success in OctreePacketData::appendValue for qvectors of vec3s before proceeding with further data appends 2015-06-17 18:34:46 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Atlante45
7654533888 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-03 19:47:51 +02:00
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -07:00
Atlante45
bbf1837796 Introduced RenderDetails/Stats don't pull details 
- Regrouped everything stat in a struct
	- Details are set into the stats
 2015-06-03 16:14:23 +02:00
Andrew Meadows
2702e07863 Merge pull request #5015 from sethalves/polyvox 
PolyVox improvements -- depends on #5008
 2015-06-02 14:34:49 -07:00
Eric Levin
55ffb7f1c0 code style changes 2015-06-02 12:51:45 -07:00
Eric Levin
785144404c changed entity packet type version number 2015-06-01 15:37:29 -07:00
Eric Levin
83bf4241e4 resolved merge conflicts... but now lines not flying across clients 2015-06-01 15:16:08 -07:00
ZappoMan
d4af454834 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-01 14:42:35 -07:00
Eric Levin
5cce4edec8 fix merge conflicts attemp 1 2015-06-01 11:18:33 -07:00
Eric Levin
b6b5078048 removed unneeded append methods from OctreePacketData 2015-06-01 11:11:08 -07:00
Eric Levin
93c3f90c95 clened up read and write of qVec- no longer converting between qVector and qByteArray 2015-06-01 11:08:48 -07:00
Eric Levin
115bf3dd25 cleaned up logging and testing code. 2015-05-31 14:52:44 -07:00
Eric Levin
27b59b5f72 fixed bug in qvec unpacking code 2015-05-31 14:46:20 -07:00
Eric Levin
5e22af8643 points and line width persistent accross clients 2015-05-31 14:21:28 -07:00