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

4944 commits

Author SHA1 Message Date
Howard Stearns
9d17c32ff4
Merge pull request #16309 from SimonWalton-HiFi/assignment-client-logging-for-paging 
DEV-2329: Identify Alerting requirements for Assignment Client reliable operation
 2019-10-08 15:35:22 -07:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
Simon Walton
f73a7c0883 Modified AC logging for paging requirements 2019-10-07 17:35:14 -07:00
Shannon Romano
24dc4b19ae
Merge pull request #16285 from SimonWalton-HiFi/domain-server-logging-for-paging 
DEV-2292: Alerting requirements for domain-server failure cases
 2019-10-04 14:01:56 -07:00
Simon Walton
db14cdbd22 Tweak 'critical' status for some logging 2019-10-04 09:56:35 -07:00
Simon Walton
d5d1c08da0 Adjust some of the logging 2019-10-03 16:50:24 -07:00
Simon Walton
59b41e29f4 Call out DS DS logging critical for Lilypad 2019-10-03 12:15:45 -07:00
Roxanne Skelly
fb8a0e3aee handle urls in the form of <domain>:<port>/path 2019-10-02 16:40:27 -07:00
Roxanne Skelly
9af7b904ab CR related fixes 2019-10-01 17:04:07 -07:00
Roxanne Skelly
0589cb360a Merge branch 'master' of https://github.com/highfidelity/hifi into dev1836 2019-10-01 15:38:02 -07:00
Roxanne Skelly
d0cb489247 DEV-1836 - handle urls in the form 'hifi://<domain>:<port> 2019-10-01 15:34:39 -07:00
Sam Gateau
1e2cab52b9 FIx an error, bad copy paste leading to a bug 2019-09-30 12:55:04 -07:00
Sam Gateau
8c9cf7bddd Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-27 19:01:19 -07:00
Howard Stearns
f513b65e9d
Merge pull request #16256 from SimonWalton-HiFi/supress-repeated-socket-logging 
BUGZ-1543: Suppress repeated socket logging
 2019-09-27 12:45:17 -07:00
Simon Walton
93a1cbdcf9 Use direct initialization instead of copy initialization for atomics 2019-09-26 16:45:29 -07:00
Simon Walton
f17a1c17f3 Only print Qt event-queue size on change of error code 2019-09-26 15:46:11 -07:00
Simon Walton
85c9f4d95f Use the FCDEBUG mechanism to throttle udt::Socket log-spam 2019-09-26 12:10:59 -07:00
Sam Gateau
675dbc3f7f Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-26 12:06:09 -07:00
Sam Gateau
9d999baab2 FIrst pass to clean up before pushing a pr: 2019-09-26 11:59:01 -07:00
Simon Walton
bbf43050b1
Merge pull request #16244 from SimonWalton-HiFi/connection-class-ignored-unused 
BUGZ-1503: Don't move unused Connection class upon address change
 2019-09-26 11:42:50 -07:00
Sam Gateau
ba11c3e702 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-25 17:54:21 -07:00
Atlante45
ff3f26eeae Limit the amount of account settings pull retries 2019-09-25 14:55:44 -07:00
Simon Walton
6d7f711990 Remove typo that somehow got into a comment 2019-09-25 09:33:49 -07:00
Sam Gateau
0d9cd69d94 SImplifying Page.js, and adding a REsourceInspector 2019-09-24 18:10:57 -07:00
Clement
5067729c52 Add flag for account settings feature 2019-09-24 17:40:34 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
Simon Walton
4f11e46b5e Don't move Connection class to changed address until it's used 2019-09-24 16:39:59 -07:00
Sam Gateau
69ccc47bda Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-23 18:59:20 -07:00
Sam Gateau
4480d56433 Rendering just the overlay layer and improving the resoruceCache inspector to sort 2019-09-20 19:00:03 -07:00
Clement
1924dad51b CR changes 2019-09-20 13:30:08 -07:00
Sam Gateau
ee5de175eb Better monitoring of the resource loading in flights 2019-09-19 16:56:55 -07:00
David Rowe
605d272392 Merge branch 'master' into DOC-111 2019-09-20 10:25:21 +12:00
Clement
282aa70db3 Sync settings on logout/shutdown 2019-09-19 13:45:34 -07:00
David Rowe
d5e08d19e3 Fix JSDoc for miscellaneous white space issues 2019-09-20 08:17:24 +12:00
Sam Gateau
a87db2636c SOme stuff workbetter 2019-09-18 18:25:42 -07:00
Clement
86196cfd62 Add account settings to the AccountManager 2019-09-17 18:48:14 -07:00
David Rowe
dff37a71eb Fix JSDoc markup HTML issues 2019-09-17 16:26:09 +12:00
Shannon Romano
36bc538354
Merge pull request #16181 from SimonWalton-HiFi/connection-addr-change-logic 
BUGZ-1432: Fix logic for address-change to address already being used
builds failing, now android is failing for nothing related to this PR
 2019-09-12 15:54:55 -07:00
