Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 18:38:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49797 commits 25 branches 0 tags 1.1 GiB
Commit graph

3029 commits

Author SHA1 Message Date
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
Zach Pomerantz
09d879e19f Remove delayLoad 2016-05-09 18:09:48 -07:00
Zach Pomerantz
9ac783a88d Black box asynch resource retrieval 2016-05-09 18:03:19 -07:00
Brad Hefta-Gaub
22081a8606 Merge pull request #7833 from zzmp/fix/scriptable-resource 
Fix prefetching
 2016-05-09 15:09:20 -07:00
Brad Hefta-Gaub
312ea20e15 Merge pull request #7797 from zzmp/fix/cache-thread-safety 
Make ResourceCache::resetResourceCounters threadsafe
 2016-05-09 11:52:57 -07:00
Seth Alves
46c1049a35 bump protocol version 2016-05-07 17:48:06 -07:00
Zach Pomerantz
3f4f10a27e Fix prefetch state changes 2016-05-06 15:08:45 -07:00
Stephen Birarda
6f6221840e put back the correct metaverse API url in NetworkingConstants 2016-05-06 13:26:23 -07:00
Stephen Birarda
ed1ddc2a8b remove code to update/store wallet balance 2016-05-06 11:54:49 -07:00
Stephen Birarda
a5d09e268d fix sessionID pull and re-sent for HB 2016-05-05 15:56:16 -07:00
Stephen Birarda
839c7fb8c2 provide session ID for metaverse heartbeat once received 2016-05-05 15:45:11 -07:00
Stephen Birarda
0ea46cb415 send fallback socket, don't send HB if send usage disabled 2016-05-05 15:35:37 -07:00
Zach Pomerantz
79c8001d7a Audit thread safety of ResourceCache 2016-05-05 11:17:38 -07:00
Stephen Birarda
8a3336ae95 use the networking logging category 2016-05-04 16:31:12 -07:00
Stephen Birarda
effa2fc235 typo fix for comment 2016-05-04 16:28:26 -07:00
Stephen Birarda
7192ad301f add debug for socket errors and state changes 2016-05-04 16:23:40 -07:00
Brad Hefta-Gaub
49d02b802a Merge pull request #7719 from zzmp/feat/resource-prefetch 
Add prefetching to exposed caches
 2016-05-02 18:04:26 -07:00
Seth Alves
0fe4e42511 added zone properties to allow flying/ghosting or not 2016-05-01 13:53:44 -07:00
Ryan Huffman
5dadfa9e7e Merge pull request #7792 from Atlante45/fix/crash-asset-request 
Fix dangling reference into container
 2016-04-29 17:58:11 -07:00
Atlante45
6d9080162c Make slots private method 2016-04-29 17:39:53 -07:00
Stephen Birarda
09981db834 use a setting handle for UAL disabled to fix startup race 2016-04-28 18:05:06 -07:00
Atlante45
9a7bebaaa2 Fix dangling reference into container 2016-04-28 18:04:04 -07:00
Stephen Birarda
6883891748 don't require authentication to send user activity 2016-04-28 17:08:40 -07:00
Zach Pomerantz
854c0ea3e3 Clean out updateMemoryCost 2016-04-27 19:20:43 -07:00
Zach Pomerantz
1e8d45aecb Put ScriptableResource state enum in prototype 2016-04-27 19:20:43 -07:00
Zach Pomerantz
0c78d5bdd1 Change ScriptableResource signal to state 2016-04-27 19:20:42 -07:00
Zach Pomerantz
bc8a171fde Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch 2016-04-27 11:55:24 -07:00
Zach Pomerantz
6b53c1e85d Avoid leaking ScriptableResource 2016-04-27 11:55:02 -07:00
Brad Hefta-Gaub
04dab65b59 Merge pull request #7727 from ZappoMan/supportLargeClockSkew 
support for larger than 35 minute clock skew
 2016-04-23 08:42:38 -07:00
