Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-27 03:46:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87340 commits 23 branches 0 tags 1.2 GiB
Commit graph

4994 commits

Author SHA1 Message Date
Simon Walton
0804ffe5eb Merge branch 'master' into stun-on-iface-change 
including PR15765, don't rebind.
 2019-06-14 09:32:06 -07:00
howard-stearns
b69d850c8e move constant to the comment that will use it 2019-06-13 19:41:12 -07:00
Roxanne Skelly
3d2b1dbf2b When missing domain checkins, drop packets not destined for DS 2019-06-13 17:25:35 -07:00
Howard Stearns
8f9fa4a878 stop rebinding 2019-06-13 14:59:27 -07:00
Howard Stearns
0c1df749b9
Merge pull request #15746 from roxanneskelly/bugz516 
BUGZ-628 - Add quasi-MTBF logging to track disconnects
 2019-06-12 15:48:45 -07:00
Roxanne Skelly
790d4edb04 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-12 15:25:08 -07:00
Roxanne Skelly
7017cf8437 reinitialize winsock on silent domain checkin 2019-06-12 15:24:43 -07:00
Roxanne Skelly
ca0c9e236b Cleanup 2019-06-12 11:58:26 -07:00
Roxanne Skelly
6e6bd18baa Undo Visual Studio mis-formatting 2019-06-12 11:43:43 -07:00
Brad Hefta-Gaub
d9e3dd2857
Merge pull request #15742 from SimonWalton-HiFi/connections-hash-lock 
Add mutex for Socket::_connectionsHash
 2019-06-11 16:41:11 -07:00
Roxanne Skelly
8704a36d07 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-11 16:26:55 -07:00
Roxanne Skelly
67cb5821bc Update packet headers / add connect 'reason' 2019-06-11 16:00:49 -07:00
Simon Walton
1c03aeac20 Add lock for Connections map 2019-06-11 15:14:01 -07:00
Roxanne Skelly
071a779930 convert enum reason for disconnect to boolean 2019-06-11 14:38:39 -07:00
Roxanne Skelly
8a3672f3c5 Checkpoint MTBF uptime reporting 2019-06-11 12:41:45 -07:00
Howard Stearns
bd446192e8 get windows error before calling io 2019-06-11 10:31:22 -07:00
howard-stearns
d7f6685022 Merge branch 'master' of https://github.com/highfidelity/hifi into verbose-logging-2 2019-06-10 19:42:07 -07:00
Simon Walton
d780964cb4 Reset NodeList upon local nework change; abort current socket when rebinding 
Also ensure QUdpSocket is owned by LimitedNodeList.
 2019-06-10 17:28:49 -07:00
Anthony J. Thibault
654b5775e1 Crash fix for ResourceCache::getResource() 
A wrong 'read' locker is used around a critical section that actually modifies the _resources QHash.
This can result in memory corruption and seg faults.
 2019-06-10 15:05:34 -07:00
Howard Stearns
9c6ca60108 get windows error first, check for socket changes, and fix bad Q_OS_WINDOWS ref 2019-06-10 12:08:51 -07:00
Simon Walton
aa65361b37 Merge remote-tracking branch 'upstream/master' into stun-on-iface-change 2019-06-10 10:32:31 -07:00
Simon Walton
c088fab606 Fix annoying typo 2019-06-07 16:23:38 -07:00
Roxanne Skelly
ec1118db1f Attempting to write to a socket in unbound state was causing qt to crash 
after a number of tries.  This fix does an initial check to prevent that
case.
 2019-06-07 15:23:06 -07:00
Roxanne Skelly
6643633400 Move rebind on network error to rebind on silent domain checkin 2019-06-07 13:38:50 -07:00
Simon Walton
498d681d3e Force new IP port on local address change 2019-06-07 12:04:04 -07:00
Roxanne Skelly
d0bd4a7d47 try rebinding on error writing/reading from bound socket 2019-06-06 14:01:34 -07:00
Roxanne Skelly
a55c723842 remove spammy logging 2019-06-06 11:03:50 -07:00
Roxanne Skelly
2f2e967a92 log windows socket error code on socket error 2019-06-05 14:08:26 -07:00
Roxanne Skelly
04f879be3e Add additional logging on socket send error 2019-06-05 12:41:08 -07:00
Roxanne Skelly
9fb43b4930 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-05 11:08:26 -07:00
Roxanne Skelly
06ed751f56 checkpoint to deal with merge 2019-06-05 11:08:12 -07:00
David Rowe
6299d38673 Distinguish between Uuid API and Uuid type in JSDoc 2019-06-05 14:39:05 +12:00
Shannon Romano
c48ecb5f67
Merge pull request #15674 from sethalves/quiet-some-warnings 
Quiet some warnings
 2019-06-04 17:00:54 -07:00
Roxanne Skelly
512b43e1de Log socket error string when socket error happens 2019-06-04 15:18:38 -07:00
Shannon Romano
0cfc090655
Merge pull request #15664 from roxanneskelly/domaincheckin 
BUGZ-516: last-heard-from monitoring on domain server
 2019-06-04 14:48:51 -07:00
Howard Stearns
cb16ff1a1b
Merge pull request #15585 from SimonWalton-HiFi/domainlist-recv-logging 
Logging for DomainList reception & timebox overruns
 2019-06-04 14:43:25 -07:00
Seth Alves
0d2bc23a63 avoid crash on shutdown 2019-06-04 13:00:26 -07:00
Roxanne Skelly
6a66e1558b Merge branch 'master' of https://github.com/highfidelity/hifi into domaincheckin 2019-06-04 11:20:52 -07:00
Shannon Romano
11b1c7dfcc
Merge pull request #15656 from Atlante45/feat/more-silent-node-logging 
Add logging for silent node kills
 2019-05-31 15:07:44 -07:00
Roxanne Skelly
c568e7c6da remove spammy logging 2019-05-31 13:57:25 -07:00
Roxanne Skelly
de6e1d0217 additional debug logging for microdisconnects 2019-05-31 13:05:33 -07:00
Clement
4bcc81b49b Add logging for silent node kills 2019-05-30 17:56:40 -07:00
Roxanne Skelly
e12ed1c5d6 high_resolution_clock behaves differently on windows and linux 
on linux, time_since_epoch returns time since linux epoch,
on windows, it returns time since system start.
Math between those values on two different types of machines
was coming out bad.
 2019-05-30 14:17:19 -07:00
Simon Walton
8a280e71e1
Merge branch 'master' into domainlist-recv-logging 2019-05-29 15:54:31 -07:00
Roxanne Skelly
82f8687e9f ubuntu builds are picky (fix initializer order issue) 2019-05-24 15:47:30 -07:00
Roxanne Skelly
41be22a7bb ubuntu build fix and CR fix 2019-05-24 15:22:33 -07:00
Roxanne Skelly
c6de86a80c Log packet processing time for domain server list request packets 2019-05-24 14:52:55 -07:00
Roxanne Skelly
aaee796aef Merge branch 'master' of https://github.com/highfidelity/hifi into domaincheckin 2019-05-24 09:38:37 -07:00
Brad Hefta-Gaub
5765957fe1
Merge pull request #15618 from luiscuenca/addCredentials 
Pass tokens as params for automatic login
 2019-05-24 09:13:53 -07:00
Roxanne Skelly
cc3ce96227 fix ubuntu build issue 2019-05-23 15:24:41 -07:00
Roxanne Skelly
7fdbbe5b77 CR: Use functional type conversion instead of c-style casting 2019-05-23 14:45:49 -07:00
Roxanne Skelly
1c6cf3df0d Move DomainList timestamps to the extended header 
And. Lag notifications now use signed values
 2019-05-23 14:19:36 -07:00
Roxanne Skelly
9c39d06416 Don't set permissions / is authenticated when DomainServerList checkin 
should be ignored.
 2019-05-23 11:42:51 -07:00
Roxanne Skelly
4f1eeecc2f Revert "Merge pull request #15620 from highfidelity/revert-15612-domaincheckin" 
This reverts commit 4735b9f19a, reversing
changes made to bc4a88beb7.
 2019-05-23 11:00:43 -07:00
