Commit graph

852 commits

Author SHA1 Message Date
Stephen Birarda
9d2e1773a0 fix memory issues for immediate ice pings 2015-05-28 15:31:21 -07:00
Stephen Birarda
da0c9fbc31 fix send of existing peer to querier 2015-05-28 14:37:16 -07:00
Stephen Birarda
e096cbe040 have ice-server immediately send peer to DS 2015-05-28 14:25:18 -07:00
Stephen Birarda
531ef1fa1c change ice-server heartbeat behaviour 2015-05-28 14:05:43 -07:00
Stephen Birarda
eb6b80133b immediately ping the ICE DS every 25ms 2015-05-28 13:17:48 -07:00
Stephen Birarda
81c23e9ca0 output if pinged node cannot be reached 2015-05-28 11:22:27 -07:00
Stephen Birarda
cee058c4ce handle immediate add packets in NodeList 2015-05-28 11:02:45 -07:00
Stephen Birarda
5c75863af4 immediately send add packet from DS for new node 2015-05-28 10:45:03 -07:00
Stephen Birarda
667df66963 add packet type for DS node add 2015-05-27 18:25:38 -07:00
Stephen Birarda
0cb67cce2c add ping timer tied to NetworkPeer 2015-05-27 18:22:23 -07:00
Stephen Birarda
757d02a600 fix reset on address lookup 2015-05-27 16:00:56 -07:00
Stephen Birarda
e6e2c4b95d look for connection steps in LimitedNodeList 2015-05-27 15:54:39 -07:00
Stephen Birarda
734798a365 fix move of connection steps to LNL 2015-05-27 15:50:31 -07:00
Stephen Birarda
c7c542ef4c decouple STUN from DS check in 2015-05-27 14:24:15 -07:00
Stephen Birarda
4b6b34836d repair anomalies in timing table 2015-05-27 10:30:45 -07:00
Stephen Birarda
9cb6ccaa46 thread safe timing of domain connection 2015-05-26 16:49:18 -07:00
Stephen Birarda
d1489c50fe add connection times getter to NodeList 2015-05-26 14:18:58 -07:00
Stephen Birarda
626f22191c add a QAbstractTableModel for domain connection steps 2015-05-26 14:17:02 -07:00
Stephen Birarda
f9251471da add audio connection to final part of connection steps 2015-05-26 10:44:45 -07:00
Stephen Birarda
f28ade1075 log connection times for eventual stats display 2015-05-26 10:37:44 -07:00
Stephen Birarda
27717db9d1 fire off DS check immediately once DS info is known 2015-05-22 16:38:26 -07:00
Stephen Birarda
69f1cd80e6 immediately send ICE heartbeat once data present 2015-05-22 16:29:01 -07:00
Eric Levin
fe99941de3 fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp 2015-05-21 19:35:27 -07:00
Seth Alves
52ce26d80d Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-21 09:20:56 -07:00
Seth Alves
aa1d3eb82a respond to code review 2015-05-20 17:31:57 -07:00
Stephen Birarda
7373bb6817 contain QSharedMemory for local server port to reader 2015-05-20 17:11:08 -07:00
Seth Alves
4a59dc24c5 split entity-add and entity-edit messages 2015-05-20 14:52:03 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
b32e069f1d bump protocol version 2015-05-19 14:45:01 -07:00
Stephen Birarda
2eb796eca6 resolve conflicts on merge with upstream/master 2015-05-18 10:25:24 -07:00
Stephen Birarda
5645fdc8b9 send user to token creation page 2015-05-14 15:21:33 -07:00
Andrew Meadows
d28c400cea add restitution and friction Entity properties 2015-05-14 12:36:59 -07:00
Howard Stearns
ef187b390b Server versioning. 2015-05-13 15:52:05 -07:00
Stephen Birarda
ca87d64dc7 fix for audio-mixer shutdown hang, removing spaces 2015-05-13 12:03:21 -07:00
Philip Rosedale
349886c146 Merge pull request #4847 from birarda/domain-paths
add initial support for local paths in domain
2015-05-12 17:09:13 -07:00
Seth Alves
db704874b9 bump protocol version for line entities 2015-05-12 16:02:45 -07:00
Stephen Birarda
332601b91c final fixes for path query from DS 2015-05-12 14:34:14 -07:00
Stephen Birarda
7330e5255d handle path query response from DS in NL/AM 2015-05-12 13:48:41 -07:00
Stephen Birarda
0562fee82a Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths 2015-05-12 12:39:05 -07:00
Stephen Birarda
e0ccc986b1 add a method to DS to respond to path query 2015-05-12 12:29:09 -07:00
Stephen Birarda
d8b17ffeb0 add packets for a path query and path response 2015-05-12 12:00:03 -07:00
Anthony Thibault
e1cbfcd901 Merge branch 'master' into ajt/particle-system-improvements
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
2015-05-11 19:24:13 -07:00
Anthony Thibault
b3af515224 Particle entity improvements based on code review.
* Updated variable naming to match coding standards.
* Changed particle raw float arrays to vectors.
* Bug fix: changing maxParticles will no longer lead to memory corruption.
* Made particle ring buffer more explicit, added _particleTailIndex.
* Added getLivingParticleCount() private method.
* Moved integration and bounds code into private methods.
* Bug fix: high emit rates now properly integrate particles forward for the
  remaing frame time, not the entire frame.
* Bug fix: new particles were not initiaized to origin.
* Added more particles to ajt-test.js.
* Bug fix: ajt-test.js script was not shutting down properly.
* Removed random seed, unless we have a psudo random number generator per
  particle system instance, it's unlikely that this will preserve sync.
* Bumped packet version number.
2015-05-11 19:21:33 -07:00
Seth Alves
866a6fba9b Merge pull request #4823 from birarda/master
repairs to AC stop and clean shutdown
2015-05-11 18:11:52 -07:00
Brad Davis
c12b74ebd0 Merge pull request #4816 from ctrlaltdavid/fix-pragma
Disable pragma that Windows doesn't know about
2015-05-11 12:30:54 -07:00
Stephen Birarda
8c6715e4fc resolve conflicts on merge with upstream/master 2015-05-11 11:10:22 -07:00
Clément Brisset
5160eb5b94 Merge pull request #4819 from ZappoMan/moreZoneProperties
More Zone Atmosphere Work: add automatic day/hour calculation
2015-05-11 19:38:27 +02:00
Seth Alves
d86b22f7c8 Merge pull request #4824 from howard-stearns/cache-mod-time
Cache mod time
2015-05-11 10:38:23 -07:00
Clément Brisset
421ebeb3d7 Merge pull request #4795 from birarda/sequence-numbers
add sequence number support to NL, don't double send data from AvatarMixer
2015-05-11 19:23:33 +02:00
Howard Stearns
cdef09c9dd Add comment (and force previous change to the right branch). 2015-05-11 10:12:03 -07:00