Brad Hefta-Gaub
c410242fb2 Merge pull request #7688 from jherico/texture_derez 
Reducing GPU texture memory footprint
 2016-04-22 13:20:54 -07:00
Brad Hefta-Gaub
f0659a985c Merge pull request #7726 from Atlante45/fix/pmtu-disc-fail 
Fix for path MTU discovery fail
 2016-04-22 12:24:44 -07:00
Seth Alves
4561962db1 Merge pull request #7736 from huffman/fix/asset-request-crash 
Fix AssetClient not properly cleaning up canceled requests
 2016-04-22 11:45:26 -07:00
Ryan Huffman
1416e397e4 Merge branch 'playEntityCollisionSound-crash' of github.com:sethalves/hifi into fix/asset-request-crash 2016-04-22 10:02:00 -07:00
Stephen Birarda
5ea8b83745 use noquote so URLs are not quoted 2016-04-21 17:16:21 -07:00
Zach Pomerantz
069065dc23 Fix recursive invokes of ResourceCache::prefetch 2016-04-21 17:15:11 -07:00
Stephen Birarda
19702a9cd4 cleanup check for resource retry 2016-04-21 17:14:07 -07:00
Stephen Birarda
8cd330f431 add back on fail when server unavailable 2016-04-21 17:07:29 -07:00
Stephen Birarda
3a8c2144bf move asset retry debug to print before retry 2016-04-21 16:55:49 -07:00
Ryan Huffman
9e46b43489 Add threading related asserts to AssetClient 2016-04-21 16:39:57 -07:00
Ryan Huffman
da5bbe51d1 Fix AssetClient not properly disconnecting from callbacks 2016-04-21 16:37:21 -07:00
Brad Hefta-Gaub
72c81e2378 Merge branch 'master' of https://github.com/highfidelity/hifi into supportLargeClockSkew 2016-04-21 16:26:44 -07:00
Brad Hefta-Gaub
2abcc454b0 CR feedback 2016-04-21 15:48:18 -07:00
Seth Alves
b088191966 Merge pull request #7731 from huffman/fix/asset-request-crash 
Fix AssetRequest crash where signal was not disconnected
 2016-04-21 15:22:08 -07:00
Brad Davis
e9959df2df Decoupling resourcecache from nodelist 2016-04-21 14:46:09 -07:00
Ryan Huffman
63d98b1b5c Fix AssetRequest crash where signal was not disconnected 2016-04-21 12:12:04 -07:00
Zach Pomerantz
2fd88d9fe1 Add sanity check to ResourceCache::updateTotalSize 2016-04-21 10:45:51 -07:00
Zach Pomerantz
cba5bff89e Make ResourceCache::prefetch private and comment 2016-04-21 10:33:35 -07:00
Brad Hefta-Gaub
f9c4959578 remove some debugging, tweak formatting 2016-04-21 09:53:00 -07:00
Brad Hefta-Gaub
ddf5b0f316 some debugging 2016-04-21 10:32:22 -07:00
Atlante45
778c19d7e4 Make sure the socket allows fragmenting 2016-04-21 08:38:08 -07:00
Zach Pomerantz
92e372f385 Expose Resource progress as a signal 2016-04-20 20:18:22 -07:00
Zach Pomerantz
1a0a623d5f Report ScriptableResource memory cost to engine 2016-04-20 20:18:22 -07:00
Zach Pomerantz
5ec82fa43d Add release invokable to ScriptableResource 2016-04-20 20:18:22 -07:00
Zach Pomerantz
825431829d Add url property to ScriptableResource 2016-04-20 20:18:22 -07:00
Zach Pomerantz
df4857947b Add prefetch overload for texture specificity 2016-04-20 20:18:22 -07:00
Zach Pomerantz
8ad8b5d0d9 Return ScriptableResource from prefetch 2016-04-20 20:14:15 -07:00
Zach Pomerantz
74e1f817a5 Add prefetch to all resource caches 2016-04-20 20:14:15 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
Atlante45
492bc75d68 Reduce max packet size to 1492 2016-04-20 15:58:01 -07:00
Zach Pomerantz
2cc48a6ca6 Add url to resource retry debug 2016-04-20 12:20:05 -07:00
Ryan Huffman
92339bf5fc Merge pull request #7701 from birarda/udt-fixes 
use nextPacketTimestamp to catch up, not stay ahead
 2016-04-19 12:57:43 -07:00