Howard Stearns
a71e902a49
Revert "BUGZ-322 - add domain checkin lag logging" 2019-05-23 10:27:05 -07:00
luiscuenca
6d824ff22d
Fix logout 2019-05-22 20:27:42 -07:00
luiscuenca
206e353264
Pass tokens as params for automatic login 2019-05-22 16:18:30 -07:00
Clement
55f1929de2 Fix nodelist reset on logout/username change 2019-05-22 16:09:20 -07:00
Roxanne Skelly
4ca77ba3ac BUGZ-322 - add domain checkin lag logging 2019-05-22 13:51:43 -07:00
Howard Stearns
07e9c3d648 reduce time in which you see yourself going away 2019-05-20 12:48:06 -07:00
Simon Walton
6befbdafe9 Logging for DomainList reception & timebox overruns 2019-05-17 15:31:21 -07:00
Howard Stearns
72a9017fdf put back modified version of earlier comment 2019-05-17 15:30:54 -07:00
Howard Stearns
f1e8343b30 put DomainServerCheckIn on NodeList thread 2019-05-17 14:30:30 -07:00
David Rowe
82fb99053d Fix JSDoc typo noticed in passing 2019-05-17 21:35:50 +12:00
jennaingersoll
559a39be56
Merge pull request #15513 from ctrlaltdavid/M22147 
Case 22147: Desktop, Paths, PlatformInfo, Window, and location JSDoc
 2019-05-15 12:17:12 -07:00
Shannon Romano
b3b3c2f721
Merge pull request #14945 from kencooke/audio-stats-loss-underflow 
Case 19748: Audio loss statistic occasionally displays a huge number
 2019-05-15 11:06:53 -07:00
Roxanne Skelly
fad7fa4c07 Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-14 16:25:10 -07:00
David Rowe
997dc963d3 Merge branch 'master' into M22147 2019-05-15 07:59:10 +12:00
David Rowe
d5bb7f25e1 Doc review 2019-05-15 07:56:55 +12:00
Shannon Romano
c677f71650
Merge pull request #15514 from zfox23/privateUserData 
New Entity Property: Private User Data
 2019-05-14 10:24:39 -07:00
Roxanne Skelly
68fb43ec7f Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-14 10:11:02 -07:00
Howard Stearns
aeff5d93d8 try a longer timeout before we removeSilentNodes 2019-05-13 16:57:38 -07:00
Roxanne Skelly
0319e8cc4d Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-13 16:01:39 -07:00
Roxanne Skelly
72fe3a66f5 Debugging code to monitor the queue depth for a few critical threads 2019-05-13 15:56:55 -07:00
Zach Fox
e87381f431 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-13 14:13:34 -07:00
Shannon Romano
46d75a61b3
Merge pull request #15541 from SimonWalton-HiFi/clear-connections-on-NodeID-change 
Clear any reliable connection state upon Node ID change
 2019-05-13 13:11:05 -07:00
Simon Walton
4b51d81b42 Clear any reliable connection state upon Node ID change 2019-05-10 12:06:38 -07:00
Clement
07372f102c Add logging on silent node removal 2019-05-09 17:19:10 -07:00
Clement
c691ee496e CR 2019-05-09 13:58:50 -07:00
Clement
5c42838261 Change timeouts to try to prevent ICE disconnects 2019-05-08 18:38:35 -07:00
Clement
b3d0705e39 Extend ICE logging + make it more searchable 2019-05-08 18:38:00 -07:00
David Rowe
414f27208d Merge branch 'master' into M22147 
# Conflicts:
#	interface/src/scripting/DesktopScriptingInterface.h
#	interface/src/ui/InteractiveWindow.h
 2019-05-09 08:43:05 +12:00
Shannon Romano
5a603c20aa
Merge pull request #15495 from Atlante45/fix/deadlock 
Case 22433: master: Query shape type outside lock
 2019-05-06 14:12:56 -07:00
Zach Fox
2046fcfd09 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-06 11:08:36 -07:00
Zach Fox
a68da2bca7 Finish out the feature, i think 2019-05-06 11:08:23 -07:00
Zach Fox
d0e5087b20 Add permission 2019-05-06 10:19:58 -07:00
Shannon Romano
4c31c6f6e5
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification 
Avatar verification
 2019-05-06 08:04:06 -07:00
David Rowe
9c12a39368 Merge branch 'master' into M22147 2019-05-06 11:28:22 +12:00
Angus Antley
1911301005 changed to match type of _mss in compare. also changed float to double for correct return type 2019-05-02 18:21:08 -07:00
Angus Antley
ced5f52971 fixed possible divide by zero error in setpacketsendperiod in CongestionControl.cpp 2019-05-02 14:22:52 -07:00
Revofire
47af406440 merged 0.80.0-kasen into 0.81.0-kasen, 0.81.0-kasen source ready for build. 
various changes, idk, added a whitelist filter to ent script filter
 2019-05-01 22:13:51 -04:00
Zach Fox
fb77928652 Private user data is accessible to all right now 2019-05-01 15:29:04 -07:00
Clement
ecc38a8287 Push protocol version 2019-05-01 14:32:04 -07:00
Clement
d0fc5c7713 Push protocol version 2019-04-30 18:29:00 -07:00
David Rowe
9df873cff5 location JSDoc update 2019-05-01 08:17:43 +12:00
Simon Walton
a100345416 Ensure banner entity is local entity 2019-04-26 19:21:40 -07:00
Simon Walton
60389017a4 Merge from master, including avatar protocol change 
Tony had added HandController version-type.
 2019-04-26 18:51:41 -07:00
Shannon Romano
324bbadcfc
Merge pull request #15466 from Atlante45/fix/traits-parsing 
Case 22255: Add size checks for trait packets parsing
 2019-04-26 13:29:50 -07:00
Shannon Romano
4947f14eb7
Merge pull request #15394 from ctrlaltdavid/M22223 
Case 22223: Messages JSDoc update
 2019-04-26 10:40:10 -07:00
Anthony Thibault
2c370d9d74
Merge pull request #15460 from hyperlogic/feature/network-opt-faux 
Avatar network bandwidth optimization
 2019-04-26 10:16:30 -07:00
Clement
d36fd6eaa3 Ensure we don't read past the end of packet buffers 2019-04-25 16:22:01 -07:00
Simon Walton
f3efee56c0 Merge remote-tracking branch 'upstream/master' into avatar-verification 2019-04-25 13:40:27 -07:00
Atlante45
329a76d4d6 Fix unix warning 2019-04-23 14:54:12 -07:00
Atlante45
3605b3d560 Patch interface redirect code 2019-04-23 14:54:12 -07:00
Simon Walton
c03839e49f Fix threaded issues; add verify failed flag to avatar identity packet 
Bump packet version
 2019-04-23 09:26:17 -07:00
Anthony Thibault
0c0b847666 First version of faux joint optimizations 
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.

Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
 2019-04-22 11:02:13 -07:00
John Conklin II
4d4db257e4
Merge pull request #15382 from Atlante45/fix/asset-server-baking 
Case 22209: Fix asset server auto-baking
 2019-04-19 13:40:59 -07:00
Simon Walton
c7f270a9ba Combine PR15375 & PR15376 for RC82 branch 2019-04-17 13:47:39 -07:00
Shannon Romano
5d1c1010c5
Merge pull request #15294 from sethalves/fix-refreshGroupsCache-asan-error 
case 21977: fix asan reported error when returning QString reference to refreshGroupsCache
 2019-04-17 11:43:12 -07:00
Shannon Romano
7de56092f8
Merge pull request #15376 from SimonWalton-HiFi/delayed-node-adds-tweaks 
Clear delayed Node-adds upon restart
 2019-04-16 11:27:15 -07:00
David Rowe
7af55de43d Messages JSDoc update 2019-04-16 14:20:40 +12:00
Atlante45
c5b7bdc802 Fix unix warning 2019-04-12 17:51:03 -07:00
Atlante45
794cedaa60 Patch interface redirect code 2019-04-12 15:49:34 -07:00
Simon Walton
7180d8b99b Clear delayed Node-adds upon restart 2019-04-11 17:56:27 -07:00
Simon Walton
a5e94eea75 Increase ping interval for unconnected Nodes 2019-04-11 17:36:09 -07:00
Shannon Romano
1b72a514d3
Merge pull request #15328 from Atlante45/fix/injectors 
Case 21925: Warn mixer about stopped injectors
 2019-04-05 16:09:41 -07:00
David Rowe
28dfac64ba Merge branch 'master' into M21460 
# Conflicts:
#	libraries/image/src/image/Image.h
 2019-04-05 17:50:46 +13:00