Simon Walton
2d68cfa5e7 Use unique_lock::unlock() instead of unique_lock::release() 
... which actually has the opposite effect
 2019-09-12 12:04:24 -07:00
Shannon Romano
fa8c959699
Merge pull request #16133 from ctrlaltdavid/DOC-59 
DOC-59: Assets JSDoc
 2019-09-11 17:19:45 -07:00
Simon Walton
639beee6cb Fix logic for reliable service address-change when new add already used 2019-09-11 15:21:49 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc 
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
 2019-09-11 13:04:01 -07:00
Andrew Meadows
7a5cb0d555 fix typo 2019-09-06 17:23:38 -07:00
Andrew Meadows
e97d3df637 bump version number 2019-09-06 17:23:38 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
David Rowe
f384b79bf5 Merge branch 'master' into DOC-59 2019-09-04 15:47:23 +12:00
David Rowe
9457aed631 Tidying and polishing Assets JSDoc 2019-09-04 15:43:18 +12:00
David Rowe
8820d1d76b Assets API cache methods 2019-09-04 13:48:06 +12:00
Simon Walton
784903fe33 Use UTC with QDateTime rather than local time 2019-08-28 17:57:09 -07:00
Simon Walton
d9558e35c3 Fix typo in last commit; remove useless call of getGuessedLocalAddress; logging tweak 2019-08-23 13:19:31 -07:00
Simon Walton
6a9e299981 Prefer non-link-local interface addresses; don't change port on initial address change from TCP probe 2019-08-22 17:34:41 -07:00
David Rowe
2ad1d7a2a2 Fix typos 2019-08-22 10:27:17 +12:00
David Rowe
11e72c638b Assets API compression methods JSDoc 2019-08-22 09:47:25 +12:00
David Rowe
5f3081784c Assets API methods that include mappings JSDoc 2019-08-21 12:36:37 +12:00
Roxanne Skelly
8ac185af11 Additional Grapics API info was added to the system info, which 
overflowed the amount of info that could be sent in a packet.
 2019-08-20 16:33:29 -07:00
David Rowe
817bc6cd43 Assets API base functionality JSDoc 2019-08-21 09:50:23 +12:00
Simon Walton
dbc2a67758 Log event-queue size on readRead timeout 2019-08-09 09:46:09 -07:00
Simon Walton
77740f1a63 Report no. of packets dropped in checkForReadyReadBackup() 2019-08-08 09:57:00 -07:00
Roxanne Skelly
2e5127fa98 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz1046 2019-08-07 10:40:23 -07:00
Kalila R
28b27a1e48 Merge branch 'v0.83.0-rc' into kasen/core 2019-08-03 15:27:23 -04:00
MiladNazeri
ae7b415152
Merge pull request #16008 from HifiExperiments/text 
Supporting text effects + fonts on Text Entities
 2019-08-02 14:25:28 -07:00
Ken Cooke
0b97f2bbc0 Track the desired audio-mixer gains when not connected 2019-08-02 07:14:43 -07:00
Roxanne Skelly
a991b6d619 BUGZ-1046 - send entity packets reliably for initial query 2019-07-31 16:59:21 -07:00
HifiExperiments
078ca7edea supporting text effects + fonts on text entities 2019-07-30 09:59:45 -07:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
Ryan Huffman
2ec87f4e61 Add serverless tutorial 2019-07-24 16:38:03 -07:00
Roxanne Skelly
4f9d62696c DEV-262 - Improve logging on failure to load resource 2019-07-17 12:58:17 -07:00
Shannon Romano
53a67dcfa9
Merge pull request #15872 from SamGondelman/bias 
DEV-202: Expose shadow bias and max distance to Zone Entity
 2019-07-16 15:22:37 -07:00
kasenvr
e9e9607a3b modkit core changes initial commit 
whitespace corrections + warnings
updated cmake plugin
rework with focus on JS API integration example
cleanup edit_filter scope
separate-out edit_filter wantsScope stuff
-plugin metadata
split scriptengines out separately
cleanup __url/__filename sets
additional cleanup
fix typo; consolidate ScriptInitializerMixin inits
add more example API protoypes
cleanup pass; fix entity_server / agent init
fix whitespace
remove technically unnessary plugin filtering
+EDIT_FILTER_SCRIPT; cleanup
reorder public/slot/private
use std::count_if
formatting
better debug output; cleanup
fix msvc compiler warning
cleanup
eradicate QtScript references from API Example
updated header comments
Updated KasenAPIExample
 2019-07-14 21:35:13 -04:00
Shannon Romano
74b830dd12
Merge pull request #15912 from SimonWalton-HiFi/early-rsa-keygen 
BUGZ-918: Generate RSA key-pair early in start-up
 2019-07-12 09:42:11 -07:00