Brad Hefta-Gaub
523d365ce7 Merge pull request #7680 from Atlante45/fix/clear-atp-cache 
Don't use invalidated iterators
 2016-04-19 07:24:07 -07:00
Seth Alves
70ddd8529b Merge pull request #7684 from zzmp/fix/runaway-loading-resources 
Fix ResourceCacheSharedItems::_loadingRequests removals
 2016-04-18 15:46:45 -07:00
Stephen Birarda
9cce964013 use nextPacketTimestamp only to catch up, not stay ahead 2016-04-18 14:19:36 -07:00
Atlante45
c9fa91936a Cleanup disk cache io device 2016-04-18 14:10:51 -07:00
Zach Pomerantz
0d06d8ea93 Clear freed loading resources 2016-04-15 17:34:45 -07:00
Zach Pomerantz
d2426f30c6 Mv ResourceCacheShared to top of impl 2016-04-15 16:40:07 -07:00
Atlante45
dfc3e5d488 Don't use invalidated iterators 2016-04-15 13:57:48 -07:00
Zach Pomerantz
cff5886313 Use correct resources lock 2016-04-15 10:46:19 -07:00
Zach Pomerantz
fc9de4b7e6 Merge branch 'master' of github.com:highfidelity/hifi into fix/cache-tallies 2016-04-15 00:37:03 -07:00
Atlante45
b3b2f98f6c Merge branch 'master' of https://github.com/highfidelity/hifi into fix/clear-atp-cache 2016-04-14 17:59:36 -07:00
Zach Pomerantz
f803ecd2e7 Merge pull request #7633 from Atlante45/fix/shared-resource 
Fix raw pointers in shared resource cache items
 2016-04-14 17:52:04 -07:00
Atlante45
4ed8573f74 CR 2016-04-14 17:28:24 -07:00
Zach Pomerantz
32e9c49cf0 Fix cache tallies for uncached resources 2016-04-14 17:00:20 -07:00
Seth Alves
f114888c1c Merge pull request #7665 from birarda/ice-server-redundancy 
allow domain-server to cycle through ice-servers when failing
 2016-04-14 14:36:29 -07:00
Stephen Birarda
bc0b3b38b3 remove narrowing conversion for ICE_SERVER_DEFAULT_PORT 2016-04-14 12:25:47 -07:00
Zach Pomerantz
e20acb1d42 Track resources as they fall out of cache 2016-04-13 15:44:14 -07:00
Stephen Birarda
8832a9d9ed add ICEServerHeartbeatACK packet type 2016-04-12 17:59:07 -07:00
Atlante45
0f62d5c997 clear ATP assets on domain change 2016-04-12 15:30:53 -07:00
Atlante45
7c652aa3ca Add lock on ResourceCache data structs 2016-04-12 15:30:39 -07:00
Atlante45
364f935b89 Allow cleanup of the old request 2016-04-12 13:51:11 -07:00
Atlante45
05895f628a Revert to using a Resource 2016-04-12 13:51:11 -07:00
Atlante45
5cc90ce8f0 Make sure resource req are cleaned up with there parents 2016-04-12 13:51:11 -07:00
Atlante45
e45939d18f Make sure ResourceCacheSharedItems deals with strong refs 2016-04-12 13:51:11 -07:00
Atlante45
afdfef1482 Make sure we don't use raw resource ptr 2016-04-12 13:51:11 -07:00
Chris Collins
0faab41057 Merge pull request #7624 from birarda/new-home-set 
allow ATP scripts to be used by scripted Agent
 2016-04-12 09:42:14 -07:00