David Rowe
68f76851fd Updates per doc review 2019-04-05 17:10:52 +13:00
Seth Alves
cbc51b75f9 fix asan reported error when returning QString reference to refreshGroupsCache 2019-04-04 19:55:13 -07:00
Clement
5102702910 Warn mixer about stopped injectors 2019-04-04 18:55:35 -07:00
Sam Gondelman
1cc2cd3194
Merge pull request #15237 from SamGondelman/particleShapes 
Case 21859: Particle Entity emitter shapes, including model
 2019-04-03 11:03:33 -07:00
Anthony J. Thibault
782b8f5da6 Case 22010: Bump protocol number to fix joint order mismatch 
The joint order change was introduced in PR #15178, to fix an FBX Serializer bug.
 2019-04-02 13:26:50 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
Shannon Romano
1bfa0397f0
Merge pull request #15048 from wayne-chen/newAudioMuteStates 
Case 21899: New Audio Mute States
 2019-04-01 15:27:03 -07:00
Shannon Romano
04eac57950
Merge pull request #15300 from jherico/fix/web_camera_master 
Case 21993: Globally disallow use of the camera or microphone by hosted web content
 2019-04-01 14:05:22 -07:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates 2019-04-01 12:24:46 -07:00
Brad Davis
7d4e59bfe3 Force packet version change 2019-03-31 16:44:23 -07:00
Shannon Romano
df97f595f2
Merge pull request #15279 from kitely/allow-emails-with-plus-sign 
case 21982: Allow logging-in with an email that contains a '+' sign
 2019-03-29 13:04:11 -07:00
Shannon Romano
ac0130d4c7
Merge pull request #15234 from SimonWalton-HiFi/clear-connection-on-add-node 
When adding new Node clear any dangling Connection objects
 2019-03-29 10:46:22 -07:00
Oren Hurvitz
3d5035886c Allow logging-in with an email that contains a '+' sign. 
Previously, attempts to login using an email such as "my+name@example.com" didn't work because the username wasn't
URL-encoded when it was sent to the server, so on the server the '+' was changed to a space.
 2019-03-28 10:45:55 +01:00
David Rowe
f933872620 Address review comments. 2019-03-28 14:21:51 +13:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates 2019-03-27 15:49:39 -07:00
David Rowe
9a1bb27034 AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc 2019-03-26 13:58:43 +13:00
Ken Cooke
b5e8176b0f
Merge branch 'master' into audio-mixer-volume-control 2019-03-23 16:15:29 -07:00
Ken Cooke
cbeb4b0b20 Persist the audio-mixer settings across domain changes and server resets 2019-03-23 06:48:37 -07:00
Wayne Chen
d382893e75 staging avatar inputs for ignore radius 2019-03-22 14:16:28 -07:00
Simon Walton
8947d4d133 When adding new Node clear any dangling Connection objects to its address 2019-03-20 15:45:06 -07:00
SamGondelman
432a3f1610 uniform sampling of ellipsoid points 2019-03-19 12:59:03 -07:00
Ken Cooke
ca0379f6de Send InjectorGainSet packet to the audio-mixer 2019-03-15 17:24:50 -07:00
Ken Cooke
a5a305f181 Handle InjectorGainSet packet at the audio-mixer 2019-03-15 12:05:51 -07:00
Howard Stearns
9b3b109d22 make placename consistent with hostname after domain reset 2019-03-13 17:09:54 -07:00
Howard Stearns
97bfa538ff unlimited certified copies in a domain 2019-03-07 09:51:20 -08:00
Roxanne Skelly
cca36e4a89 Merge commit '135c7b667eb126bcc4ebab948fa7450327209ae8' 2019-03-05 15:09:56 -08:00
Roxanne Skelly
d0ecc6d792 Merge commit '16eb3444c11c6513ff0d8a1d73a50c9856bf432b' 2019-03-05 15:09:20 -08:00
Roxanne Skelly
38981a5f25 Merge commit 'a804d3532e6b04fb86e5e520147bd34c331b3f36' 2019-03-05 15:08:39 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
Shannon Romano
29d5574d93
Merge pull request #15036 from SimonWalton-HiFi/connect-class-in-nodelist-thread 
Connection class should run in NodeList thread
 2019-03-04 12:30:24 -08:00
SamGondelman
884a64bfa6 fix resource crash 2019-03-01 15:50:50 -08:00
Roxanne Skelly
16eb3444c1 Code Review Fixes 2019-03-01 11:31:01 -08:00
Clement
135c7b667e Reduce size of _nodeMutex critical sections 2019-03-01 11:23:46 -08:00
Clement
a804d3532e Set default limit for other nodes to size_t max 2019-02-28 15:30:57 -08:00
Clement
9ea41f7122 CR 2019-02-28 15:22:07 -08:00
Atlante45
9fe7a3350c Fix windows compile error 2019-02-28 15:06:26 -08:00
Roxanne Skelly
c721d68ec3 Remove unneeded cruft 2019-02-28 14:35:29 -08:00
Roxanne Skelly
c7b04865ce Remove debugging code, some thread safety changes 2019-02-28 13:58:33 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
Roxanne Skelly
1e1437aab7 Merge branch 'v0.79.HERO-rc' of https://github.com/highfidelity/hifi into 79-hero-avmixer-stress 2019-02-28 12:13:17 -08:00
Clement
8032063512 Move to LimitedNodeList 2019-02-27 19:14:36 -08:00
Clement
717c12fe16 Add new connection rate limitting 
Limit rate of connection for new Agents
 2019-02-27 18:22:49 -08:00
Simon Walton
db8bd661ce Max domain check-ins was 5, not 4, dammit 2019-02-27 16:50:07 -08:00
Roxanne Skelly
03326cd471 Build fix 2019-02-27 15:58:49 -08:00
Simon Walton
59b9831c1d Revert max check-ins to 4 2019-02-27 15:56:01 -08:00
Roxanne Skelly
e2e1edc8b0 Add test logging, stats, and force domain pings to timer thread 
Test code for load testing only.
 2019-02-27 14:13:33 -08:00
Simon Walton
08d6a2ce7f Avatar Hero debugging & logging 2019-02-26 16:40:16 -08:00
John Conklin II
2449693d8b
Merge pull request #15006 from Atlante45/fix/shared-connection-master 
Case 21407: Delete old nodes with identical socket
 2019-02-26 16:24:03 -08:00
Simon Walton
4c071be2bf Merge remote-tracking branch 'upstream/v0.79.HERO-rc' into hero-avatar-zone-79 2019-02-26 15:21:00 -08:00
Simon Walton
7039ee471d Move newly-created Connection to NodeList thread 2019-02-26 13:49:55 -08:00
Simon Walton
0b080471ff Filter on scriptValue to reduce EntityItem load; bump ping timeouts for testing 2019-02-26 10:57:35 -08:00
Shannon Romano
badd0b8bd3
Merge pull request #14968 from davidkelly/dk/20726 
Guard against accidentally calling wrong api/v1/places endpoint
 2019-02-25 17:16:33 -08:00
Clement
50035a1983 Delete old nodes with identical socket 2019-02-25 09:48:21 -08:00
Clement
d040803391 Delete old nodes with identical socket 2019-02-22 18:38:31 -08:00
SamGondelman
544f54e69a fix model scale 2019-02-21 14:10:36 -08:00
David Kelly
2202b69575 Guard against accidentally calling wrong api/v1/places endpoint 
spaces
 2019-02-20 13:09:29 -07:00
Simon Walton
8033e93eda Add avatar-priority boolean to zone entities 
RC-79 version
 2019-02-19 17:38:37 -08:00
SamGondelman
44e70db4cd WE DID IT FOLKS 2019-02-19 15:02:36 -08:00
Ken Cooke
0b472a9f02 Protect against lost counter underflow in networking stats 2019-02-16 11:19:18 -08:00
sabrina-shanman
bb123cfe3b Fix GLTF materials 2019-02-15 14:51:29 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping 
Case 20242: FST materialMapping supports our material JSON format
 2019-02-15 11:21:51 -08:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode 
Case 20962: Billboard mode improvements
 2019-02-14 17:44:48 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
SamGondelman
dd0d7f0118 merge with master 2019-02-14 09:57:13 -08:00
Andrew Meadows
efe2767f3f
Merge pull request #14913 from SamGondelman/pal 
Case 21147, Case 20944: Fix setTextures (pal, etc.)
 2019-02-13 17:50:08 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