SamGondelman
6ce809fb2a merge with master 2019-07-11 09:01:30 -07:00
Simon Walton
645a99c200 Generate RSA key-pair early in start-up 2019-07-10 17:36:25 -07:00
Howard Stearns
084b2edad4
Merge pull request #15908 from SimonWalton-HiFi/keygen-thread-logging 
BUGZ-918: Verbose RSA-keypair logging
 2019-07-10 15:57:30 -07:00
Simon Walton
7a64ed10f6 Verbose RSA-keypair logging 2019-07-10 15:08:51 -07:00
SamGondelman
29dbbc49ad Merge remote-tracking branch 'upstream/master' into bias 2019-07-09 15:38:13 -07:00
Howard Stearns
335119cb58 log wakeup (on client and report to DS) during connection on Windows 2019-07-08 16:50:36 -07:00
Sam Gondelman
0d9f639331
Merge branch 'master' into bias 2019-07-03 10:20:16 -07:00
Sam Gateau
1a71a63a8b
Merge pull request #15867 from SamGondelman/unlit 
BUGZ-661: Add unlit property to text entities
 2019-07-03 18:43:26 +02:00
SamGondelman
692c776be5 expose shadow bias and max distance wip 2019-07-02 15:18:28 -07:00
SamGondelman
fa416adaf6 adding unlit property to text, fixing transparency, normals, other cleanup 2019-07-02 10:28:36 -07:00
Shannon Romano
df34e2f86d
Merge pull request #15864 from hyperlogic/bug-fix/dependency-manager-shutdown-issues 
Fix for DependencyManager crash on shutdown on Mac
 2019-07-02 08:24:11 -07:00
Anthony Thibault
6c66f5a37b Fix for DependencyManager crash on shutdown on Mac 
On Mac, it is possible to crash when shutting down, it is not clear if this is due to
shutting down the app on another thread during logout or something that can happen
during normal shutdown, because it is so difficult to reproduce.

However, from looking at the stack traces it is possible for a [NSApplication terminate:]
event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning()
This causes AppKit to invoke the static destructors too early.  Which in turn, causes the
DependencyManager destructor to fire while there are still many dependencies running.
Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown
in an incorrect order.

To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible,
in the Application destructor. Theoretically, this will be a safe time for the static destructors
to be invoked, because it is after all of the DependencyManager's dependencies have been
manually destroyed.

However, this is only a speculative fix, because this is so difficult to reproduce.
 2019-07-01 17:37:57 -07:00
Simon Walton
6253adf749 Hook-up remote address-change to Connection class 2019-07-01 16:36:05 -07:00
Simon Walton
225f65f4fb Log message tweaks 
Also don't need std in std::move, somehow.
 2019-06-28 11:30:09 -07:00
Simon Walton
9b894456e9 Change address for sequence-number hash also 2019-06-27 17:29:17 -07:00
Simon Walton
1265531f79 Plumb down change of destination address 2019-06-27 15:52:39 -07:00
Simon Walton
50965f1916 Handle remote public-address changes 2019-06-26 18:04:41 -07:00
Simon Walton
b4e1c2264c Use a queued signal to quit from AccountManager::saveLoginStatus() 2019-06-25 14:47:58 -07:00
Roxanne Skelly
c5883a8d67 CR fixes 2019-06-24 14:58:06 -07:00
Roxanne Skelly
e39ccff873 BUGZ-812 - Log system info on domain connect or connect refusal 2019-06-24 11:59:57 -07:00
Shannon Romano
c7a5d35436
Merge pull request #15799 from roxanneskelly/bugz516a 
BUGZ-516 - add OS type to connect message for logging
 2019-06-19 16:08:13 -07:00
Roxanne Skelly
2ed5e8aefb add OS type to connect message 2019-06-19 13:53:38 -07:00
Howard Stearns
ff1d828aaa
Merge pull request #15794 from SimonWalton-HiFi/limit-stats-dump-rate 
Limit the stats-dump rate on packet error
 2019-06-19 11:14:48 -07:00
Simon Walton
b95515933f
Merge pull request #15708 from SimonWalton-HiFi/stun-on-iface-change 
Force new IP port on local address change
 2019-06-19 10:12:36 -07:00
Simon Walton
7d80852544 Reduce reporting period to 1 s 2019-06-18 16:06:47 -07:00
Simon Walton
06b00e93ae Limit the stats-dump on packet error 2019-06-18 15:43:14 -07:00
Simon Walton
cfcea359b2 Handle local address changes for servers 2019-06-14 16:51:59 -07:00
Roxanne Skelly
1b31b8cff8 CR fixes 2019-06-14 13:23:33 -07:00
Roxanne Skelly
2be828a84c Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-14 11:24:03 -07:00
Roxanne Skelly
5b6911efa4 log username with "haven't heard from" messages 
remove rebind on silent domain checkin
 2019-06-14 10:45:18 -07:00
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