Stephen Birarda
1df0dce971 use ResourceRequest in Agent to handle ATP scripts 2016-04-08 14:38:26 -07:00
Zach Pomerantz
e08c9db469 Expose GL property to QML 2016-04-07 18:27:07 -07:00
Clément Brisset
680ab1e38b Merge pull request #7578 from zzmp/fix/delete-resource-later 
Delete resource the Qt way
 2016-04-06 17:17:47 -07:00
Zach Pomerantz
4300f2e415 Delete resource the Qt way 2016-04-06 14:43:48 -07:00
Brad Hefta-Gaub
891cc12d3f Merge pull request #7549 from zzmp/feat/resource-vis 
Add a visualization of cacheable resource usage
 2016-04-05 15:43:27 -07:00
Zach Pomerantz
107cfcf10b Change Resource setBytes->setSize 2016-04-04 13:59:57 -07:00
Zach Pomerantz
f34e951c3f Make resource cache props thread-safe 2016-04-04 13:59:56 -07:00
Zach Pomerantz
aa0245b9c2 Debug when limit of checkins reached 2016-04-04 12:22:03 -07:00
Zach Pomerantz
3c86191a59 Add resources prop to caches 2016-04-02 17:37:51 -07:00
Zach Pomerantz
b70a4d043b Expose resource cache count props 2016-04-01 19:52:42 -07:00
Seth Alves
6025a66fa1 Merge pull request #7532 from Atlante45/feat/delayed-decrease 
Delay congestion epochs first decrease
 2016-04-01 18:07:43 -07:00
Zach Pomerantz
3b45a57e1d Remove resource completely when uncached 2016-04-01 17:42:36 -07:00
Zach Pomerantz
d72c695417 Sanitize ResourceCache to expose to JS/QML 
fix sanitize
 2016-04-01 17:42:36 -07:00
Brad Hefta-Gaub
a3734eba00 Merge pull request #7535 from birarda/suppress-more 
add suppression for ring buffer and sequence number messages
 2016-04-01 13:04:32 -07:00
Ryan Huffman
0948c8cefb Fix format of long lines 2016-04-01 10:11:32 -07:00
Ryan Huffman
8e375fd076 Fix asset resource request not properly cleaning up 2016-04-01 10:08:44 -07:00
Stephen Birarda
fc8707dc05 add suppression for unreasonable sequence number messages 2016-03-31 18:04:13 -07:00
Zach Pomerantz
809b489146 Don't cache 0-sized Resources 2016-03-31 17:15:20 -07:00
Zach Pomerantz
b80f0fc8a6 Add actual byte size to Resource 2016-03-31 17:02:40 -07:00
Zach Pomerantz
9d3abe5513 Release texs when models are cached 2016-03-31 17:02:40 -07:00
Atlante45
31942d9a73 Code cleanup 2016-03-31 16:09:54 -07:00
Atlante45
86b425143b Use Mbps for max bandwith 2016-03-31 11:03:06 -07:00
Atlante45
c95bc1c563 Don't set _loss on delayed decrease 2016-03-30 15:58:31 -07:00
Atlante45
2e3040715b Delay congestion epoch's first decrease 2016-03-30 14:59:46 -07:00
Ryan Huffman
96a35a8f43 Fix bug where a pending asset request could receive a pending message after deletion 2016-03-29 11:33:02 -07:00
Clément Brisset
b6ce7a7db8 Merge pull request #7492 from birarda/next-packet-delta 
fix for incorrect next packet delta in udt::SendQueue
 2016-03-28 14:12:04 -07:00