SamGondelman
9e002c59d4 fix pal 2019-02-13 15:24:55 -08:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132 
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
 2019-02-13 10:35:00 -08:00
SamGondelman
189ccfde4a clement's comments from PR14858 2019-02-12 09:51:11 -08:00
SamGondelman
61346437da working on material mapping 2019-02-12 09:22:31 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -08:00
SamGondelman
4202685a4b Merge remote-tracking branch 'upstream/master' into fst 2019-02-11 16:07:36 -08:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
SamGondelman
4f03157f39 working on fst material mapping 2019-02-11 10:20:55 -08:00
Roxanne Skelly
e6b2c890d0 Case21085 - Changing domains with scripting APIs not working 
AccountManager was earlier changed to support QUrlQuery for
query strings in it's 'send.'  Unfortunately, QUrlQuery isn't
a scriptable property type so using AM was failing from scripts
 2019-02-07 22:21:05 -08:00
SamGondelman
e74ff18bef Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:49:27 -08:00
SamGondelman
9193704173 trying to get hashes working 2019-02-06 11:47:38 -08:00
SamGondelman
3ee448a89a fix scattering and working on resource cache bug 2019-02-05 17:32:15 -08:00
Roxanne Skelly
78aa1783a0 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-04 15:04:55 -08:00
SamGondelman
b80d2a9b06 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-01 13:33:04 -08:00
SamGondelman
0955512a80 add billboard mode to web entities and fix picking/culling 2019-01-31 15:45:10 -08:00
Dante Ruiz
9082a3f4e5 to the spot on first launch 2019-01-31 10:58:20 -08:00
Dante Ruiz
778ddad9ac to the spot on first launch 2019-01-31 10:52:48 -08:00
SamGondelman
6ad0b3412a showKeyboardFocusHighlight + fixes 2019-01-28 20:43:47 -08:00
SamGondelman
13cb70a6a5 Merge remote-tracking branch 'upstream/master' into NOverlays12 2019-01-28 11:37:15 -08:00
Roxanne Skelly
d3cffa50d6 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-28 11:11:28 -08:00
Jeff Clinton
b5a1dc599b
Merge pull request #14725 from SamGondelman/NOverlays11 
Case 20700: Add missing pulse properties to certain Entity types
 2019-01-28 10:51:00 -08:00
Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature 
MS20311: Oculus login feature
 2019-01-25 16:16:32 -08:00
SamGondelman
a10f52c66d merge with master 2019-01-25 14:16:07 -08:00
Roxanne Skelly
49e6120e73 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-25 14:06:44 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature 2019-01-25 11:44:14 -08:00
Roxanne Skelly
cfaf01b22a Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-24 17:21:16 -08:00
Roxanne Skelly
c1ff51a02d QML Marketplace 
Checkpoint full functionality
 2019-01-24 17:20:42 -08:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9 
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
 2019-01-24 14:36:27 -08:00
SamGondelman
9a734b2011 merge with master 2019-01-23 17:48:24 -08:00
SamGondelman
ac513df103 ring gizmo entities 2019-01-23 17:46:04 -08:00
John Conklin II
1768d91780
Merge pull request #14733 from hyperlogic/bug-fix/translation-precision 
Avatar Protocol: Fix for precision issues with translation
 2019-01-23 14:07:58 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter 
Limit upstream bandwidth to the Avatar Mixer
 2019-01-18 13:32:03 -08:00
Anthony Thibault
286f23d512 Updated protocol version and fixed bugs 2019-01-17 15:19:54 -08:00
Wayne Chen
ef63213d28 fixing linking account problems on oculus/steam, changing callback 2019-01-16 21:07:54 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature 2019-01-16 17:24:22 -08:00
Wayne Chen
116a15afe8 removing oculus userID to server - no need 2019-01-16 17:15:40 -08:00
Wayne Chen
8e916ea41b linking oculus acct creation to spinner 2019-01-16 17:05:59 -08:00
Wayne Chen
2d16e71e74 adding sending oculus ID including username 2019-01-16 17:05:52 -08:00
Wayne Chen
6bc1164d58 more wip on oculus login 2019-01-16 17:05:50 -08:00
Wayne Chen
970798705c improving flow from Oculus API to login dialog wip 2019-01-16 17:05:48 -08:00
Wayne Chen
1af57bdba6 staging 2019-01-16 17:05:48 -08:00
SamGondelman
611998f799 add pulse group properties to shapes, particles, text, web, image, and grid 2019-01-16 13:34:10 -08:00
Simon Walton
024cb70fce Change member-initializer order to fix warnings 2019-01-16 12:58:13 -08:00
Simon Walton
b53fcb2c3d Pass udt::Socket pointer in initializer-list for udt::Connection 2019-01-16 12:08:02 -08:00
Clement
6bd6c45b60 Remove dead IdentityRequest code 2019-01-15 11:40:08 -08:00
Seth Alves
2ef47304ba
Merge pull request #14558 from AndrewMeadows/faster-avatar-entities 
case 20020: faster avatar entities
 2019-01-11 14:13:05 -08:00
SamGondelman
4b67a79561 more web entity wip 2019-01-11 09:57:42 -08:00
John Conklin II
83cb60f46f
Merge pull request #14621 from birarda/feat/message-cycle-cap 
cap the number of considered message channels in PacketQueue
 2019-01-09 17:43:36 -08:00
Andrew Meadows
9b253690db bump packet version number 2019-01-09 17:28:00 -08:00
John Conklin II
2757590158
Merge pull request #14633 from roxanneskelly/Case20377 
Trait-level flow control
 2019-01-09 15:57:13 -08:00
Shannon Romano
87f966773c
Merge pull request #14601 from SimonWalton-HiFi/reliable-service-min-timeout 
Set minimum timeout for retransmits within reliable network service
 2019-01-09 15:35:40 -08:00
birarda
3c6b7e3bd0 add a cap to cycled message channels in SendQueue 2019-01-09 13:06:30 -08:00
SamGondelman
10068cc42c merge with master 2019-01-08 12:14:32 -08:00
SamGondelman
1b5c1d0677 working on primitiveMode and groupCulled 2019-01-08 10:02:03 -08:00
Roxanne Skelly
d54fec4476 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 18:17:40 -08:00
SamGondelman
f60b272f11 fix crash 2019-01-07 17:24:07 -08:00
SamGondelman
3341d75eda merge with master 2019-01-07 15:49:16 -08:00
SamGondelman
b609cfaa2b renderLayer 2019-01-07 15:43:35 -08:00
Sam Gondelman
db3187ec6c
Merge branch 'master' into propFix 2019-01-07 14:57:38 -08:00
Adam Smith
7e75ed5daa
Merge pull request #14586 from SamGondelman/NOverlays8 
Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera
 2019-01-07 14:53:27 -08:00
Simon Walton
c88af5c4be Merge branch 'master' into reliable-service-min-timeout 2019-01-07 13:28:13 -08:00
Roxanne Skelly
37d4846722 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 11:56:48 -08:00
Shannon Romano
6eaec12df7
Merge pull request #14658 from Atlante45/feat/stats 
Only keep aggregated thread stats for Avatar Mixer
 2019-01-07 10:17:26 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption 
Add menu checkbox to toggle collisions with other avatars
 2019-01-07 08:58:09 -08:00
Roxanne Skelly
6d791a80c2 Bump protocol version for BulkAvatarTraits and add some guard code 
around packet parsing.
 2019-01-04 19:04:01 -08:00
Shannon Romano
4e5d275768
Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager 
MS19925: Avatar Packager
 2019-01-04 16:22:06 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Thijs Wenker
94146ab997 CR fixes 2019-01-04 23:59:22 +01:00
Clement
cfbb4e29d1 Only keep aggregated thread stats 2019-01-04 14:51:58 -08:00
SamGondelman
1452d237e2 trying to fix avatar entity issue 2019-01-04 14:34:46 -08:00
Shannon Romano
3faf12b141
Merge pull request #14637 from howard-stearns/data-url-for-web-entity 
data url for web entity
 2019-01-04 14:21:55 -08:00
Roxanne Skelly
4f9cce1ea9 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-04 13:46:45 -08:00
Thijs Wenker
b105607cb2 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-04 21:13:29 +01:00
Thijs Wenker
a3f72a7a08 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-04 21:10:35 +01:00
Seth Alves
b9217e2767
Merge pull request #14655 from danteruiz/unknown-steamvr-headsets 
omit unknown device names from clear-story data
 2019-01-04 10:09:20 -08:00
