Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-29 22:39:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62161 commits 74 branches 59 tags 1.2 GiB
Commit graph

3456 commits

Author SHA1 Message Date
Ryan Huffman
812aaee48c Add Entities.reloadServerScripts 2017-01-17 14:47:57 -08:00
Ryan Huffman
b0c2a9d614 Add serverScripts entity property 2017-01-17 14:47:06 -08:00
Atlante45
163d65d784 Setup basic EntityScriptServer 2017-01-17 13:47:45 -08:00
Zach Fox
246f5fb7f5 Add log; fix whitespace 2017-01-17 11:51:09 -08:00
David Kelly
2460e89a57 CR feedback 2017-01-17 09:53:04 -08:00
David Kelly
6c07a9aece remove debuggng logspam 2017-01-16 19:06:36 -08:00
David Kelly
6c701bb0f0 remove ignored avatars from PAL when they disconnect 2017-01-16 18:22:53 -08:00
Zach Fox
1e8effdcc4 Packet verison bump 2017-01-16 15:28:53 -08:00
ZappoMan
c884b276e2 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-14 22:15:22 -08:00
Zach Fox
b0b6aeac6c Ken's feedback 2017-01-13 13:00:03 -08:00
Zach Fox
8c3766dfe8 Fixme 2017-01-13 12:59:24 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
Brad Davis
e256f7cccc Remove sendqueue spam in traces 2017-01-11 14:27:27 -08:00
Brad Hefta-Gaub
ef7b9bfde0 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 10:07:05 -08:00
Zach Fox
dec41f67cc Fix bugs and generally fix behavior 2017-01-06 13:58:23 -08:00
Zach Fox
b7d64804c1 Remove errant //FIXME 2017-01-05 21:55:09 -08:00
Zach Fox
495925a017 This behavior was harder to change than expected... 2017-01-05 16:58:32 -08:00
Brad Hefta-Gaub
5242375215 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-05 08:57:10 -08:00
Ken Cooke
84af90ad96 Bump the audio packet version 2017-01-04 19:59:50 -08:00
Brad Hefta-Gaub
acca9dbe87 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2017-01-04 18:07:22 -08:00
Zach Fox
e80ae92327 Also clear personalmutedlist upon reset() 2017-01-04 15:06:18 -08:00
Howard Stearns
3d8da683db Merge pull request #9290 from zfox23/PersonalMute 
Personal mute; Quasi-ignore; Reversible PAL actions
 2017-01-04 14:37:09 -08:00
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Zach Fox
899dd21328 Lots of CR feedback 2017-01-03 15:43:30 -08:00
Brad Hefta-Gaub
60d48bcd49 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-03 14:42:59 -08:00
Zach Fox
10b5b957f2 Ahh...It's beautiful and simple now. 2016-12-29 13:09:40 -08:00
Zach Fox
24eac77115 I'm about to refactor this. 2016-12-29 11:57:51 -08:00
Zach Fox
bb2b48d424 Getting very close. 2016-12-29 11:35:20 -08:00
Brad Hefta-Gaub
a72f60152b audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate 2016-12-29 08:53:37 -08:00
Zach Fox
af1c67a252 Progress! 2016-12-28 17:23:56 -08:00
Zach Fox
e26d347682 It seems to be working, minus removing from list 2016-12-28 15:15:39 -08:00
Zach Fox
46e8bf5283 First steps, holding off til Howard finishes 2016-12-28 15:12:21 -08:00
Zach Fox
800389cf20 Remove HRS logging 2016-12-28 14:37:19 -08:00
David Kelly
38a3ee4104 Some code review feedback 
more to come
 2016-12-27 10:17:39 -08:00
howard-stearns
a9e781f565 naming consistentcy. No functional changes. 2016-12-27 10:17:39 -08:00
howard-stearns
8b9c1446cd protocol versions 2016-12-27 10:17:39 -08:00
howard-stearns
2f2940b7cc fixes 2016-12-27 10:14:28 -08:00
Howard Stearns
344272f24a unignore checkpoint (untested) 2016-12-27 10:14:24 -08:00
howard-stearns
0ad9786f6b requestsDomainsListData 2016-12-27 10:14:20 -08:00
Brad Hefta-Gaub
02a6060b5e hacking on new format 2016-12-22 16:16:44 -08:00
Brad Davis
e58623bcc0 Working on test/trace script interface 2016-12-22 11:46:40 -08:00
Brad Hefta-Gaub
be62df2001 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-21 08:59:29 -08:00
David Kelly
50554e934e Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn 2016-12-20 16:30:10 -08:00
Brad Hefta-Gaub
d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2016-12-20 16:25:12 -08:00
David Kelly
4a25b727d8 Add comment back, with interest 2016-12-20 14:26:45 -08:00
David Kelly
7750e86c13 Only send machine fingerprint when not logged in 
While at it, no longer grabbing it at all when starting up, as that
was just a dev thing.  Should consider not sending MAC address too, but
we may revisit that later.
 2016-12-20 13:47:58 -08:00
Brad Hefta-Gaub
9b11c7cc9c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/networking/src/NodeList.cpp
 2016-12-20 10:46:57 -08:00
Howard Stearns
9aad93465d Merge pull request #9227 from howard-stearns/sessionDisplayNames 
Session display names
 2016-12-20 10:07:05 -08:00
Howard Stearns
9ff06e53d4 Merge pull request #9235 from davidkelly/dk/fingerprintInPAL 
Expose Machine Fingerprint in PAL
 2016-12-20 10:06:36 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00
David Kelly
4feec85337 CR feedback 
Though this seems like a hard place to remember, when we make further
changes.
 2016-12-19 17:23:24 -08:00
David Kelly
5b9c19b39e Versioning 2016-12-19 16:06:12 -08:00
howard-stearns
60cb7acb50 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 15:28:07 -08:00
David Kelly
36792e005a initial commit 2016-12-19 14:19:39 -08:00
David Kelly
c0d7c06d4a Merge pull request #9221 from davidkelly/dk/machineFingerprintToDS 
Adding Machine Fingerprint to Domain Server permissions
 2016-12-19 11:49:33 -08:00
Zach Fox
a912fec496 PR comments; need particular fix on Master for full QA 2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08 Super close 2016-12-19 10:20:08 -08:00
Zach Fox
802e283508 Another checkpoint, getting closer 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
howard-stearns
9d9345cb65 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 09:19:14 -08:00
Brad Davis
ee3c8e6efd Merge pull request #9225 from jherico/chrome_tracing 
Additional work on tracing
 2016-12-16 17:53:55 -08:00
David Kelly
0553dbdcb7 CR feedback 2016-12-16 17:17:10 -08:00
Ryan Huffman
8f536fcf5e Fix syntax error in UserActivityLogger 2016-12-16 15:05:17 -08:00
Ryan Huffman
f3f6317c91 Add controller name and update version in tutorial user stats 2016-12-16 15:05:17 -08:00
howard-stearns
3adc78fecc Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de sessionDisplayName set at server and passed to all clients (including 
oneself)
 2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
David Kelly
126ae52cb4 Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS 2016-12-16 12:17:54 -08:00
Brad Davis
a12b8b4b62 Cleanup dead code 2016-12-16 09:21:41 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
Brad Hefta-Gaub
8497ad1e29 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-15 16:42:41 -08:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings 
Use JSON for application Settings
 2016-12-15 07:00:46 -08:00