Clément Brisset
19ccee5d3c Merge pull request #7490 from birarda/udt-fixes 
cleanup unused public keys in ice-server
 2016-03-28 13:48:45 -07:00
Stephen Birarda
1df7cf5c8d Merge pull request #7484 from Atlante45/fix/atp-req-limit 
Fix segfault with gxx
 2016-03-28 13:31:12 -07:00
Atlante45
659d7e7335 Fix segfault with gxx 2016-03-28 13:17:07 -07:00
Atlante45
103c6d89f2 Add Socket include to see debug macro 2016-03-28 13:11:44 -07:00
Stephen Birarda
c0b92486f9 fix incorrect next packet delta 2016-03-28 11:09:32 -07:00
Stephen Birarda
3e4b4a0fc7 cleanup un-used public keys in ice-server 2016-03-28 10:03:05 -07:00
Brad Hefta-Gaub
9a66d779ae Merge pull request #7463 from zzmp/guard/bugsplat-2177 
Guard against lack of GL support to avoid crash
 2016-03-25 16:31:14 -07:00
Zach Pomerantz
b252139704 LMK when running with old GL version 2016-03-25 14:42:58 -07:00
Ryan Huffman
306425b940 Merge pull request #7475 from birarda/udt-fixes 
guard long sleeps in udt::SendQueue
 2016-03-25 13:56:45 -07:00
Stephen Birarda
d9abc79b5d return for AccountManager sendRequest if threads do not match 2016-03-25 13:37:13 -07:00
Stephen Birarda
044fb983d7 cast chrono durations to qint64 2016-03-25 13:07:54 -07:00
Stephen Birarda
ce4d56fb90 add warning for long sendqueue sleeps 2016-03-25 13:06:21 -07:00
Stephen Birarda
74e041e9aa cast chrono durations to int explicitly 2016-03-25 11:41:41 -07:00
Stephen Birarda
d8859def37 fix for AccountManagerAuth::Type register, consts 2016-03-25 10:47:06 -07:00
Stephen Birarda
0043a84234 guard the SendQueue sleep and send a user activity when weird 2016-03-25 10:22:14 -07:00
Zach Pomerantz
aad40f5de0 Drop network data after processing 2016-03-25 09:58:34 -07:00
Brad Hefta-Gaub
cd5beabf10 Revert "Drop resource data after load" 2016-03-24 20:37:16 -07:00
Zach Pomerantz
afc853572a Drop resource data after load 2016-03-24 15:50:51 -07:00
Clément Brisset
caf2595e13 Merge pull request #7452 from birarda/udt-fixes 
fix unecessary re-sends at capacity on udt, race in SendQueue timeout check
 2016-03-24 11:00:57 -07:00
Philip Rosedale
f8f0e48af9 Merge pull request #7453 from Atlante45/fix/atp-req-limit 
Make ATP respect request limit
 2016-03-24 09:20:30 -07:00
Andrew Meadows
21c770f37b Merge pull request #7441 from zzmp/clean/resource-reinsert 
Restrict Resource reinsertion
 2016-03-24 08:41:12 -07:00
Brad Hefta-Gaub
2b0670718f Merge pull request #7449 from howard-stearns/report-previous-session-data 
Report previous session data
 2016-03-23 20:58:51 -07:00
Atlante45
69c516caaf Have ATP respect request limit 2016-03-23 19:09:28 -07:00
Stephen Birarda
ef3f5e0221 fix for race in last receiver response 2016-03-23 18:23:30 -07:00
Stephen Birarda
1b322c8d01 don't oversend because of packet pairs 2016-03-23 18:07:28 -07:00
Stephen Birarda
57da7c2ba7 add handling for short circuit loss in SendQueue 2016-03-23 17:29:46 -07:00
howard-stearns
c435ca212a Report previous session time. 2016-03-23 16:59:17 -07:00
howard-stearns
550738776c Pass whether or not previous session crashed to the UserActivityLogger. 2016-03-23 15:56:29 -07:00
Zach Pomerantz
8b1a78bac0 Restrict Resource reinsertion 2016-03-23 13:00:29 -07:00
Zach Pomerantz
17aa2845a8 Add finished signal to Resource loading 2016-03-23 13:00:02 -07:00
Brad Hefta-Gaub
8c290ea6b9 Merge pull request #7390 from Atlante45/feat/udp-flood-protection 
Server side bandwidth dial
 2016-03-23 11:47:41 -07:00