Ryan Huffman
c2ceeb3d76 Apply AvatarPackager code review cleanup 2019-01-04 09:41:31 -08:00
Thijs Wenker
8625037285 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-04 15:29:07 +01:00
Antonina Savinova
4414579a6e
Merge pull request #14591 from Atlante45/feat/stats 
Fix network stats to use low-level values
 2019-01-03 16:54:03 -08:00
Sam Gondelman
0e6eecc64b
Update PacketHeaders.h 2019-01-03 15:20:55 -08:00
Sam Gondelman
5a6f9eb9e3
Merge branch 'master' into NOverlays8 2019-01-03 15:11:48 -08:00
Dante Ruiz
f5de217b4c removing debug statment 2019-01-03 13:40:44 -08:00
Roxanne Skelly
2b1547b9fa Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-03 13:39:19 -08:00
Thijs Wenker
c95da0a595 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 
# Conflicts:
#	interface/src/Application.cpp
 2019-01-03 22:17:54 +01:00
SamGondelman
4cd1cd6606 merge with master 2019-01-03 12:56:41 -08:00
Dante Ruiz
fe1a8a6b76 omit unknown device names from clear story 2019-01-03 11:46:03 -08:00
Clement
a0ede77e4f Fix typo 2019-01-03 10:04:38 -08:00
Clement
9475a31f1b Record ACK data in stats 2019-01-03 10:04:38 -08:00
Clement
f163bbc0d5 Sample connections stats every seconds 2019-01-03 10:04:38 -08:00
Clement
c5b60594b6 Record more detailed stats on Retransmit/duplicate 2019-01-03 10:04:38 -08:00
Seth Alves
ad1235ce94 also bump entity protocol version 2019-01-03 08:19:13 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Thijs Wenker
725a14ce80 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-03 11:06:19 +01:00
SamGondelman
ea11497a67 Merge remote-tracking branch 'upstream/master' into NOverlays7 2019-01-02 18:09:19 -08:00
Sam Gondelman
aeafb3c9a7
Merge pull request #14569 from SamGondelman/NOverlays6 
Case 20281: Add missing Text Entity properties
 2019-01-02 18:07:37 -08:00
Thijs Wenker
cb91a4bc6d Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-03 00:10:22 +01:00
Antonina Savinova
4838a9107a
Merge pull request #14624 from davidkelly/dk/17207 
ACs don't need to call into flagtimeForConnecitonStep
 2019-01-02 13:41:30 -08:00
Roxanne Skelly
9dfb07c827 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-02 09:22:27 -08:00
Roxanne Skelly
4fc263ff24 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2018-12-27 14:13:40 -08:00
howard-stearns
af65e59ba3 Recognize data: URLs in Web entities. 2018-12-27 14:34:59 -05:00
Roxanne Skelly
da70271acf Checkpoint #2 Case20377 - Add Ack for BulkAvatarTraits 2018-12-26 13:46:08 -08:00
Roxanne Skelly
3a282045ff Checkpoint trait-level flow control 2018-12-21 15:48:58 -08:00
Thijs Wenker
ea901aa179 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-21 14:11:57 +01:00
SamGondelman
bb030660bd Merge remote-tracking branch 'upstream/master' into NOverlays4 2018-12-20 13:26:23 -08:00
Thijs Wenker
79a9c82168 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-20 18:56:33 +01:00
David Kelly
2c647462b1 ACs don't need to call into flagtimeForConnecitonStep 2018-12-20 10:15:44 -07:00
SamGondelman
05e0fb464e new improved polylines 2018-12-19 15:01:49 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
Adam Smith
828672343a
Merge pull request #14523 from SamGondelman/NOverlays2 
Case 20131: Cleanup some Entity Properties
 2018-12-19 11:33:24 -08:00
Ryan Huffman
720cd90dc7 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-18 13:17:28 -08:00
Simon Walton
0d14e0bcf7 Set minimum timeout for retransmits 2018-12-17 14:07:21 -08:00
SamGondelman
6094a2f0a0 add back line entities, undo polyline changes temporarily 2018-12-14 15:41:11 -08:00
Ryan Huffman
78c4c2599e Add start of marketplace uploading and project file list 2018-12-13 13:27:31 -08:00
SamGondelman
b261665072 working on lines 2018-12-12 09:39:01 -08:00
SamGondelman
250baa9c72 add missing properties to text entities 2018-12-11 15:42:24 -08:00
SamGondelman
fd8245e258 Merge remote-tracking branch 'upstream/master' into NOverlays6 2018-12-11 10:46:39 -08:00
Shannon Romano
a3c870ed90
Merge pull request #14479 from sabrina-shanman/hfm_mimetype 
(case 20037) Add robust MIME type detection for loading models in ModelCache
 2018-12-11 18:41:55 +00:00
Sam Gondelman
d21d764131
Merge branch 'master' into NOverlays4 2018-12-06 12:48:05 -08:00
Sam Gondelman
2291c7e5fb
Merge branch 'master' into NOverlays3 2018-12-06 12:37:18 -08:00
Sam Gondelman
533e0e0326
Merge branch 'master' into NOverlays2 2018-12-06 12:29:38 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
Sam Gondelman
c38a6966a9
Merge branch 'master' into NOverlays4 2018-12-06 11:25:43 -08:00
Sam Gondelman
a7c083e97a
Merge branch 'master' into NOverlays2 2018-12-06 11:24:27 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3 2018-12-06 11:23:50 -08:00
Adam Smith
08d6e35d4d
Merge pull request #14372 from SamGondelman/decals 
Case 19798: 3D projected Material Entities and materialRepeat option
 2018-12-06 11:13:46 -08:00
SamGondelman
305cb6d323 grid entities 2018-12-03 18:04:34 -08:00
SamGondelman
3ce6f7f3d6 real image entities 2018-12-03 11:50:59 -08:00
SamGondelman
1fd8a21f8e cleanup 2018-12-03 11:07:54 -08:00
sabrina-shanman
b809eed01f Merge branch 'master' into hfm_mimetype 2018-11-28 15:06:04 -08:00
sabrina-shanman
2387641cbb Store the MIME type in HTTPResourceRequest::onRequestFinished() 2018-11-26 16:09:41 -08:00
SamGondelman
e282d51883 CR 2018-11-26 01:15:07 -05:00
birarda
23857ea8c2 ensure packets are added to loss list after timeout 2018-11-19 17:40:55 -08:00
Dante Ruiz
f17723c216 disable interstitial for master 2018-11-14 14:50:38 -08:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -08:00
Jeff Clinton
6c90d7ed11
Merge pull request #14343 from ElderOrb/FB19514 
FB19514 - Interface crashes on attempt to apply new animation url via…
 2018-11-13 14:59:50 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging 
remove urls from logs in Interface
 2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
6e2024350d
Merge pull request #14282 from gcalero/android_new_login 
Change Android login flow (MS case 19470)
 2018-11-13 12:02:10 -08:00
Howard Stearns
ad7266062d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 10:33:27 -08:00
John Conklin II
85e5c1d6ef
Merge pull request #14363 from SimonWalton-HiFi/scale-avatar-joint-translations 
Send avatar-joint translations at world scale
 2018-11-13 10:04:30 -08:00
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
Howard Stearns
fc62700587 Merge branch 'no-url-logging' of github.com:howard-stearns/hifi into no-url-logging 2018-11-13 09:55:09 -08:00
Gabriel Calero
3d4893aba2 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-11-13 10:43:36 -03:00
John Conklin II
ec4f2f781d
Merge pull request #14352 from Atlante45/feat/solo-source 
[master] Add audio soloing feature
 2018-11-12 14:07:30 -08:00
Roxanne Skelly
762033580d And remove another url log item. 2018-11-12 13:48:08 -08:00
Roxanne Skelly
7a14cb1bbc Remove additional url logging message. 2018-11-12 13:36:14 -08:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
Brad Hefta-Gaub
22dd958582
Merge pull request #14297 from jherico/feature/vcpkg 
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
 2018-11-12 09:52:02 -08:00
SamGondelman
b3abd97707 projected materials and repeat property 2018-11-09 10:47:07 -08:00
Zach Fox
5cf2041c65
Remove unused variable 2018-11-09 10:38:20 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
Zach Fox
811b01816b CR round 3 2018-11-08 10:41:31 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Zach Fox
48d3450c5a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-07 14:59:23 -08:00
Sam Gateau
e28560a9c7
Merge pull request #14311 from SamGondelman/interstitial 
Case 19682: Disable interstitial on android
 2018-11-07 10:47:31 -08:00