David Kelly
2566778654 Handle no setting manager case 
Can't save the fallback generated UUID for machine fingerprint if
the user of this stuff doesn't have a settings file.  Found this when
I noticed needed to initialize com for all the assignment clients
 2016-12-14 16:43:37 -08:00
David Kelly
cb14b0e3e0 inital cut, passing fingerprint in 
does permissions same as mac address, more or less.  Not exposed
yet, just a beginning.
 2016-12-14 16:09:13 -08:00
Brad Hefta-Gaub
a7750501c6 first cut at adding view frustum support to avatar mixer 2016-12-13 18:58:11 -08:00
Zach Fox
44c6eb303b Fix the bug 2016-12-13 12:46:31 -08:00
David Rowe
1f3045ad30 Merge branch 'master' into 21089 
Conflicts:
	interface/src/Application.cpp
 2016-12-13 14:05:24 +13:00
David Rowe
efb784f703 Code review 2016-12-13 13:11:21 +13:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
David Rowe
a52d8d1982 Merge branch 'master' into 21089 2016-12-10 11:47:43 +13:00
Chris Collins
ec4edf5030 Merge pull request #9130 from zzmp/feat/audio-threading 
Threaded Audio
 2016-12-09 10:46:54 -08:00
Zach Pomerantz
b2f995d3df algorithm->nestedEach in LimitedNodeList 2016-12-07 00:03:30 +00:00
David Kelly
562cd12bca More CR feedback 
Breaking into 2 functions - one public, one private, so I can avoid
nested control structures and so on in dealing with errors on the
windows side of things.  So, no more namespace, back to a class with
2 static functions, one public one private
 2016-12-06 15:17:47 -08:00
David Rowe
d857f943f8 Handle Clara marketplace downloads 2016-12-07 09:16:59 +13:00
David Kelly
dc47c5fc0c CR feedback 
lame mistake - it is always the error branches that get you.
 2016-12-06 11:12:50 -08:00
