Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 18:23:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
78342 commits 75 branches 59 tags 1.2 GiB
Commit graph

4418 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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