Sam Gateau
5d0be31fe7
Merge pull request #14354 from SamGondelman/deadlock 
Case 19735: Fix ResourceCache mutex issues
 2018-11-07 09:55:41 -08:00
Simon Walton
f88168bdfb Send avatar-joint translations at world scale 2018-11-06 17:29:02 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations. 
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
 2018-11-06 16:24:32 -08:00
SamGondelman
1444b3a186 resource mutex issues 
(cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e)
(cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)
 2018-11-06 11:57:57 -08:00
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00
Clement
37c69ebe62 Add audio soloing feature 2018-11-05 19:02:26 -08:00
Alexander Ivash
cdfa38d4dd FB19514 - Interface crashes on attempt to apply new animation url via AvatarApp 2018-11-04 19:16:43 +05:30
Zach Fox
a87142b8b7 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-11-02 16:49:20 -07:00
Zach Fox
d0854ca2ab Use AccountManager instead of settings 2018-11-02 16:42:18 -07:00
Gabriel Calero
6a3ccbbe02 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-11-02 17:08:55 -03:00
Gabriel Calero
160e633af5 Implement login through oauth for steam login button 2018-11-02 17:08:19 -03:00
Zach Fox
b43ad15fa7 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-01 11:32:38 -07:00
Stephen Birarda
41ec026f8d cleanup packet times, avoid ambiguous RTT calcs, allow fast re-transmit 2018-10-31 13:32:27 -07:00
SamGondelman
8633dc0f66 disable interstitial on android 2018-10-31 12:34:20 -07:00
Zach Fox
d1556ae4e8 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 15:51:34 -07:00
Kerry Ivan Kurian
3cf000a71b
Merge pull request #14232 from kkurian/log-resource-requests-2 
Display resource-access events in marketplace item tester
 2018-10-23 15:18:30 -07:00
John Conklin II
7019439356
Merge pull request #14260 from SamGondelman/resourceCrash 
Fix ResourceCache crash on shutdown
 2018-10-23 15:03:55 -07:00
Stephen Birarda
5cbddfe0c4 consider all sockets in findNodeWithAddr 2018-10-23 13:35:07 -07:00
SamGondelman
78f0afd39f fix crash on shutdown 2018-10-23 12:13:41 -07:00
Kerry Ivan Kurian
a2a6acd45c Improve code formatting 2018-10-22 14:04:59 -07:00
Zach Fox
bccca94111 Prevent duplicate resources in logs. Thanks to Roxanne! 2018-10-22 13:59:55 -07:00
Zach Fox
493262052c Remove extraneous code changes; remove QUrlAncestry code; remove extra logging 2018-10-22 13:59:52 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
Stephen Birarda
3aac294a92 optimize sockAddrBelongsToNode and reduce connection filter usage 2018-10-22 13:57:30 -07:00
Zach Fox
1eca1bfd55 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-22 11:18:10 -07:00
Stephen Birarda
3c79a79487
Merge pull request #14163 from Atlante45/fix/bw-recorder 
Fix crash with BandwidthRecorder
 2018-10-22 10:11:26 -07:00
Stephen Birarda
ea3bdeb26e
Merge pull request #14181 from Atlante45/feat/timebox-packet-processing 
Timebox packet processing
 2018-10-22 09:43:30 -07:00
Brad Hefta-Gaub
219302a9b6
Merge pull request #14157 from SimonWalton-HiFi/domain-checkin-limit 
Cap the number of domain-server duplicate check-ins sent upon retransmission
 2018-10-19 16:41:09 -07:00
Brad Davis
2687c024eb Fix light color / serialization 2018-10-19 14:47:02 -07:00
Zach Fox
2df9d28c5b Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-19 09:42:06 -07:00
John Conklin II
5095a4e0eb
Merge pull request #14196 from sethalves/interstitial-domain-full 
go to error-room when failing to connect to a full domain
 2018-10-18 17:49:35 -07:00
Zach Fox
2f37a2b1a1 Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-18 11:12:26 -07:00
Zach Fox
2a9e0041b2 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-18 10:16:07 -07:00
Kerry Ivan Kurian
89a5da80e0 Do not display incomplete metadata 2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester 
Includes refactoring marketplace item tester into a single-page app.
 2018-10-18 01:04:47 -07:00
Sam Gondelman
3f117cd3e0
Merge branch 'master' into scriptvec3 2018-10-17 13:57:21 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1 
move grab pseudo-properties (userData) into first-class EntityItemProperties
 2018-10-17 13:29:20 -07:00
Sam Gondelman
e3543cf098
Merge branch 'master' into scriptvec3 2018-10-17 13:10:29 -07:00
John Conklin II
e59e3720fe
Merge pull request #14139 from SamGondelman/animation 
Fix various ResourceCache bugs
 2018-10-17 11:13:35 -07:00
Seth Alves
47d3c9ba27 go to error-room when failing to connect to a full domain 2018-10-12 11:28:54 -07:00
Clement
bcbbe884c7 Timebox readPendingDatagrams 2018-10-10 12:56:41 -07:00
Zach Fox
7de784ce27 First steps (definitely not working) 2018-10-10 12:32:55 -07:00
Clement
8a95c58f86 Revert packet processing split 2018-10-10 11:46:53 -07:00
Clement
3eb7c80af3 Fix BandwidthRecorder storage concurrent accesses 2018-10-08 13:45:34 -07:00
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3 2018-10-08 12:59:34 -07:00
Simon Walton
12db6a4d10 Limit number of domain-checkin duplicates 2018-10-08 10:58:46 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged 
Merged interstitial page/redirect domain improvements
 2018-10-08 10:32:29 -07:00
Stephen Birarda
88f76ac760 suppress traits larger than INT16_MAX bytes 2018-10-05 09:46:55 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -07:00
SamGondelman
4024f2a180 fix various resourcecache bugs 2018-10-04 11:29:22 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
Wayne Chen
d6af09ca62 ignoring entities in interstitial/saving address on 404 error 2018-10-03 17:40:42 -07:00
Sam Gondelman
4e96c3297b
Merge branch 'master' into scriptvec3 2018-10-03 17:14:15 -07:00
John Conklin II
4d7b2bb429
Merge pull request #14113 from Atlante45/feat/audio-mixer-throttle-equation 
Audio Mixer Scaling
 2018-10-03 13:17:28 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
Wayne Chen
5f05be554f check for hard refusal to 404 2018-10-01 10:06:13 -07:00
Wayne Chen
eab57633a5 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-01 09:21:26 -07:00
Stephen Birarda
371de312cc enumerate a vector of mixable streams for each listener 2018-09-28 14:54:50 -07:00
Stephen Birarda
aed79b3b17 use a vector for ignored node IDs 2018-09-28 14:54:49 -07:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-27 12:05:21 -07:00
Wayne Chen
9079c8a6b7 adding log for redirect cases 2018-09-27 10:42:21 -07:00
Wayne Chen
db41a1c16b error state signal for 404/interstitial 2018-09-26 13:48:15 -07:00
Wayne Chen
de5614500a Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements 2018-09-25 21:52:01 -07:00
Wayne Chen
26b6967ba6 adding overlays to redirect domain 2018-09-25 18:16:18 -07:00
Wayne Chen
69d5299362 patching fix for previous commits 2018-09-24 15:22:46 -07:00
Wayne Chen
ac5814a1f8 Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect 2018-09-24 13:57:23 -07:00
Roxanne Skelly
61cbee72af Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-21 12:31:36 -07:00
Wayne Chen
7e796f7e7f committing requested changes 2018-09-19 14:26:30 -07:00
Roxanne Skelly
d5f756c79d Tray Notifier Checkpoint 
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
 2018-09-19 12:40:15 -07:00