David Kelly
7880b5bfe0 Simple fallback now 
If the bios uuid isn't a valid UUID (on mac or windows it 'should be`)
then we read the fallback from the settings and use that, or create and
write one to the settings if it is missing.
 2016-12-05 17:05:39 -08:00
David Kelly
54716f70e5 Now works on mac, small build change for that 
Plus does nothing for linux, but there's a comment.
 2016-12-05 11:11:30 -08:00
David Kelly
643353a31e Initial push 
Works on windows, have not tried it on mac.  Lots more to do, but
need to get it pushed to remote just in case.
 2016-12-02 15:46:20 -08:00
Zach Pomerantz
8a6dcdeb68 mix audio with single node list read lock 2016-11-30 16:37:34 -05:00
Atlante45
1d8c97b337 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-30 10:22:16 -08:00
Zach Pomerantz
e6dfc5204d expose mutex in LimitedNodeList 2016-11-28 17:13:21 -05:00
howard-stearns
b37feb20de signal from ignoreNodesInRadius 2016-11-23 11:23:06 -08:00
howard-stearns
8b9efb461e bubble state 2016-11-23 10:22:24 -08:00
howard-stearns
066a518142 expose metaverse url to javascript and use it rather than hardcoding 2016-11-21 13:07:38 -08:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
howard-stearns
5b216578d7 Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup 2016-11-21 11:47:30 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
howard-stearns
f1806eb649 server protocols 2016-11-18 17:05:14 -08:00
Stephen Birarda
47f82a8046 send the mac address with domain-server check in 2016-11-18 13:50:11 -08:00
howard-stearns
9f2b6dc40b location cleanup 2016-11-16 12:53:57 -08:00
Chris Collins
0876dbc809 Merge pull request #9050 from sethalves/last-edited-by 
lastEditedBy property for entities
 2016-11-11 16:02:18 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226 
Add ability to mute user
 2016-11-11 16:02:08 -08:00
Ryan Huffman
2203607044 Merge pull request #9056 from Atlante45/networking 
Protect against empty packet lists
 2016-11-11 15:28:46 -08:00
Atlante45
a38846aeed Protect against empty packet lists 2016-11-11 14:32:52 -08:00
David Kelly
9c8f22e0e7 straight to audio mixer 
since we can get the canKick there too.  (doh)
 2016-11-11 09:30:58 -08:00
Seth Alves
899dec8b10 Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by 2016-11-11 06:11:49 -08:00
Seth Alves
5629db9109 Merge pull request #9049 from birarda/max-min-av-scale 
add a min/max avatar scale in domain-server settings
 2016-11-11 06:11:02 -08:00
David Kelly
285520dff7 Initial cut 
No script work yet, just first stab at underpinnings
 2016-11-10 16:24:35 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Stephen Birarda
6f442a74b1 request settings from agents and debug results 2016-11-10 14:43:15 -08:00
Anthony J. Thibault
839b1a3c5e Added some jsdoc comments to the C++ source 2016-11-09 18:09:10 -08:00
Brad Hefta-Gaub
5454dca82e Merge pull request #9030 from highfidelity/stable 
Update master with Stable hotfix
 2016-11-07 18:48:54 -08:00
Atlante45
f34cf64f3e Disable updater on Steam 2016-11-07 16:09:56 -08:00
humbletim
2139e979da map specific HTTP errors to corresponding ResourceRequest enums 2016-11-06 10:31:02 -05:00
Chris Collins
dc8d0bf31c Merge pull request #8935 from zzmp/log/silence-udt-socket 
group udt::Socket errors as debug logs
 2016-10-31 10:31:10 -07:00
Clément Brisset
95c175ae74 Merge pull request #8950 from huffman/tutorial/gotoentrystep 
Add tutorial tracking for going through the welcome portal
 2016-10-28 16:26:40 -07:00
Ryan Huffman
9a99cd0ec6 Add tutorialID and tutorialVersion to tutorial progress event 2016-10-28 12:53:16 -07:00
Stephen Birarda
7ddfddc567 make the socket readyRead check fire after 2s of no packets 2016-10-28 10:30:20 -07:00
Stephen Birarda
20f042a15a add slightly more information to last packet debug in Socket 2016-10-27 22:10:32 -07:00
Stephen Birarda
db7f5724f7 output last seq number and last socket before readyRead sticks 2016-10-27 21:50:29 -07:00
Zach Pomerantz
72282257bd group udt::Socket errors as debug logs 2016-10-27 13:45:58 -07:00
Stephen Birarda
4abc4adde9 add a timer to check for readyRead backup 2016-10-26 16:18:12 -07:00
Chris Collins
de419c2818 Merge pull request #8912 from Atlante45/nodelist-race 
Fix potential race in NodeList
 2016-10-26 13:00:05 -07:00
Brad Hefta-Gaub
2fa4f53c4c Merge pull request #8915 from highfidelity/stable 
Stable to master
 2016-10-25 18:52:29 -07:00
Stephen Birarda
b16f5a4752 include BuildInfo for USE_STABLE_GLOBAL_SERVICES 2016-10-25 17:42:12 -07:00
Atlante45
384f3d9321 Fix potential race in NodeList 2016-10-25 16:58:21 -07:00
Brad Hefta-Gaub
4aa96c9acc add location and build info to user activity stats 2016-10-25 15:48:03 -07:00
Brad Hefta-Gaub
272055b6ee add location and build info to user activity stats 2016-10-25 14:19:44 -07:00
Stephen Birarda
b753871fc1 don't change DF or buffer sizes for ice-server 2016-10-25 11:20:10 -07:00
David Kelly
bdcb58bf8b Merge pull request #8847 from sethalves/fix-audio-mixer-data-race-1 
fix some data-races in logging system
 2016-10-21 15:33:40 -07:00
Chris Collins
8481d0baa5 Merge pull request #8872 from birarda/master 
always go to dev welcome when not using stable services
 2016-10-21 06:16:26 -07:00
Clément Brisset
b63eb6ba9f Merge pull request #8665 from zzmp/feat/audio-stats 
move audio stats to QML/JS, with graphs
 2016-10-20 16:43:49 -07:00
Stephen Birarda
5886996bc3 always go to dev-welcome when not using stable services 2016-10-20 16:29:40 -07:00
Seth Alves
8ac799ddaf Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1 2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0 
Fix some audio mixer data races
 2016-10-20 10:01:26 -07:00
Brad Hefta-Gaub
6109f41ae2 Merge pull request #8859 from Atlante45/seq-num-race 
Fix sequence number race condition
 2016-10-20 08:26:31 -07:00
Brad Hefta-Gaub
00d613a60e Merge pull request #8848 from sethalves/quiet-compiler 
quiet warnings in Linux build
 2016-10-19 17:41:19 -07:00
Atlante45
bc8554fd90 Fix sequence number race condition 2016-10-19 13:31:00 -07:00
Stephen Birarda
eb8f67b612 cleanup asset file regex, comment in renameMapping 2016-10-19 11:47:57 -07:00
Stephen Birarda
7aac2e6916 restrict asset file mapping operations to file path 2016-10-19 10:57:23 -07:00
Seth Alves
b936252609 quiet compiler 2016-10-18 17:56:57 -07:00
Seth Alves
a801f27c7c Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-1 2016-10-18 17:34:22 -07:00
Seth Alves
72998b190c Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-0 2016-10-18 17:33:57 -07:00
Stephen Birarda
22e0e649b1 add a comment for ack count calculations 2016-10-18 16:16:09 -07:00
Stephen Birarda
5bd6cc9fac fix comparison for reno slow start 2016-10-18 16:01:35 -07:00
Seth Alves
af5be8d1d9 reduce data-races in logging 2016-10-18 15:59:00 -07:00
Stephen Birarda
ddce913095 cleanup math for leftover ACKs 2016-10-18 15:54:25 -07:00
Stephen Birarda
214d2e4c91 break slow start on vegas timeout loss 2016-10-18 15:54:25 -07:00
Stephen Birarda
71de9701e0 add some additional comments to reno congestion avoidance 2016-10-18 15:54:25 -07:00
Stephen Birarda
974cccf519 cleanup initialization of min RTT member variables 2016-10-18 15:54:25 -07:00
Stephen Birarda
b817e72976 comment clarity and readability improvements 2016-10-18 15:54:25 -07:00
Stephen Birarda
d5a450ad30 add comment about Jacobson's formula for RTT estimation 2016-10-18 15:54:25 -07:00
Stephen Birarda
1041443796 use __FUNCTION__ and clearup zero us RTT comment 2016-10-18 15:54:25 -07:00
Stephen Birarda
13c38760b3 switch to wireSize, use time only, remove double public 2016-10-18 15:54:25 -07:00
Stephen Birarda
7567cff590 fix comment for ACK interval of 1 2016-10-18 15:54:25 -07:00
Stephen Birarda
41d48b12bd add a comment clearing up onACK return 2016-10-18 15:54:25 -07:00
Stephen Birarda
7480d1e45d switch default hifi address back to welcome 2016-10-18 15:54:25 -07:00
Stephen Birarda
9407efbbc5 protect against an overflow in TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
7ef596a9f0 use ova-welcome for default hifi address 2016-10-18 15:54:25 -07:00
Stephen Birarda
ef660722cd force duplicated sends to use highest RTT, not lowest 2016-10-18 15:54:25 -07:00
Stephen Birarda
d15cb6171d fix bubble up of duplicated packet info 2016-10-18 15:54:25 -07:00
Stephen Birarda
0a7d799abf don't double set _lastACK in TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
fdcface8cb use enum in PacketHeaders, coding standard fixes in Connection 2016-10-18 15:54:25 -07:00
Stephen Birarda
e7c0ed035f remove SendQueue fast re-transmit debug 2016-10-18 15:54:25 -07:00
Stephen Birarda
6d69a0dc71 push version for asset packets to mismatch for TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
af969231e7 remove some extra lines 2016-10-18 15:54:25 -07:00
Stephen Birarda
54b28e646a remove congestion window halving on reno dupe loss 2016-10-18 15:54:25 -07:00
Stephen Birarda
ec51f01c59 remove debugs from TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
a075bb6b1c slow down new UDT debug for asset-server tests 2016-10-18 15:54:25 -07:00
Stephen Birarda
b03bb6b73f halve the congestion window on 3rd duplicate ACK 2016-10-18 15:54:25 -07:00
Stephen Birarda
b74a967c95 fix an additional reference to preAIWindowSize 2016-10-18 15:54:25 -07:00
Stephen Birarda
d05e3e1dd6 drop CWS to 2 if reno fast re-transmit is hit 2016-10-18 15:54:25 -07:00
Stephen Birarda
64a0239248 add reno fallback for fast re-transmit 2016-10-18 15:54:25 -07:00
Stephen Birarda
0b2e0a4167 initial re-implementation of reno cong avoid 2016-10-18 15:54:25 -07:00
Stephen Birarda
dbbdda3468 keep track of num RTT and debug reno fallback 2016-10-18 15:54:25 -07:00
Atlante45
2c026d7b0f Disable packet probes 2016-10-18 15:54:25 -07:00
Atlante45
202641a349 Debug tweaks 2016-10-18 15:54:25 -07:00
Stephen Birarda
5174891b66 move receive time of packet higher in Socket 2016-10-18 15:54:25 -07:00
Stephen Birarda
afc59eea19 grab earliest possible receive time in socket 2016-10-18 15:54:25 -07:00
Stephen Birarda
6a3dd15887 emit packetSent signal immediately after send 2016-10-18 15:54:25 -07:00
Stephen Birarda
b0192df04f allow congestion control to disable ACK2 2016-10-18 15:54:25 -07:00
Atlante45
3d0f449afb Ignore ack syn when using vegas 2016-10-18 15:54:25 -07:00
Stephen Birarda
9760fdc906 use MAX_PACKETS_IN_FLIGHT as receiver max flow window 2016-10-18 15:54:25 -07:00
Stephen Birarda
5ffbd2d11e start num ACKs since FRT to 3 2016-10-18 15:54:25 -07:00
Stephen Birarda
456bcbca67 use max and not min for CW clamp 2016-10-18 15:54:25 -07:00
Stephen Birarda
c0219d9ddf remove numRTT from TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
995f383edb default EWMA RTT and variance to first value 2016-10-18 15:54:25 -07:00
Atlante45
f0dcc54a18 Start in slow start 2016-10-18 15:54:25 -07:00
Atlante45
f143e9bf3f Register SequenceNumber and time_point 2016-10-18 15:54:25 -07:00
Stephen Birarda
7731b407bd only attempt SQ sleep with > 0 PSP 2016-10-18 15:54:25 -07:00
Stephen Birarda
3ecfd6af67 added debug for fast re-transmit 2016-10-18 15:54:25 -07:00
Stephen Birarda
c794c4af1a adjust EWMA RTT start values in TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
96ef1fa483 add FRT debug 2016-10-18 15:54:25 -07:00
Stephen Birarda
7cc1f3261e use last adjustment time to adjust every RTT 2016-10-18 15:54:25 -07:00
Stephen Birarda
0d2e83e0fc cleanup according to Vegas paper, add fast retransmit 2016-10-18 15:54:25 -07:00
Stephen Birarda
ecbba3d4cd send time point with packet sent signal 2016-10-18 15:54:25 -07:00
Atlante45
75d4b156f1 Added shouldNAK to CC class 2016-10-18 15:54:25 -07:00
Atlante45
eee617e39c Remove congestion window size clamp 2016-10-18 15:54:25 -07:00
Stephen Birarda
0954d5bf93 cleanup sent packet time hash after RTT calc 2016-10-18 15:54:25 -07:00
Stephen Birarda
8e05a2893a change congestion window size to an int 2016-10-18 15:54:25 -07:00
Stephen Birarda
5e637c31de rename congestion window size var in TCPRenoCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
b232a44c8d don't send sync ACK when interval is == 1 2016-10-18 15:54:25 -07:00
Stephen Birarda
69ca0d2675 point TCPVegasCC at correct TCPRenoCC base 2016-10-18 15:54:25 -07:00
Stephen Birarda
8c9b46c1e0 fix method signatures, adjust ssthresh increases 2016-10-18 15:54:25 -07:00
Stephen Birarda
eb180b15d8 only raise ssthresh if not reducing cwnd 2016-10-18 15:54:25 -07:00
Stephen Birarda
8304bb81d1 create the base of the TCPVegasCC class 2016-10-18 15:54:25 -07:00
Atlante45
59bcd724ea More Reno work 2016-10-18 15:54:25 -07:00
Atlante45
bad96d54ea TCP congestion control first draft 2016-10-18 15:54:25 -07:00
Seth Alves
21ccc58e04 don't pass statsObject by reference 2016-10-18 14:41:33 -07:00
Seth Alves
0c6dedff45 avoid various data-races related to stats collection and delivery 2016-10-18 13:05:53 -07:00
Seth Alves
0cda01f105 send stats to domain-server with networking thread 2016-10-18 10:29:35 -07:00
Atlante45
3955c6c4c6 Don't override place name path with index path 2016-10-17 14:41:05 -07:00
Chris Collins
1c30d98cf9 Merge pull request #8823 from ZappoMan/shutdownSandbox 
Auto-shutdown of sandbox if it was launched by interface
 2016-10-17 13:20:15 -07:00
Brad Hefta-Gaub
d46170bec0 auto shutdown of sandbox when interface quits 2016-10-17 07:55:24 -07:00
Stephen Birarda
d1cd99e035 remove a useless two dots 2016-10-14 18:24:39 -07:00
Stephen Birarda
9184a500a0 move faked handshake logic to Socket for handshake req flag 2016-10-14 14:46:58 -07:00
Stephen Birarda
ccbfdf7bb9 only emit client connection reset on requested handshake 2016-10-14 14:46:58 -07:00
Stephen Birarda
eb77258c55 fix magic numbers and hide sendFakedHandshake 2016-10-14 14:46:58 -07:00
Stephen Birarda
5e03e55ca2 fix for dual alias in LimitedNodeList std::bind 2016-10-14 14:46:58 -07:00
Stephen Birarda
a2de31909c remove define of UDT connection debug 2016-10-14 14:46:58 -07:00
Stephen Birarda
b81eaa649f make faked handshake request usable in dev/PR 2016-10-14 14:46:58 -07:00
Stephen Birarda
ea2da34bd1 bubble up receiver handshake from udt::Connection 2016-10-14 14:46:58 -07:00
Stephen Birarda
27617b8479 add forced kill of AS for test 2016-10-14 14:46:58 -07:00
Stephen Birarda
5704335b66 add quick fails for no active socket to other AssetClient calls 2016-10-14 14:46:58 -07:00
Stephen Birarda
055df48e8d make the asset server a solo node type 2016-10-14 14:46:58 -07:00
Stephen Birarda
7fd25ae450 fix returns for missing active socket in LNL 2016-10-14 14:46:58 -07:00
Stephen Birarda
3c70a25a40 immediately error in AssetClient if no active socket for AS 2016-10-14 14:46:58 -07:00
Stephen Birarda
ca94fbc219 refuse to send packets if connection should not be created 2016-10-14 14:46:58 -07:00
Stephen Birarda
f41188b0e8 default last receiver response in send queue to queue creation time 2016-10-14 14:46:58 -07:00
Stephen Birarda
5562d7e7a6 add a filter operator to decide if connections are created 2016-10-14 14:46:58 -07:00
Ryan Huffman
6cf4802cc2 Change default hifi address from dev-welcome to welcome 2016-10-13 16:06:07 -07:00
Ryan Downe Karpf
397816679d Merge pull request #8790 from huffman/feat/reliable-path-queries 
Update ds path queries to be reliable
 2016-10-13 09:21:44 -07:00
Ryan Huffman
a44653db57 Update ds path queries to be reliable 2016-10-12 10:47:42 -07:00
Atlante45
eaca3b672f Switch to JSON for application settings 2016-10-12 10:20:19 -07:00
Stephen Birarda
33e426bfd2 Merge pull request #8778 from Atlante45/asset-client 
Fix crash in AssetClient handleProgressCallback
 2016-10-11 18:36:23 -07:00
Stephen Birarda
504e92607a change format of debug message 2016-10-11 13:23:52 -07:00
Stephen Birarda
20ea7e6c98 change QLoggingCategory include casing 2016-10-11 13:21:53 -07:00
Stephen Birarda
07d0a038a5 set the initial last progress debug 5s back 2016-10-11 13:21:15 -07:00
Stephen Birarda
a0c27e2130 remove timer forced timeouts in ARR, occasionally ouput DL progress 2016-10-11 13:17:57 -07:00
Atlante45
e7e9c71625 Fix AssetClient crash 
Do not access message data until message is complete
 2016-10-11 13:05:57 -07:00
Stephen Birarda
826c2f1a9f push the AssetResourceRequest timeout to 15s 2016-10-11 09:55:16 -07:00
Stephen Birarda
ec5850b82b emit ReceivedMessage progress signals more frequently for new timeout 2016-10-11 09:55:05 -07:00
Ryan Huffman
408cc1cd04 Update default hifi address to dev-welcome 2016-10-07 10:30:18 -07:00
Ryan Huffman
9c6eae36a7 Update tutorial progress keys 2016-10-07 10:30:18 -07:00
Ryan Huffman
e24a01d1fe Add path parameter to goToSandbox 2016-10-07 10:30:18 -07:00
Ryan Huffman
4efeb928e2 Add user activity logging to tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
4171fdd2e1 Remove extraneous log line from AssetRequest 2016-10-05 19:27:24 -07:00
Ryan Huffman
17a1f9b5ae Make timer child of QObject instead of attaching to destroyed 2016-10-05 19:25:17 -07:00
Ryan Huffman
bba5a7563f Remove extraneous logging 2016-10-05 19:25:03 -07:00
Ryan Huffman
ca4022814e Add extra logging to asset client 2016-10-04 16:43:13 -07:00
Ryan Huffman
1fff480b73 Add timeout to AssetResourceRequest 2016-10-04 16:43:12 -07:00
Atlante45
573d5898cc Make static control packets class members 2016-10-03 13:46:55 -07:00
Thijs Wenker
4f7fdfc345 eliminated else, this might look cleaner 2016-09-30 03:31:35 +02:00
Thijs Wenker
5025b4a5ed NodeList set the sessionUUID before emitting the connectedToDomain signal 2016-09-29 22:15:53 +02:00
Zach Pomerantz
aacfa7d6c5 back out AudioVersion::CurrentVersion 2016-09-27 10:41:00 -07:00
Zach Pomerantz
b9c4018b8e expose AudioStats to qml/js 2016-09-26 15:35:29 -07:00
Brad Davis
f33d3a3b36 Migrate logging functionality to shared library 2016-09-23 12:04:58 -07:00
Seth Alves
c43c83019d Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-22 10:34:25 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Seth Alves
2e0cc158de ice test-client uses stun server to get public address 2016-09-16 17:21:28 -07:00
Seth Alves
babe8f95bc tool for testing ice-server 2016-09-16 13:34:05 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port 
Add settings to change local port
 2016-09-08 18:10:32 -07:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
SamGondelman
9d447d4dcc enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
Atlante45
eb007b24cd Use invalid port to signal no value passed 2016-09-06 11:59:07 -07:00
Atlante45
12eb65c0c4 Make setSocketLocalPort invokable 2016-09-06 10:18:42 -07:00
Atlante45
9f07511fd8 Move setter to LimitedNodeList 2016-09-06 10:18:42 -07:00
Atlante45
bba5e46533 Don't reset the NodeList 2016-09-06 10:18:42 -07:00
Atlante45
fcf44911a3 Fix Windows warning 2016-09-06 10:18:42 -07:00
Atlante45
a8de6f0a57 Add settings to change local port 2016-09-06 10:18:42 -07:00
Atlante45
713be9fd73 Rename NLs nodeUpdated signal to nodeSocketUpdated 2016-09-06 10:16:00 -07:00
Atlante45
d938e518a0 Start new hole punch when the socket is updated 2016-09-06 10:16:00 -07:00
Seth Alves
25f6e1d79d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-01 15:06:52 -07:00
Stephen Birarda
47f15f6ad8 use libc++ and clang toolchain 2016-08-31 16:16:40 -07:00
Stephen Birarda
7d7cba4dd2 fix networking compile for android setsockopt 2016-08-31 11:30:47 -07:00
Seth Alves
3d436d4c26 bump entity protocol version 2016-08-30 16:23:11 -07:00
Seth Alves
2a9ffc1529 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 10:26:14 -07:00
Stephen Birarda
74fac8c7c9 Merge pull request #8512 from birarda/shareable-address 
add shareable address from default name, leverage for steam join/invite
 2016-08-30 09:35:24 -07:00
Ken Cooke
28a99a7a03 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-08-29 12:38:17 -07:00
Seth Alves
3b278adba3 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-25 17:28:18 -07:00
Seth Alves
7c5b8cb75d send faux joints to the avatar-mixer 2016-08-25 15:21:29 -07:00
Andrew Meadows
ef597265d7 remove unimplemented declaration 2016-08-24 22:26:56 -07:00
Brad Davis
479d90a462 Merge remote-tracking branch 'upstream/stable' 2016-08-24 19:31:11 -07:00
Brad Davis
5cdb30357f Add checking for failed downloads in the textures 2016-08-24 18:03:56 -07:00
Anthony J. Thibault
c2af948e25 Merge branch 'master' into feature/handheld-marketplace 2016-08-24 16:07:04 -07:00
Howard Stearns
89b00883dd Merge pull request #8428 from highfidelity/discovery 
Snapshot of Snapshot-Discovery to master
 2016-08-23 14:32:10 -07:00
Stephen Birarda
fbe784155e add a shareable address return to address manager 2016-08-23 11:19:14 -07:00
Stephen Birarda
edd4f5853e use temporary domain name as place name on ID lookup 2016-08-23 11:19:14 -07:00
Stephen Birarda
2b5d862263 request shareable name in AddressManager once connected 2016-08-23 11:19:14 -07:00
Anthony J. Thibault
c6ea64926c Sensor space entity support 
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space.  Essentially, this
gives you the ability to place objects in the user's physical room.

WebTablets now are located in this feature and no longer jitter.
 2016-08-23 10:13:06 -07:00
Anthony J. Thibault
31ed378dbf Added dpi entity property for web-entities 2016-08-23 10:10:26 -07:00
howard-stearns
b8b345fb43 Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2 2016-08-19 13:04:39 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Ken Cooke
87d5ec2437 Bump protocol version. Audio packets are now exactly 10ms (240/480 samples). 2016-08-18 08:31:43 -07:00
Stephen Birarda
3355a90e7d Merge pull request #8413 from huffman/feat/atp-bandwidth 
Add asset server bandwidth to stats
 2016-08-16 15:54:11 -07:00
howard-stearns
2b75240771 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-16 11:14:36 -07:00
Ryan Huffman
b5e2913eb9 Move node received bandwidth tracking to LimitedNodeList 2016-08-15 09:23:02 -07:00
Clément Brisset
7c698b8cbb Merge pull request #8423 from Atlante45/steam 
Update Steam branch
 2016-08-12 10:40:53 -07:00
Atlante45
e4dd4c1a41 Merge branch 'master' of https://github.com/highfidelity/hifi into steam 2016-08-12 10:38:05 -07:00
howard-stearns
e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-11 15:40:26 -07:00
Ryan Huffman
473a7e9593 Fix bandwidth calculations not including the full size of reliable ordered messages 
For reliable ordered messages, we were:

 * only tracking bandwidth for the first few packets of a message
   IF a message handler opted in to receiving pending (unfinished)
   messages.
 * tracking the entire thing all at once, when the entire messages
   was received.
 2016-08-11 15:17:36 -07:00
Atlante45
c34153b67b Change Web API arg name to be more descriptif 2016-08-11 11:57:43 -07:00
David Kelly
5c15b52040 expose getPlaceName() as placename 
Nice for scripts to get the placename.  Nice for us, anyways.
 2016-08-10 14:54:29 -07:00
Zander Otavka
51fb52977e Generalize atp handling in network access managers 2016-08-09 11:46:08 -07:00
Atlante45
61d07cf952 Restore mateverse URL 2016-08-08 15:39:25 -07:00
Atlante45
51b45f8f73 Steam invite are facing the current position 2016-08-08 15:39:25 -07:00
Atlante45
aa2ae31aab CR UI fixes 2016-08-08 15:39:25 -07:00
Atlante45
0663766074 Replace metaverse server with testing URL 2016-08-08 15:39:25 -07:00
Atlante45
f0ff975248 UI wiring 2016-08-08 15:39:25 -07:00
Atlante45
205df0cf51 login UI first draft 2016-08-08 15:39:25 -07:00
Atlante45
cea0e182c0 Interface login through steam 2016-08-08 15:39:25 -07:00
Zander Otavka
cb153f2a29 Fix file header comments 2016-08-08 15:17:42 -07:00
Zander Otavka
aebd18db7f Add EOF newlines 2016-08-08 15:12:17 -07:00
Zander Otavka
246a8457e1 Add some asserts 2016-08-08 15:12:17 -07:00
Zander Otavka
43bbe790d6 Add atp support to qml 2016-08-08 15:12:17 -07:00
Stephen Birarda
4cdc98287b add canKick to USI, revert constants to production 2016-08-02 14:35:51 -07:00
Stephen Birarda
7e6dbf2d1a add a kick request packet and send from NL 2016-08-02 14:35:11 -07:00
Stephen Birarda
94b97e8119 expose kick perms from LNL and Node 2016-08-02 14:35:11 -07:00
Stephen Birarda
f04996a53d add the kick permission to domain server settings 2016-08-02 14:35:11 -07:00
Seth Alves
60d6673950 switch data-web urls to point at production server rather than dev one 2016-08-01 12:00:08 -07:00
Seth Alves
8e1820f911 make sure permissions have the correct ID in the case where a user has been verified 2016-07-29 13:10:14 -07:00
Seth Alves
cd2f61c90c if logging in, send username signature even when connecting to localhost 2016-07-27 14:03:51 -07:00
Seth Alves
bc2ded2f97 code review 2016-07-27 08:46:46 -07:00
Seth Alves
148793011d code review 2016-07-27 07:55:09 -07:00
Seth Alves
e3b4612283 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-25 13:19:13 -07:00
Brad Hefta-Gaub
c85d6800c3 reduce activity logging spam 2016-07-24 11:44:25 -07:00
Seth Alves
f35b935031 do some cleaning-up of the domain-server settings page group tables 2016-07-22 17:51:31 -07:00
Seth Alves
96fd1cb841 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-22 11:40:29 -07:00
Seth Alves
adba4cde0b book-keeping around groups and ranks 2016-07-22 11:40:23 -07:00
howard-stearns
b303c6df8e strong type checking my arse 2016-07-21 16:04:12 -07:00
Seth Alves
c1b27a9249 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-20 10:03:22 -07:00
Howard Stearns
0b5cdcef42 Merge pull request #8252 from howard-stearns/suggestions 
suggestions
 2016-07-19 15:46:23 -07:00
Chris Collins
0632f6df2d Merge pull request #8279 from birarda/master 
fix crash with multiple solo nodes in closeCurrentPacket
 2016-07-19 14:57:00 -07:00
Stephen Birarda
f28f3d7fcf force removal of an old solo node when added new one 2016-07-19 12:02:37 -07:00
Brad Hefta-Gaub
c484fec51d cleanup 2016-07-18 22:54:57 -07:00
Brad Hefta-Gaub
20824f038c include codec in audio stream packets so that each side can discard packets that don't match 2016-07-18 21:59:44 -07:00
howard-stearns
57955a2b56 Expose protocol version to qml, and use it in query. 2016-07-18 18:12:27 -07:00
howard-stearns
98555be987 Merge branch 'protocol3' of https://github.com/howard-stearns/hifi into suggestions 2016-07-18 18:11:05 -07:00
howard-stearns
abb63139f6 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-18 16:29:49 -07:00
howard-stearns
1a66574adb add protocol version signature to metaverse heartbeat 2016-07-18 14:29:49 -07:00
Seth Alves
180cc90197 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-18 10:54:01 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
Howard Stearns
d446e1bcf5 Phone home with suggestions activity usage. 2016-07-15 19:15:58 -07:00
Seth Alves
8e6b3ed8c2 rename variable to make its use more clear 2016-07-14 12:24:44 -07:00
Seth Alves
3e35b39e3b Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-14 09:38:02 -07:00
Stephen Birarda
30f55418db only prepare packet list packets if they need a message number 2016-07-13 15:06:31 -07:00
Stephen Birarda
cc9b72daa4 fix seeking in packet, use nodeActivated for ignore list send 2016-07-13 15:06:31 -07:00
Stephen Birarda
b68958317a re-send ignore requests when mixers are re-added 2016-07-13 15:06:31 -07:00
Stephen Birarda
07c1777485 push the packet version for NodeIgnoreRequest 2016-07-13 15:06:31 -07:00
Stephen Birarda
609900f246 move ignore set handling to NodeList 2016-07-13 15:06:31 -07:00
Stephen Birarda
6b6513d5f9 immediately fade out ignored avatars 2016-07-13 15:06:31 -07:00
Stephen Birarda
095bd7e6c8 cleanup logging, move packet parsing to mixers 2016-07-13 15:06:31 -07:00
Stephen Birarda
441b6d2813 fix recursive mutex lock, conditional, logging 2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6 add a scripting interface to ignore users 2016-07-13 15:06:31 -07:00
Stephen Birarda
a134ac72de add packet type and plumbing for node ignore 2016-07-13 15:06:31 -07:00
Seth Alves
f47b5120bc Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-13 14:48:28 -07:00
Seth Alves
0e86be8660 use dev metaverse 2016-07-13 14:48:23 -07:00
Brad Hefta-Gaub
f8910d475e Merge pull request #8225 from ZappoMan/codecPlugins 
Audio codec plugins
 2016-07-13 14:47:03 -07:00
Seth Alves
6cf16f7a25 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-13 13:07:02 -07:00
Andrew Meadows
0d58274028 Merge pull request #8231 from AlexanderOtavka/fix-orientation 
Fix orientation being reset to 0,0,0,1
 2016-07-13 08:44:13 -07:00
Zander Otavka
87ba1ffeca Fix orientation being reset to 0,0,0,1 2016-07-12 16:20:01 -07:00
Atlante45
7a7b64e87d Use domain ID in the stream 2016-07-12 11:43:46 -07:00
Atlante45
a7d631b7e1 Revert packet version change 2016-07-12 11:43:31 -07:00
Atlante45
1a91a8e20a Make DomainList a sourced packet 2016-07-12 11:39:16 -07:00
Clément Brisset
2f07f0d24f Revert "Revert "Fix crash in packet list"" 2016-07-12 11:39:16 -07:00
Brad Hefta-Gaub
743576134f fix warnings 2016-07-11 13:38:08 -07:00
Brad Hefta-Gaub
f3f72f3c93 Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-11 13:15:27 -07:00
Brad Hefta-Gaub
a71baf5601 handle codec prioritization, handle multiple codec choices 2016-07-08 21:18:03 -07:00
Clément Brisset
d933238bda Revert "Fix crash in packet list" 2016-07-08 18:15:14 -07:00
Atlante45
f0fcb94a6a Typos 2016-07-08 16:00:34 -07:00
Atlante45
b665f38c1f Don't process DomainList packets from 2 DS 
case 1037
 2016-07-08 15:16:41 -07:00
Atlante45
70cf25bd8b Add missing read locks to LimitedNodeList's hash 2016-07-08 15:15:58 -07:00
Seth Alves
03f8ce1c49 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-08 09:36:30 -07:00
Seth Alves
55d76abf48 back-out accidently changed api urls 2016-07-06 16:42:31 -07:00
Seth Alves
e6f456f494 each rank in a group has its own permissions 2016-07-06 16:39:08 -07:00
Brad Hefta-Gaub
9333c7dcca Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-06 13:26:19 -07:00
Andrew Meadows
92af849204 bump version for new shape types 2016-07-06 10:52:01 -07:00
Seth Alves
2a25f458fc fetch rank names from web api after getting a group's ID 2016-07-04 10:20:25 -07:00
Seth Alves
c7793845cb Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-03 09:57:17 -07:00
Stephen Birarda
e784d7c400 Merge pull request #8170 from huffman/fix/multiple-sessions 
Fix multiple sessions being created for some users
 2016-07-01 16:41:56 -07:00
Seth Alves
aae42e3802 updates to track zach's changes to api 2016-06-30 16:14:46 -07:00
Ryan Huffman
dd73f0c333 Remove unused header from AccountManager.h 2016-06-30 14:50:29 -07:00
Ryan Huffman
49da7d9a61 Remove sending of session id in request body in favor of header 2016-06-30 14:43:27 -07:00
Ryan Huffman
38776fe007 Fix multiple sessions being created for some users 
If a user didn't have send-data activated they don't have their session id
sent in the header of requests, but instead send it inside the request
body. The session id being send in the request included curly braces which
the server considers invalid.
 2016-06-30 14:35:27 -07:00
Sam Gondelman
aaa33bab98 Merge pull request #8080 from birarda/api-recheck-on-fail 
simplify domain connection refusal dialog checking
 2016-06-30 11:07:43 -07:00
Seth Alves
408a77dd13 merge from upstream 2016-06-29 18:49:33 -07:00
Stephen Birarda
18a1f74c37 remove unused boolean for signalling protocol mismatch 2016-06-28 10:32:43 -07:00
Seth Alves
d4cc4bf1e4 represent node permissions as a bitfield rather than a list of bools 2016-06-27 14:55:13 -07:00
Seth Alves
c7d56493b1 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-06-27 10:07:38 -07:00
Seth Alves
ead6e476a9 add a list of blacklist groups which remove permissions rather than grant them 2016-06-24 14:03:43 -07:00
Brad Hefta-Gaub
4bc6a3fb3b Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-06-24 12:54:55 -07:00
Brad Hefta-Gaub
4510bb1674 Merge pull request #8098 from zzmp/feat/temp-domain-heartbeats 
add heartbeats to metaverse for temporary domains
 2016-06-24 12:08:37 -07:00
Seth Alves
cc1b6f0cb2 add a permissions-grid row for friends-of-domain-owner 2016-06-24 11:42:56 -07:00
Brad Hefta-Gaub
d7bffc3eab first cut at negotiating codecs 2016-06-23 17:14:41 -07:00
Seth Alves
c4b0f1899e merge from upstream 2016-06-23 13:26:01 -07:00
Brad Hefta-Gaub
da74114b32 Merge pull request #8070 from AndrewMeadows/triangle-soup-4 
support btBvhTriangleMeshShape for static mesh entities
 2016-06-23 12:17:32 -07:00
Stephen Birarda
f9b3165350 use a QSet instead of a QStringList 2016-06-23 09:37:17 -07:00
Stephen Birarda
7307bc6a1b revert to domain connection refusal check with string 2016-06-23 09:27:17 -07:00
Andrew Meadows
e5b89ebd17 bump version number 2016-06-22 15:33:44 -07:00
Zach Pomerantz
eebf8e91c6 add api_key to domains/public_key updates 2016-06-22 12:02:35 -07:00
Zach Pomerantz
3a36b0a2e5 add temporary domain info to account info 2016-06-22 12:02:35 -07:00
Ryan Huffman
847685d224 Add tracking of away.js 2016-06-22 09:06:59 -07:00
Ryan Huffman
890de1bfea Add went-to user activity back in 2016-06-22 08:54:58 -07:00
Ryan Huffman
4e52521f8c Update UserActivityLogger device blacklist 2016-06-21 16:43:16 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
Ryan Huffman
6c2c7f1eec Fix connected_device user activity event 2016-06-21 13:28:40 -07:00
Seth Alves
b1ad743721 apply a group's permissions to users who belong to the group 2016-06-20 14:06:45 -07:00
Seth Alves
764da926a3 merge sethalves:make-permissions-names-case-insensitive 2016-06-17 19:22:22 -07:00
Seth Alves
d8a67850f2 treat usernames in permissions-grid on domain-server settings page as case-insensitive 2016-06-17 15:17:51 -07:00
Seth Alves
de100e8141 after receiving a group's ID from api, save it 2016-06-17 13:29:42 -07:00
Seth Alves
c80ca825b8 start on handling group permissions 2016-06-16 16:43:08 -07:00
Ryan Huffman
c2ebcd1f77 Make activity logging from scripts only available for certain events 2016-06-16 13:49:25 -07:00
Ryan Huffman
3650377745 Clean up NULL => nullptr 2016-06-16 13:17:31 -07:00
Ryan Huffman
8b3b62aad7 Add UserActivityLogger scripting interface 2016-06-16 10:25:38 -07:00
Ryan Huffman
ed88232fb0 Move session id storage to AccountManager 2016-06-16 09:19:42 -07:00
Stephen Birarda
59912012c6 clear domain connection refusals on hard reset, not soft 2016-06-15 09:48:53 -07:00
Chris Collins
55330f2205 Merge pull request #8057 from jherico/settings 
Fixing issues with unclosed groups in settings persistence
 2016-06-14 14:34:14 -07:00
Stephen Birarda
2163f9b5f3 signal once for domain protocol mismatch, case 918 2016-06-14 10:43:45 -07:00
Bradley Austin Davis
34c8d257d2 Fixing issues with unclosed groups in settings persistence 2016-06-14 09:49:38 -07:00
Seth Alves
924c949af5 permissions for the local node were being updated without the various *changed* signals being called. this was keeping the asset-server menu item from being correct, among other things 2016-06-11 15:16:45 -07:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -07:00
Stephen Birarda
e4ebafa0d8 add a menu option to force the wrong DS connect version 2016-06-09 15:53:19 -07:00
Stephen Birarda
12e5851ba4 fix connection denial message, put version back 2016-06-09 15:53:19 -07:00
Stephen Birarda
f963adb5dd send connection denial for connect version mismatch 2016-06-09 15:53:19 -07:00
Stephen Birarda
4b5a554122 remove check in version downgrading from NodeList 2016-06-09 15:53:19 -07:00
Stephen Birarda
c5a4a72a84 trigger domain API refresh from DomainHandler 2016-06-09 15:53:19 -07:00
Stephen Birarda
e39c708bf6 require two triggers for API refresh, fix check for ICE domain 2016-06-09 15:53:19 -07:00
Stephen Birarda
f59335ceff don't thrash API re-check when connection denied 2016-06-09 15:53:19 -07:00
Stephen Birarda
8318e9ccc8 Revert "additional revert related change" 
This reverts commit 3119b654dc.
 2016-06-09 15:53:19 -07:00
Stephen Birarda
1e9e264124 Revert "Revert "refresh API info during re-connect - case 570"" 
This reverts commit b8c80e2222.
 2016-06-09 15:53:19 -07:00
Seth Alves
b2f63a2132 hook up can-rez-tmp and can-write-to-asset-server 2016-06-07 16:17:58 -07:00
Seth Alves
0c18df6278 don't restart domain-server if the only settings changes where permissions 2016-06-06 16:32:18 -07:00
Seth Alves
be403865fc don't request public keys for the standard psuedo-account-names 2016-06-04 10:44:59 -07:00
Seth Alves
80eeff5a64 bump packet versions. change how domainObject[RESTRICTED_ACCESS_FLAG] is decided 2016-06-04 10:32:07 -07:00
Seth Alves
adf893ea19 rename AgentPermissions to NodePermissions 2016-06-04 09:50:36 -07:00
Seth Alves
09b0e3eaaf use constants rather than bare strings for standard psuedo-account-names 2016-06-04 09:07:34 -07:00
Seth Alves
b88bba8672 add code to convert older domain-settings to current style 2016-06-03 13:15:53 -07:00
Seth Alves
d010dc9699 keep localhost line from being added every save. added some debugging print stuff 2016-06-02 15:08:16 -07:00
Seth Alves
83f2c723eb collect permissions into their own data structure 2016-06-02 13:15:30 -07:00
Brad Hefta-Gaub
3119b654dc additional revert related change 2016-05-31 20:50:12 -07:00
Brad Hefta-Gaub
b8c80e2222 Revert "refresh API info during re-connect - case 570" 
This reverts commit e8d7f9614a.
 2016-05-31 20:39:16 -07:00
Brad Hefta-Gaub
0ec7eae58c fix shapes to property polymorph and persist 2016-05-27 16:59:42 -07:00
Stephen Birarda
1ec421350d send the UUID session ID without curly braces 2016-05-26 14:56:51 -07:00
Brad Hefta-Gaub
78b6a6c661 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
 2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub
f2acc82899 Merge pull request #7971 from birarda/session-id-with-place-request 
optionally include the metaverse session ID as HTTP header when sending usage data
 2016-05-25 17:14:27 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision 
Improved Avatar Mixer Rotation Precision
 2016-05-25 17:14:12 -07:00
Stephen Birarda
66bdbf910d optionally include the metaverse session ID as an http header 2016-05-25 11:55:04 -07:00
Stephen Birarda
3137cd64e1 clear AddressManager previous lookup on 404 2016-05-25 11:40:17 -07:00
Brad Hefta-Gaub
ff45633c21 bump entities version/CR feedback 2016-05-24 17:36:52 -07:00
Brad Hefta-Gaub
5668db9e4a cleanup and dead code removal 2016-05-24 15:43:30 -07:00
Brad Hefta-Gaub
3b0081fbbb cleanup and dead code removal 2016-05-24 15:42:55 -07:00
Brad Hefta-Gaub
0553ff5f9f cleanup and dead code removal 2016-05-24 15:41:11 -07:00
Brad Hefta-Gaub
2eef07e414 cleanup and dead code removal 2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280 check point with protocol refusal working 2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1cf8236860 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624 first cut at support for verifying all protocol version compatibility 2016-05-24 13:31:19 -07:00
Brad Hefta-Gaub
bfb3f2cdfe Merge pull request #7955 from sethalves/quiet-compiler 
quiet gcc 5 warnings
 2016-05-23 19:44:21 -07:00
Clément Brisset
a8b359dd60 Merge pull request #7943 from birarda/api-recheck-on-fail 
refresh connection info for place/domain while not connected
 2016-05-23 10:57:58 -07:00
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Seth Alves
f91a2403be merge from upstream 2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
e012630db2 Merge pull request #7860 from birarda/place-referrer 
send lookup hostname to DS for split counts, correct number of DS connected users
 2016-05-20 17:00:46 -07:00
Brad Hefta-Gaub
18613908df Merge pull request #7800 from sethalves/no-fly-zones 
No fly zones
 2016-05-20 16:59:55 -07:00
Stephen Birarda
33379824c8 clear place name if switching to a domain ID string 2016-05-20 11:25:26 -07:00
Stephen Birarda
5ab876114f send hostname to DS with every DS packet to handle changes 2016-05-20 11:24:54 -07:00
Stephen Birarda
7110fe98eb associate incoming place name with DomainServerNodeData 2016-05-20 11:24:54 -07:00
Stephen Birarda
51c16739f2 provide a getter for the place name in AddressManager 2016-05-20 11:24:54 -07:00
Stephen Birarda
e8d7f9614a refresh API info during re-connect - case 570 2016-05-19 17:59:42 -07:00
Seth Alves
1de9598243 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 16:37:40 -07:00
Seth Alves
74520f5c92 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 09:49:18 -07:00
Ryan Huffman
64c89a5dde Fix AccountManager not compiling on Windows 2016-05-18 15:38:54 -07:00
Ryan Huffman
e622c17f6b Pull default UserAgentGetter out of func signature 2016-05-18 15:38:54 -07:00
Ryan Huffman
bfb4bb0896 Add userAgentGetter to AccountManager for custom UserAgent 2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Brad Hefta-Gaub
67891abf17 Merge pull request #7877 from Atlante45/fix/asset-client 
Fix Asset Client crash
 2016-05-18 11:37:34 -07:00
Anthony J. Thibault
b82356a249 AvatarMixer: Clients will show incompatible version dialog 
For this to work, the server needs to send an empty AvatarIdentity packet back to the sender
when it receives a packet mismatch error.  This AvatarIdentity packet will be different then
what the client expects and will trigger the incompatible version dialog.

Previously, the avatar-mixer was just silently dropping incoming mismatched version packets.
Causing the client to never get a response, and thus never showing the incompatible version dialog.
 2016-05-17 15:02:04 -07:00
Ryan Huffman
cf6eba96a4 Remove unused variable 2016-05-17 11:17:34 -07:00
Ryan Huffman
2dbea37690 Fix address manager sometimes double adding address history 2016-05-17 11:17:34 -07:00
Ryan Huffman
d47c74408e Cleanup handleViewpoint 2016-05-17 11:17:34 -07:00
Ryan Huffman
0ec9d9e277 Remove goToAddressFromObject from slots 2016-05-17 11:17:34 -07:00
Ryan Huffman
f213a059fb Fix AddressManager not always storing history when it should 2016-05-17 11:17:34 -07:00
Ryan Huffman
fde1f0740c Fix goBackPossible not being triggered correctly in AddressManager 2016-05-17 11:17:34 -07:00
Anthony J. Thibault
55b0060df9 Convert JointData from relative frame to absolute. 2016-05-16 17:48:52 -07:00
Atlante45
419ff3bbea Track request lifetime in lambda callbacks 2016-05-14 14:50:02 -07:00
Seth Alves
c9c619916c Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-11 19:37:57 -07:00
Seth Alves
fcd2e45d67 merge from upstream 2016-05-11 18:45:32 -07:00
Brad Hefta-Gaub
e01681eb52 Merge pull request #7856 from ZappoMan/NUEtweaks 
don't show help or login on first run
 2016-05-11 10:53:09 -07:00
Brad Hefta-Gaub
62b3c12d0f fix comment 2016-05-10 15:53:10 -07:00
Brad Hefta-Gaub
a17acc6f6b rename functions 2016-05-10 15:52:07 -07:00
Brad Hefta-Gaub
0eb2388f69 fix unix build buster 2016-05-10 15:00:50 -07:00
Seth Alves
f90b9ec65d Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub
7958020f4e only expect the 5 essential servers 2016-05-10 12:07:21 -07:00
Brad Hefta-Gaub
22f4beab1a on first run, go to home or entry 2016-05-10 10:45:57 -07:00
Seth Alves
4c1f815870 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-10 10:09:40 -07:00