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
Simon Walton
dafd97b6f4
Duplicate domain check-ins after timeouts
2018-06-22 18:21:32 -07:00
Simon Walton
3775bdc335
Move PacketType::AvatarIdentityRequest so as to not break ICE
2018-06-22 17:20:43 -07:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix
2018-06-21 17:32:24 -07:00
Sam Gondelman
afc64a18a1
Merge pull request #13362 from SamGondelman/modelTextures
...
Fix transparent textures rendering wrong sometimes
2018-06-21 14:23:49 -07:00
Cristian Luis Duarte
3837952418
Android - Add a clear method on pending downloads and use it when going background
2018-06-20 18:29:04 -03:00
Simon Walton
5bf075457c
Add avatar identity request packet
2018-06-19 10:21:30 -07:00
Andrew Meadows
6d422e4678
Merge 'master' into 'workload'
2018-06-18 10:30:13 -07:00
SamGondelman
9ea65950d5
particles: threadsafe, cleanup, rework initialized logic
2018-06-15 15:45:06 -07:00
Sam Gondelman
225a98129a
Merge branch 'master' into modelTextures
2018-06-15 15:09:32 -07:00
Andrew Meadows
be0899c41d
remove unnecessary writes to appease Xcode's static analyzer
2018-06-15 11:44:22 -07:00
John Conklin II
d66ed07061
Merge pull request #12901 from kitely/fix-banning-users
...
Fixed banning users
2018-06-14 09:33:28 -07:00
SamGondelman
5ac7ced306
cleanup renderable model entity item, fix crash on reload, fix different transparent bug
2018-06-13 17:14:52 -07:00
John Conklin II
0ba97fa83b
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags
...
Scripted Blendshapes and Procedural Face Movement Flags
2018-06-13 10:32:59 -07:00
Anthony J. Thibault
042f902d2e
Merge branch 'master' into scriptedBlendshapesFaceFlags
2018-06-11 17:13:30 -07:00
Stephen Birarda
b41c80f31e
Merge pull request #13221 from huffman/feat/oven-cli-texture-options
...
Add more texture options to Oven CLI
2018-06-11 12:01:56 -07:00
John Conklin II
6794fedf5b
Merge pull request #13337 from ctrlaltdavid/21887
...
Don't save user location if not connected to domain
2018-06-11 11:09:57 -07:00
Simon Walton
740ccd3495
Merge branch 'master' into memcheck-fixes
2018-06-08 14:21:57 -07:00
Sam Gondelman
4e649d2498
Merge pull request #13276 from SamGondelman/resource
...
Protect against null resource
2018-06-08 11:35:04 -07:00
Simon Walton
131a57248b
NLPacket local ID could be used uninitialized (according to valgrind)
2018-06-08 10:27:03 -07:00
David Rowe
8e1e93abb0
Don't save user location if not connected to domain
2018-06-08 15:04:01 +12:00
amantley
3f58202667
updated the AvatarMixerPacketVersion to ProceduralFaceMovementFlagsAndBlendshapes in PacketHeaders.cpp
2018-06-07 17:41:12 -07:00
David Back
afd4b5a8ab
update default avatar to fix non-flat feet
2018-06-06 11:48:04 -07:00
howard-stearns
65e3652b9f
Personal space bubble is defaulted off for now.
2018-06-05 11:47:44 -07:00
Andrew Meadows
4329ea5240
Merge master' into 'workload'
2018-06-04 16:11:25 -07:00
Andrew Meadows
8eedf83f70
increment packet version for workload logic
2018-06-04 15:23:31 -07:00
John Conklin II
611159f65f
Merge pull request #13188 from SimonWalton-HiFi/placename-crash
...
Initialize Qt's use of openssl lib before calling RSA code
2018-05-31 14:34:24 -07:00
SamGondelman
1470170296
lock weak resource
2018-05-31 11:54:37 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache
...
Shader load time performance optimiziations
2018-05-30 13:55:34 -07:00
Simon Walton
a3324c5616
Remove empty destructor
2018-05-30 13:52:26 -07:00
Simon Walton
8fb5d1b92d
Make RSA key-pair class a Runnable that's owned by a threadpool
2018-05-30 13:41:08 -07:00
Simon Walton
66d39667e1
AccountManager destructor waits for any RSA key thread
2018-05-29 17:04:37 -07:00
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c
...
JSDoc fixes
2018-05-24 16:44:55 -07:00
Bradley Austin Davis
3beb77694f
Cached shader binaries and uniform data for shaders
2018-05-24 12:42:33 -07:00
Andrew Meadows
885c7bc97d
bump protocol for extra byte in collisionMask
2018-05-24 11:28:52 -07:00
John Conklin II
3e665fb616
Merge pull request #13179 from dback2/cloneables
...
Server-Managed Cloneables + Cloneable Properties
2018-05-23 12:40:27 -07:00
Ryan Huffman
59ca2f9977
Fix ResourceManager not properly shutting down thread
2018-05-23 10:51:12 -07:00
Liv Erickson
56493346c1
fix permissions check
2018-05-22 15:41:48 -07:00
Liv Erickson
0ebd13b3e6
cannot edit origin from client / fix ICE issue
2018-05-22 13:17:23 -07:00
David Rowe
fa54461788
Update some recent JSDoc additions
2018-05-22 08:52:39 +12:00
John Conklin II
168edb1cde
Merge pull request #13192 from druiz17/fix-spaming-set-host
...
fix case sensitive comparison in AddressManager::setHost
2018-05-21 11:16:18 -07:00
David Rowe
e44e7ca35f
Fix up Resource and resource cache APIs' JSDoc
2018-05-21 11:57:16 +12:00
David Rowe
6d4f704279
Regularize some JSDoc usage
2018-05-21 09:32:10 +12:00
Dante Ruiz
027d1ed50b
making requested changes
2018-05-18 11:07:11 -07:00
Liv Erickson
de05388ebf
Merge branch 'master' of github.com:highfidelity/hifi into clone-server
2018-05-18 10:42:26 -07:00
Simon Walton
545ada0abb
Connect signal to keyGen thread for it to quit when owner destructed
2018-05-18 10:28:52 -07:00
Dante Ruiz
48404d811c
fix case sensitive comparison
2018-05-17 16:34:52 -07:00
Simon Walton
fe92cf0c47
Move fix up a level to bit a little more general
2018-05-17 13:34:38 -07:00
David Rowe
2669a39e0f
Deprecate Agent API items that shouldn't be exposed in the API
2018-05-18 07:32:25 +12:00
Simon Walton
86a8672c5a
Initialize Qt/openssl before RSA keygen to prevent collision
2018-05-17 10:17:22 -07:00
David Rowe
6db4dd8673
Merge branch 'master' into 21872-b
...
# Conflicts:
# interface/src/ui/Snapshot.h
2018-05-17 20:11:14 +12:00
David Back
f8fc7bedd7
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
2018-05-15 17:31:43 -07:00
John Conklin II
aca261af3e
Merge pull request #12939 from Cristo86/android_places_goto
...
Android Search & Go To
2018-05-15 16:43:38 -07:00
David Rowe
1ca6bd2f0b
location getter/setter JSDoc
2018-05-15 17:37:45 +12:00
David Rowe
8ea3a733ca
Resource API JSDoc stub
2018-05-15 10:32:36 +12:00
David Rowe
b445371ad8
Resources API JSDoc stubs
2018-05-12 16:24:34 +12:00
David Back
3031bb05be
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
2018-05-11 17:54:20 -07:00
David Rowe
cf9053c873
Merge branch 'master' into 21872-b
2018-05-12 10:50:31 +12:00
Gabriel Calero
9b5da09dc7
Fix connection issue syncing two AccountManagers
2018-05-11 18:08:56 -03:00
Stephen Birarda
4f7ce7345d
Merge pull request #13045 from SimonWalton-HiFi/domain-checkins-tweak
...
Reset pending domain check-in count more frequently
2018-05-11 13:31:03 -07:00
David Back
65bda27ae3
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
2018-05-11 13:03:27 -07:00
David Rowe
3891ebe703
Agent API JSDoc stubs
2018-05-11 20:20:07 +12:00
John Conklin II
bc9e403ab9
Merge pull request #13005 from SimonWalton-HiFi/hmac-auth2
...
Use HMAC authentication for network packets - 2nd attempt
2018-05-10 14:38:18 -07:00
David Back
3241c18271
first pass cloneables WIP
2018-05-09 18:10:40 -07:00
Simon Walton
9b6225db40
Bump default packet version 20 -> 21
2018-05-09 14:29:10 -07:00
Simon Walton
0349847857
Add comment re threading issues
2018-05-08 17:46:25 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking
...
Add support for client texture selection
2018-05-04 16:14:43 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist
...
Multifrustum queries punchlist
2018-05-04 15:50:44 -07:00
Simon Walton
00d2f9494b
Change HMACAuth::calculateHash to just call existing methods
2018-05-04 15:07:20 -07:00
Ryan Huffman
e1d218bb57
Bump asset packet version for texture meta
2018-05-04 11:25:11 -07:00
Stephen Birarda
8ded6c76ec
Merge pull request #13069 from ctrlaltdavid/21729-a
...
Remove deprecated location.domainId from API
2018-05-04 10:35:41 -07:00
Stephen Birarda
8c6d83ad67
Merge pull request #13023 from SimonWalton-HiFi/connection-stats-dump
...
Add a utility function to dump ConnectionStats
2018-05-04 10:19:25 -07:00
Clement
d7e9fdc6a4
Bump Avatar Query packet version
2018-05-03 18:19:29 -07:00
Clement
67c119cd2e
Send Entity Query via conical frustums
2018-05-03 18:19:29 -07:00
Clement
e400eb4ed2
Rename ViewFrustum packets to AvatarQuery
2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av
...
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam
...
Add support for multifrustum entity queries
2018-05-03 18:13:51 -07:00
John Conklin II
7d424edd9b
Merge pull request #13092 from Atlante45/fix/asan-warning
...
Fix uninitialized boolean (asan warning)
2018-05-03 15:46:37 -07:00
Clement
cefb8457ea
Fix uninitialized boolean
2018-05-03 11:17:31 -07:00
David Rowe
e95c38d939
Merge branch 'master' into 21856-g
...
# Conflicts:
# libraries/model-networking/src/model-networking/TextureCache.h
2018-05-03 21:03:14 +12:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d
...
List which contexts each namespace and class is available in
2018-05-03 01:29:14 -07:00
Ryan Huffman
697fde4a1a
Cleanup meta texture related changes
2018-05-02 13:31:32 -07:00
Gabriel Calero
c15ef56d90
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-05-02 14:38:10 -03:00
Ken Cooke
a4105f1081
Merge pull request #13052 from kitely/fix-gcc-warnings
...
Eliminated warnings in gcc
2018-05-02 06:43:32 -07:00
Oren Hurvitz
26ffb3213c
Changed "[[gnu::fallthrough]]" to "// FALLTHRU"
2018-05-02 07:06:47 +01:00
David Rowe
48632be3c2
Fix up cache APIs' JSDoc
2018-05-02 16:12:48 +12:00
Clement
2ad948c462
Bump ViewFrustum packet version
2018-05-01 18:03:21 -07:00
Clement
30d14dcd45
Push packet version
2018-05-01 18:02:29 -07:00
Stephen Birarda
12f7dd93dc
Merge pull request #13068 from birarda/67-to-master
...
merge RC67 back to master
2018-05-01 17:24:46 -07:00
Simon Walton
bbcb07d9ab
Brute force it with isDomainServer()
2018-05-01 15:07:44 -07:00
Simon Walton
0627099667
In packetSourceAndHashMatchAndTrackBandwidth() check LocalID after check for DS source
...
Makes check more robust in case domain server itself reaches this point,
since LimitedNodeList::getDomainLocalID() debug-asserts.
2018-05-01 14:33:48 -07:00
David Rowe
0653f49efe
Remove deprecated location.domainId from API
...
location.domainID is available, instead.
2018-05-02 09:31:24 +12:00
Stephen Birarda
f5441c05b3
Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master
2018-05-01 14:18:24 -07:00
Ryan Huffman
24ac342c6b
Add support for client texture selection
2018-05-01 14:11:31 -07:00
David Rowe
1aa28b7f54
Merge remote-tracking branch 'upstream/master' into 21856-d
...
# Conflicts:
# interface/src/LODManager.h
2018-05-02 07:50:55 +12:00
Stephen Birarda
24dc1c930e
Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67
2018-05-01 10:54:35 -07:00
Simon Walton
cfc5892d63
Only clear check-in count on Domain Query related responses
2018-04-30 13:41:56 -07:00
Stephen Birarda
ed47cd8458
add a missing unsafe_erase for local node ID map
2018-04-30 12:35:48 -07:00
John Conklin II
ed39b4f63e
Merge pull request #13014 from druiz17/fix-localhost-port
...
hide default port from addresses, fix localhost scheme
2018-04-30 10:10:06 -07:00
Oren Hurvitz
a226790295
Eliminated warnings in gcc
...
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
2018-04-30 15:05:27 +03:00
David Rowe
2cc3ed6287
List which contexts each namespace and object is available in
2018-04-28 20:00:28 +12:00
Simon Walton
bfbded7bec
Reset pending domain checkins in more locations
2018-04-27 16:57:24 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging
...
Quiet logging
2018-04-27 14:59:38 -07:00
Stephen Birarda
5324ea6d5d
Merge pull request #13038 from highfidelity/stable
...
Merge stable to RC66.2
2018-04-27 14:42:28 -07:00
Simon Walton
1448f3959e
Add a utility function to dump ConnectionStats
2018-04-26 17:11:17 -07:00
MiladNazeri
098b432fd9
Merge pull request #13011 from ctrlaltdavid/21856-a
...
Docs to JSDoc review updates
2018-04-26 13:29:48 -07:00
Stephen Birarda
c8d7dc9b91
hide default port from addresses, fix localhost scheme
2018-04-26 13:29:26 -07:00
Stephen Birarda
97d793f867
hide default port from addresses, fix localhost scheme
2018-04-26 13:25:56 -07:00
Stephen Birarda
9f25103b09
Merge pull request #12972 from sethalves/fix-linux-clang-build
...
fix linux clang build
2018-04-26 10:46:51 -07:00
David Rowe
08dc9b133f
Docs to JSDoc review
2018-04-26 21:10:28 +12:00
Simon Walton
9ef56c44a3
Merge PR12964 to not use verification if not keyed
...
https://github.com/highfidelity/hifi/pull/12964
2018-04-25 17:08:08 -07:00
Simon Walton
66bd424ae4
Bump default packet version for new HMAC
2018-04-25 14:51:11 -07:00
Simon Walton
4fa11f116f
Add & use HMACAuth method that calculates hash atomically
...
To avoid issues with race conditions involving separate
addData() and result() calls use a method that does
both in the lock.
2018-04-25 14:41:16 -07:00
Stephen Birarda
956cc411d5
Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback
2018-04-25 14:33:23 -07:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate
...
Docs/docs to js docs update
2018-04-25 12:26:19 -07:00
Simon Walton
21a9525a73
Version of HMACAuth with exposed lock
...
Client is responsible for locking between adding and
retrieving. Fixes a likely race.
2018-04-24 17:52:12 -07:00
Brad Hefta-Gaub
e6f15c720f
Merge pull request #12973 from birarda/bug/no-node-stats
...
66.1: fix connection to start stats sending for assignments
2018-04-24 13:23:39 -07:00
milad nazeri
23d07fa292
fixed spacing issue
2018-04-24 13:14:55 -07:00
Stephen Birarda
63491588cb
Revert "Merge pull request #12690 from SimonWalton-HiFi/hmac-auth"
...
This reverts commit 7378c87ade92bf99f436
2018-04-24 12:44:51 -07:00
milad nazeri
1121fe8da0
fix tabs
2018-04-23 21:47:53 -07:00
John Conklin II
91197cadcf
Merge pull request #12967 from SimonWalton-HiFi/hmac-shortid-merge-fix
...
Fix for null sourceNode use
2018-04-23 14:11:06 -07:00
Stephen Birarda
a6509f5ea7
fix connection to start stats sending for assignments
2018-04-23 13:25:18 -07:00
Seth Alves
6d8f769cf8
fix linux clang build
2018-04-23 13:18:36 -07:00
Stephen Birarda
779386fbc4
fix setting of domain local ID from domain list
2018-04-23 12:29:02 -07:00
Simon Walton
f849d6f937
Change packetSourceAndHashMatchAndTrackBandwidth logging in same manner
2018-04-23 12:26:02 -07:00
Gabriel Calero
001cd5e937
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-23 14:25:26 -03:00
milad nazeri
4ac06fe99f
Updating previous jsdocs
2018-04-22 22:22:33 -07:00
milad nazeri
e9b9c05b5d
removed cruft
2018-04-22 08:51:47 -07:00
Seth Alves
6fc02638d7
control verbose logging with a menu-item in developer menu
2018-04-20 16:08:57 -07:00
Simon Walton
9f9a68188d
Merge remote-tracking branch 'upstream/master' into short-id
2018-04-20 11:10:21 -07:00
Seth Alves
512b1911eb
Merge pull request #12858 from ctrlaltdavid/21836
...
Update location.hostname JSDoc per serverless domains
2018-04-20 10:27:09 -07:00
John Conklin II
7378c87ade
Merge pull request #12690 from SimonWalton-HiFi/hmac-auth
...
Change packet authentication to use HMAC
2018-04-20 09:54:25 -07:00
John Conklin II
92bf99f436
Merge pull request #12786 from huffman/fix/node-list-connections
...
Fix avatars not coming back when briefly disconnected from avatar mixer
2018-04-20 09:53:50 -07:00
Ryan Huffman
9cf133cff2
Increase packet version for Ping
2018-04-20 08:25:57 -07:00
Ryan Huffman
5bd89159dd
Update variable naming in NodeList from Id to ID
2018-04-20 08:25:52 -07:00
Ryan Huffman
a930e39bd4
Fix nodelist connections not resetting on both ends
...
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
2018-04-20 08:25:45 -07:00
Simon Walton
377fc6d6c6
Revert to old packet version for ICE packets
...
Some ICE (& STUN) packets were using the default version,
which we bumped for the HMAC change. This commit breaks
out the switch for them and reverts to 17.
2018-04-19 16:55:32 -07:00
Gabriel Calero
adfbaac18f
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-19 19:40:00 -03:00
David Rowe
8ade4f34f4
Tweak wording
2018-04-20 10:11:01 +12:00
David Rowe
0552a7242a
Further JSDoc updates for serverless domains
2018-04-20 09:52:35 +12:00
David Rowe
08defea755
Merge branch 'master' into 21836
2018-04-20 09:20:56 +12:00
Ryan Huffman
bef4eb1d05
Increase packet version for Ping
2018-04-19 14:04:17 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
Clément Brisset
482f8ddbff
Merge pull request #12913 from birarda/bug/login-no-perms
...
delay NL reset on login until new username is known
2018-04-18 13:31:56 -07:00
Simon Walton
01c39d4310
Use NULL_LOCAL_ID in more places, as requested by review
2018-04-18 11:53:47 -07:00
Oren Hurvitz
de0ea15f0a
Fixed based on PR review
2018-04-18 10:26:55 +03:00
Stephen Birarda
95c172f418
Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66
2018-04-17 15:34:46 -07:00
Seth Alves
515c185887
don't call setPort on hifi urls when port is 0 (unset)
2018-04-16 19:10:16 -07:00
Stephen Birarda
898d61fcf7
delay NL reset on login until new username known
2018-04-16 17:45:05 -07:00
Ryan Huffman
e9d2912576
Update variable naming in NodeList from Id to ID
2018-04-16 12:03:58 -07:00
Gabriel Calero
e3b94b163c
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-16 14:55:16 -03:00
Oren Hurvitz
e610443353
Fixed banning users: it didn't work because we tried to send a Reliable packet using sendUnreliablePacket()
2018-04-16 15:36:37 +03:00
Seth Alves
426d18ed2a
code review
2018-04-13 13:20:06 -07:00
Seth Alves
a56f3f4a10
code review
2018-04-12 19:06:12 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate
...
Migrate materials from userData to materialData
2018-04-12 18:24:33 -07:00