Wayne Chen
01594d7a52 fixing settings check in domain handler 2018-09-19 10:17:14 -07:00
Wayne Chen
795580f4e1 adding 404 redirect toggle with interstitial 2018-09-19 09:55:15 -07:00
Wayne Chen
be5f498c2f reversion 2018-09-18 15:47:54 -07:00
Wayne Chen
48e4b38312 reversion 2018-09-18 15:28:15 -07:00
Wayne Chen
8274f4cb4c reverting domain handler change 2018-09-18 15:26:12 -07:00
Wayne Chen
f82063ed46 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-18 09:17:28 -07:00
Wayne Chen
0afea6fbd1 removing double login fail signal 2018-09-14 11:08:53 -07:00
SamGondelman
c522d1bc93 merge with master 2018-09-14 00:57:13 -07:00
Wayne Chen
fd1e64e4e6
Revert "Fix login fail twice call" 2018-09-13 17:01:59 -07:00
John Conklin II
aef3ed3e01
Merge pull request #13989 from wayne-chen/fixLoginFailTwiceCall 
Fix login fail twice call
 2018-09-13 16:59:00 -07:00
Wayne Chen
0fc1cc9af8 Revert "adding fix for getting DomainHandler into error state" 
This reverts commit 49f26d968a.
 2018-09-13 15:39:18 -07:00
David Rowe
bbfb2b1374 Merge branch 'master' into M17428-f 2018-09-14 10:36:49 +12:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor 
Fixing Error State for Timeout/localhost Redirection
 2018-09-13 15:19:55 -07:00
Wayne Chen
647c4e1694 adding true fix for localhost timeouts 2018-09-13 13:51:42 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling 
Performance improvements for Avatar Mixer
 2018-09-13 13:43:18 -07:00
Wayne Chen
873859455a Revert "adding fix for getting DomainHandler into error state" 
This reverts commit 3fe3f674d0.
 2018-09-13 11:53:56 -07:00
Wayne Chen
380f24b37f adding fix, changing window title 2018-09-13 11:53:21 -07:00
Wayne Chen
96ab7d417e removing connection for on login failed 2018-09-13 10:35:43 -07:00
Wayne Chen
ad233677b8 adding changes for overriding host change for error state 2018-09-12 18:31:01 -07:00
Wayne Chen
3fe3f674d0 adding fix for getting DomainHandler into error state 2018-09-12 15:45:06 -07:00
Wayne Chen
49f26d968a adding fix for getting DomainHandler into error state 2018-09-12 15:42:55 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged 
Interstitial Page with 404 Redirect
 2018-09-12 08:39:52 -07:00
Wayne Chen
20cab87a17 Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-11 18:53:06 -07:00
Wayne Chen
a7321f950a pushing requested changes - adding timeout refusal 2018-09-11 18:32:17 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
Wayne Chen
8bca1bc5fe
reverting, oversight 2018-09-11 17:09:21 -07:00
Wayne Chen
a85a7a6119
adding back goToLastAddress back 2018-09-11 17:07:49 -07:00
Wayne Chen
490cdc901e
Merge pull request #3 from danteruiz/interstitalMerged 
making requested changes and fixing compile issue for jenkins
 2018-09-11 16:30:13 -07:00
Wayne Chen
0f25756908 expose domain connection error to Window 2018-09-11 16:29:39 -07:00
Dante Ruiz
c97d646083 making requested changes and fixing compile issue for jenkins 2018-09-11 15:57:44 -07:00
Wayne Chen
c194c236f1 adding inlines 2018-09-10 17:10:13 -07:00
Wayne Chen
e5a87aa58c removing unused variables 2018-09-10 16:56:13 -07:00
Wayne Chen
ff86e480ba adding debug statement to check for window close 2018-09-10 11:36:45 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling 2018-09-10 10:15:49 -07:00
David Rowe
7dba2e6a2e Merge branch 'master' into M17428-f 2018-09-08 12:45:11 +12:00
Wayne Chen
77bb6fa4d5 adding position to try again zone; updating whitespace 2018-09-05 11:53:49 -07:00
Wayne Chen
0be7a5ffaa
fixing typo in domain handler 2018-09-04 19:58:56 -07:00
SamGondelman
589e88af4a Merge remote-tracking branch 'upstream/master' into scriptvec3 2018-09-04 17:54:45 -07:00
Wayne Chen
9e0fa08cf1 adding property to location, updating domain 2018-09-04 17:46:23 -07:00
Simon Walton
7af69b5450 Check that a requested listened port is used in NodeList 2018-09-04 13:53:25 -07:00
Simon Walton
c2ea05b026 Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling 2018-09-04 09:31:05 -07:00
Wayne Chen
c95cb97b9b adding working version with networking signals 2018-08-31 19:29:48 -07:00
Wayne Chen
e3f5f4c55a Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect 2018-08-30 19:55:51 -07:00
Wayne Chen
82c7495615 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-30 19:41:06 -07:00
Wayne Chen
5f43f5b276 adding different method for handling redirect 2018-08-30 17:40:13 -07:00
Simon Walton
b45b0f54e4 Move unfilteredHandlers processing back into main loop 2018-08-30 11:59:53 -07:00
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
Simon Walton
9711076dae Use a queued signal for pending datagrams 2018-08-29 10:49:29 -07:00
Wayne Chen
6689c15564 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-28 19:22:34 -07:00
Wayne Chen
223f86108f adding debugging stuff 2018-08-28 17:34:48 -07:00
Wayne Chen
8a9ad421e7 adding serverless file + redirection if conn fail 2018-08-28 15:50:14 -07:00
David Rowe
e5c733e7f2 Merge branch 'master' into M17428-c 2018-08-29 08:20:00 +12:00
Stephen Birarda
7ddd70a84a
Merge pull request #13871 from birarda/bug/double-domain-connect 
force NodeList reset if DS changes session or local ID
 2018-08-27 11:59:24 -07:00
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3 2018-08-27 10:43:52 -07:00
Simon Walton
861d1e26a9 Remove unused variable 2018-08-24 18:02:28 -07:00
Simon Walton
bf839ca291 Handle _unfilteredHandlers first upon processing datagrams 2018-08-24 16:53:38 -07:00
Simon Walton
4392b3c2a8 Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling 2018-08-24 16:07:00 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
Stephen Birarda
cb4ce4fedb make sure settings are re-requested on new connection 2018-08-24 13:05:04 -07:00
Stephen Birarda
1263db5688 force NL reset if the domain changes session ID or local ID 2018-08-23 16:48:46 -07:00
Simon Walton
9dac399c20 Merge branch 'master' into avatar-mixer-scaling 2018-08-23 13:58:38 -07:00
John Conklin II
5dd64645eb
Merge pull request #13861 from SimonWalton-HiFi/safe-landing-fixes 
Fix safe-landing protocol for sparse domains
 2018-08-23 10:17:08 -07:00
Simon Walton
c0966d738e Use EntityVersion for the EntityQueryInitialResultsComplete packet 2018-08-22 16:40:49 -07:00
Simon Walton
c4b916af62 Just bump packet version for EntityQueryInitialResultsComplete 2018-08-22 16:22:30 -07:00
David Rowe
883479d654 Merge branch 'master' into M17428-c 2018-08-23 10:43:44 +12:00
Simon Walton
dd098f05c2 Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number 2018-08-22 14:54:07 -07:00
Simon Walton
d8d940b06a Cap datagrams-at-once processed; debugging output 2018-08-22 10:28:32 -07:00
Simon Walton
4084973cca Changes for linux compilation 2018-08-21 16:04:08 -07:00
Simon Walton
e867ae86f4 Split readPendingDatagrams() into two slots 2018-08-21 14:44:55 -07:00
Stephen Birarda
7d8db482a3 put back ExtendedIODevice ctor for ubuntu warning 2018-08-21 13:21:21 -07:00
Stephen Birarda
3e2d4dc696 fixes and improvments addressing CR comments 2018-08-21 10:53:52 -07:00
Stephen Birarda
e6b419d283 add instanced traits and migrate avatar entities 2018-08-21 10:31:15 -07:00
Stephen Birarda
be7eb57205 handle whitelist avatar URL override via traits 2018-08-21 10:31:14 -07:00
Stephen Birarda
a80d19a44a remove skeleton from identity, handle in clients 2018-08-21 10:31:14 -07:00
Stephen Birarda
26a1f03314 send traits in bulk to avatar mixer client 2018-08-21 10:31:14 -07:00
Stephen Birarda
f23a036f4a add node local ID retreivable from NodeData 2018-08-21 10:31:14 -07:00
Stephen Birarda
486557e28a initial trait packet sending on skeleton URL change 2018-08-21 10:31:14 -07:00
Sam Gondelman
f0986a7f5a Merge branch 'master' into scriptvec3 2018-08-20 10:56:45 -07:00
David Rowe
846f38584f Merge branch 'master' into M17428 2018-08-17 15:01:35 +12:00
John Conklin II
bbf6162361
Merge pull request #13632 from Atlante45/fix/udt-rtt 
Fix potential reliable connection lockup.
 2018-08-16 13:15:23 -07:00