Stephen Birarda
20c923db32 remove leaking unused method from NLPacketList 2016-03-21 17:26:49 -07:00
Brad Hefta-Gaub
a6bf84b90e Merge pull request #7399 from zzmp/fix/qml-thread 
Move QML rendering to a defined thread
 2016-03-21 15:31:42 -07:00
Atlante45
170433997c Set Asset server max bandwidth wiring 2016-03-21 14:50:18 -07:00
Atlante45
c48be75a37 Make sure everyone calls sendPeriod's setter 2016-03-21 14:50:18 -07:00
Stephen Birarda
884df5739d remove comment that indicates that onTimeout is not used 2016-03-21 14:28:55 -07:00
Stephen Birarda
0956649cdb give CongestionControl timeout event from SendQueue 2016-03-21 14:28:55 -07:00
Stephen Birarda
8e97a50957 unlock before de-activating the queue 2016-03-21 14:28:55 -07:00
Stephen Birarda
c65ab5f1ad re-check the timeout guards before acting on timeout 2016-03-21 14:28:55 -07:00
Stephen Birarda
24fd39dfa3 make sure NAKs is empty before append from timeout 2016-03-21 14:28:26 -07:00
Stephen Birarda
4fe9ad94f5 notify on the emptyCondition if an ACK is received 2016-03-21 14:28:26 -07:00
Stephen Birarda
74ae18e514 replace append with insert to work around assert 2016-03-21 14:28:26 -07:00
Stephen Birarda
b059e98ff5 fix units for timeout check on expiry 2016-03-21 14:28:26 -07:00
Stephen Birarda
b7ff94e20d put packets back in the queue if flow window is full 2016-03-21 14:28:26 -07:00
Stephen Birarda
4c5ad8a03e remove first congestion event drops 2016-03-21 14:28:26 -07:00
Stephen Birarda
08dff9c7ac handle expiry check even if a packet was sent 2016-03-21 14:28:26 -07:00
Stephen Birarda
cbcc6e3ef2 fix for last decrease sequence number 2016-03-21 14:28:26 -07:00
Stephen Birarda
93a00c3d5d don't perform a decrease during single packet loss events 2016-03-21 14:28:26 -07:00
Stephen Birarda
13a906aa20 Merge pull request #7412 from huffman/fix-handshake-packet 
Fix handshake packet being used across SendQueues
 2016-03-21 14:28:07 -07:00
Stephen Birarda
eb5ecc84ff Merge pull request #7398 from huffman/add-request-handshake 
Add HandshakeRequest packet
 2016-03-21 14:27:28 -07:00
Ryan Huffman
c515355cff Fix handshakeRequestPacket not being thread safe 2016-03-21 14:07:15 -07:00
Ryan Huffman
afb1d68f3b Fix handshake packet being used across SendQueues 2016-03-21 13:24:04 -07:00
Andrew Meadows
f58a00f75a Merge pull request #7409 from huffman/fix-handle-reply-finished 
Fix edge-case where resource can receive a signal after request deleted
 2016-03-21 13:10:24 -07:00
Ryan Huffman
4f32749c17 Fix edge-case where resource can receive a signal after request deleted 2016-03-21 11:54:41 -07:00
Zach Pomerantz
d3d0f229aa Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-thread 2016-03-21 11:25:14 -07:00
Ryan Huffman
b7678f9818 Remove accidental addition of whitespace 2016-03-18 16:33:00 -07:00