David Rowe
a86fdeafc0 Merge branch 'master' into M17248-a 2018-08-16 10:38:30 +12:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
David Rowe
2a177e04e1 Misc. tweaks 2018-08-11 10:11:56 +12:00
David Rowe
38d8a9a2da Send messages locally if not connected to a domain 2018-08-11 07:00:50 +12:00
SamGondelman
fb75b42059 working on enabling bloom 2018-08-07 22:26:30 -07:00
John Conklin II
3a6a72a079
Merge pull request #13643 from SimonWalton-HiFi/user-setting-hmac 
Add DS option to disable HMAC packet authentication
 2018-08-03 17:45:32 -07:00
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3 2018-08-03 14:57:49 -07:00
John Conklin II
243bd5ea69
Merge pull request #13536 from SimonWalton-HiFi/script-engine-thread-agent 
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
 2018-08-03 13:32:11 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics 
Enable physics after ES indicates all nearby entities received
 2018-08-01 18:15:00 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244 
Move scriptable caches' APIs into scripting interfaces
 2018-08-01 11:50:13 -07:00
Simon Walton
ecfba312ef Merge remote-tracking branch 'upstream/master' into script-engine-thread-agent 2018-07-31 15:54:54 -07:00
Simon Walton
33a46a6a82 Make ThreadedAssignment::setFinished() protected 2018-07-31 15:46:43 -07:00
Simon Walton
64fc3e1091 ThreadedAssignment calls virtual stop() upon domain disconnect 2018-07-31 15:30:33 -07:00
SamGondelman
7c8d080050 Merge remote-tracking branch 'upstream/master' into scriptvec3 2018-07-31 14:04:23 -07:00
Simon Walton
a320308eaf Fix sequence number encoding issue 
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
 2018-07-31 13:54:22 -07:00
Seth Alves
4ff9252b47
Merge pull request #13718 from jherico/fix/fb15963 
Support rendering of 'about' URLs in web entities
 2018-07-31 09:44:31 -07:00
SamGondelman
2ca217eb4a merge with master 2018-07-30 17:43:15 -07:00
John Conklin II
6d7116fad7
Merge pull request #13676 from thoys/fix/api/agent 
MS15184: Remove deprecated functions in Agent API
 2018-07-30 14:48:10 -07:00
Brad Davis
c991053c93 Support rendering of 'about' URLs in web entities 2018-07-30 11:56:31 -07:00
John Conklin II
fc88165e23
Merge pull request #13696 from SamGondelman/particleRot 
Particles don't spin with head roll, new spin + rotateWithEntity properties
 2018-07-27 14:54:48 -07:00
David Rowe
baf88ab508 Revise scriptable resource caches' interfaces 2018-07-26 16:12:16 +12:00
David Rowe
16e06de9cd Move scriptable caches into scripting interfaces 
Removed non-working getResource() API functions.
 2018-07-25 22:10:14 +12:00
SamGondelman
4750611af9 particles don't spin with head roll, add particle spin properties, negative emitSpeed 2018-07-24 23:47:58 -07:00
Simon Walton
47e99cdeac Initial code for AC side of Enabling Physics plan 
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
 2018-07-24 16:50:37 -07:00
Stephen Birarda
0cd5a24233
Merge pull request #13677 from birarda/bug/no-socket-error-string 
remove thread-unsafe socket errorString call
 2018-07-24 16:16:25 -07:00
Stephen Birarda
8224492d72 avoid thread-unsafe socket errorString call 2018-07-24 12:24:01 -07:00
Thijs Wenker
e2d7431456 move agent scripting interface to its own class to get rid of deprecated API 2018-07-24 16:54:24 +02:00
Howard Stearns
49d9d61425
Merge pull request #13305 from howard-stearns/personal-space-bubble-off-for-new-users 
Personal space bubble is defaulted off for now for new users
 2018-07-23 12:29:00 -07:00
Clement
87daa55f0b Remove deprecated control packet types 2018-07-20 18:12:24 -07:00
Clement
9a1c4afbd8 More cleanup 2018-07-20 18:12:24 -07:00
Clement
0bfe2671dd Cleanup udt dead code 2018-07-20 18:12:24 -07:00
Simon Walton
d147d17b70 Update PacketType version for domain list 2018-07-19 10:04:29 -07:00
Simon Walton
5d13f6c030 Bump DomainListVersion for new protocol 2018-07-19 09:55:28 -07:00
Simon Walton
3002abeddc Add DS option to turn off packet authentication 2018-07-18 18:22:36 -07:00
Simon Walton
c1e6221391 Merge branch 'master' into script-engine-thread-agent 2018-07-13 10:06:49 -07:00
Sam Gondelman
b53772f9ca
Merge pull request #13431 from Cristo86/android_stop_downloads_bg 
Android - Prevent pending downloads to happen when going back to home
 2018-07-12 15:22:56 -07:00
SamGondelman
5bbd5b9e52 vec2 conversion 2018-07-10 16:32:49 -07:00
Simon Walton
1c23fc75a4 Emit finished signal from AC derived classes 
To avoid Agent destruction-in-use move emit finished from
setFinished to Agent methods. For other ACs emit from
aboutToFinish().
 2018-07-09 16:56:54 -07:00
Simon Walton
000423673e Don't explicitly destroy script engine; emit finished when actually finished 2018-07-09 13:30:44 -07:00
John Conklin II
e6801c303a
Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request 
Implement AvatarRequestIdentity and use if interface gets unknown avatar data
 2018-07-09 10:07:19 -07:00
Cristian Luis Duarte
be8351dc0d Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background 2018-07-06 20:43:52 -03:00
John Conklin II
01610a1520
Merge pull request #13559 from wayne-chen/fixCopyAddress-case-16444 
Fix AddressManager copyAddress/copyPath functionality
 2018-07-06 14:11:08 -07:00
Wayne Chen
0facbedbbc adding Q_INVOKABLE method for copying to Application clipboard 2018-07-06 11:03:58 -07:00
John Conklin II
f2d0f1ffbc
Merge pull request #13458 from SimonWalton-HiFi/aggressive-domain-checkins 
Send repeated check-in requests for greater resilience
 2018-07-06 10:58:46 -07:00
Simon Walton
33ae04f9ea Change sense of DomainHandler::checkInPacketTimeout() return value 2018-07-05 16:39:13 -07:00
Clément Brisset
f2a3907e3d
Merge pull request #13357 from SimonWalton-HiFi/memcheck-fixes 
Entity Script Server memory leak when taking down EntityTree
 2018-07-05 15:30:45 -07:00
Cristian Luis Duarte
a878ad5a33 Android - remove logs from pause/resume and pending requests 2018-07-05 14:58:55 -03:00
Cristian Luis Duarte
736fc41bb9 Android - Remove resume code that tries the next pending download as entering domains asks for resources anyway 2018-07-04 19:37:12 -03:00
Simon Walton
ec67b8ad56 Address reviewer comments 2018-07-03 15:31:34 -07:00
Cristian Duarte
6b5e5702dd Android - implement pause-resume of requests chain in ResourceCache 2018-07-02 20:05:59 -03:00
John Conklin II
3f975cfa84
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit 
Fix Mac Crashes On Shutdown
 2018-07-02 15:27:26 -07:00
Cristian Duarte
6b3a9def7a Merge branch 'hifi_master' into android_stop_downloads_bg 2018-07-02 17:37:40 -03:00
Stephen Birarda
dce9cb0404 fix case where TCP Vegas would not re-send lost ACK 2018-06-29 15:42:59 -07:00
sabrina-shanman
e4377a6c95 Prevent type conversion in ~ResourceManager constant 2018-06-29 10:55:01 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
70cab27c1a add a safeguard deleteLater for QNetworkReply 2018-06-27 11:41:37 -07:00
Stephen Birarda
24f92502b5 add warning output of error from AccountManager 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
Seth Alves
dcebbada28 fix various crashes-upon-exits 2018-06-26 10:08:44 -07:00
Simon Walton
b63515f42a Send multiple copies of domain check-in for greater resilience 
Also move domain-limit check to start of NodeList::sendDomainServerCheckIn().
 2018-06-25 14:36:50 -07:00