Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature
...
MS20311: Oculus login feature
2019-01-25 16:16:32 -08:00
SamGondelman
a10f52c66d
merge with master
2019-01-25 14:16:07 -08:00
Roxanne Skelly
49e6120e73
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-25 14:06:44 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature
2019-01-25 11:44:14 -08:00
Roxanne Skelly
cfaf01b22a
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-24 17:21:16 -08:00
Roxanne Skelly
c1ff51a02d
QML Marketplace
...
Checkpoint full functionality
2019-01-24 17:20:42 -08:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9
...
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
2019-01-24 14:36:27 -08:00
SamGondelman
9a734b2011
merge with master
2019-01-23 17:48:24 -08:00
SamGondelman
ac513df103
ring gizmo entities
2019-01-23 17:46:04 -08:00
John Conklin II
1768d91780
Merge pull request #14733 from hyperlogic/bug-fix/translation-precision
...
Avatar Protocol: Fix for precision issues with translation
2019-01-23 14:07:58 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter
...
Limit upstream bandwidth to the Avatar Mixer
2019-01-18 13:32:03 -08:00
Anthony Thibault
286f23d512
Updated protocol version and fixed bugs
2019-01-17 15:19:54 -08:00
Wayne Chen
ef63213d28
fixing linking account problems on oculus/steam, changing callback
2019-01-16 21:07:54 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature
2019-01-16 17:24:22 -08:00
Wayne Chen
116a15afe8
removing oculus userID to server - no need
2019-01-16 17:15:40 -08:00
Wayne Chen
8e916ea41b
linking oculus acct creation to spinner
2019-01-16 17:05:59 -08:00
Wayne Chen
2d16e71e74
adding sending oculus ID including username
2019-01-16 17:05:52 -08:00
Wayne Chen
6bc1164d58
more wip on oculus login
2019-01-16 17:05:50 -08:00
Wayne Chen
970798705c
improving flow from Oculus API to login dialog wip
2019-01-16 17:05:48 -08:00
Wayne Chen
1af57bdba6
staging
2019-01-16 17:05:48 -08:00
SamGondelman
611998f799
add pulse group properties to shapes, particles, text, web, image, and grid
2019-01-16 13:34:10 -08:00
Simon Walton
024cb70fce
Change member-initializer order to fix warnings
2019-01-16 12:58:13 -08:00
Simon Walton
b53fcb2c3d
Pass udt::Socket pointer in initializer-list for udt::Connection
2019-01-16 12:08:02 -08:00
Clement
6bd6c45b60
Remove dead IdentityRequest code
2019-01-15 11:40:08 -08:00
Seth Alves
2ef47304ba
Merge pull request #14558 from AndrewMeadows/faster-avatar-entities
...
case 20020: faster avatar entities
2019-01-11 14:13:05 -08:00
SamGondelman
4b67a79561
more web entity wip
2019-01-11 09:57:42 -08:00
John Conklin II
83cb60f46f
Merge pull request #14621 from birarda/feat/message-cycle-cap
...
cap the number of considered message channels in PacketQueue
2019-01-09 17:43:36 -08:00
Andrew Meadows
9b253690db
bump packet version number
2019-01-09 17:28:00 -08:00
John Conklin II
2757590158
Merge pull request #14633 from roxanneskelly/Case20377
...
Trait-level flow control
2019-01-09 15:57:13 -08:00
Shannon Romano
87f966773c
Merge pull request #14601 from SimonWalton-HiFi/reliable-service-min-timeout
...
Set minimum timeout for retransmits within reliable network service
2019-01-09 15:35:40 -08:00
birarda
3c6b7e3bd0
add a cap to cycled message channels in SendQueue
2019-01-09 13:06:30 -08:00
SamGondelman
10068cc42c
merge with master
2019-01-08 12:14:32 -08:00
SamGondelman
1b5c1d0677
working on primitiveMode and groupCulled
2019-01-08 10:02:03 -08:00
Roxanne Skelly
d54fec4476
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-07 18:17:40 -08:00
SamGondelman
f60b272f11
fix crash
2019-01-07 17:24:07 -08:00
SamGondelman
3341d75eda
merge with master
2019-01-07 15:49:16 -08:00
SamGondelman
b609cfaa2b
renderLayer
2019-01-07 15:43:35 -08:00
Sam Gondelman
db3187ec6c
Merge branch 'master' into propFix
2019-01-07 14:57:38 -08:00
Adam Smith
7e75ed5daa
Merge pull request #14586 from SamGondelman/NOverlays8
...
Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera
2019-01-07 14:53:27 -08:00
Simon Walton
c88af5c4be
Merge branch 'master' into reliable-service-min-timeout
2019-01-07 13:28:13 -08:00
Roxanne Skelly
37d4846722
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-07 11:56:48 -08:00
Shannon Romano
6eaec12df7
Merge pull request #14658 from Atlante45/feat/stats
...
Only keep aggregated thread stats for Avatar Mixer
2019-01-07 10:17:26 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption
...
Add menu checkbox to toggle collisions with other avatars
2019-01-07 08:58:09 -08:00
Roxanne Skelly
6d791a80c2
Bump protocol version for BulkAvatarTraits and add some guard code
...
around packet parsing.
2019-01-04 19:04:01 -08:00
Shannon Romano
4e5d275768
Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager
...
MS19925: Avatar Packager
2019-01-04 16:22:06 -08:00
luiscuenca
d630fe9dbd
Add menu checkbox to toggle collisions with other avatars
2019-01-04 16:38:48 -07:00
Thijs Wenker
94146ab997
CR fixes
2019-01-04 23:59:22 +01:00
Clement
cfbb4e29d1
Only keep aggregated thread stats
2019-01-04 14:51:58 -08:00
SamGondelman
1452d237e2
trying to fix avatar entity issue
2019-01-04 14:34:46 -08:00
Shannon Romano
3faf12b141
Merge pull request #14637 from howard-stearns/data-url-for-web-entity
...
data url for web entity
2019-01-04 14:21:55 -08:00
Roxanne Skelly
4f9cce1ea9
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-04 13:46:45 -08:00
Thijs Wenker
b105607cb2
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-04 21:13:29 +01:00
Thijs Wenker
a3f72a7a08
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2019-01-04 21:10:35 +01:00
Seth Alves
b9217e2767
Merge pull request #14655 from danteruiz/unknown-steamvr-headsets
...
omit unknown device names from clear-story data
2019-01-04 10:09:20 -08:00
Ryan Huffman
c2ceeb3d76
Apply AvatarPackager code review cleanup
2019-01-04 09:41:31 -08:00
Thijs Wenker
8625037285
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-04 15:29:07 +01:00
Antonina Savinova
4414579a6e
Merge pull request #14591 from Atlante45/feat/stats
...
Fix network stats to use low-level values
2019-01-03 16:54:03 -08:00
Sam Gondelman
0e6eecc64b
Update PacketHeaders.h
2019-01-03 15:20:55 -08:00
Sam Gondelman
5a6f9eb9e3
Merge branch 'master' into NOverlays8
2019-01-03 15:11:48 -08:00
Dante Ruiz
f5de217b4c
removing debug statment
2019-01-03 13:40:44 -08:00
Roxanne Skelly
2b1547b9fa
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-03 13:39:19 -08:00
Thijs Wenker
c95da0a595
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
...
# Conflicts:
# interface/src/Application.cpp
2019-01-03 22:17:54 +01:00
SamGondelman
4cd1cd6606
merge with master
2019-01-03 12:56:41 -08:00
Dante Ruiz
fe1a8a6b76
omit unknown device names from clear story
2019-01-03 11:46:03 -08:00
Clement
a0ede77e4f
Fix typo
2019-01-03 10:04:38 -08:00
Clement
9475a31f1b
Record ACK data in stats
2019-01-03 10:04:38 -08:00
Clement
f163bbc0d5
Sample connections stats every seconds
2019-01-03 10:04:38 -08:00
Clement
c5b60594b6
Record more detailed stats on Retransmit/duplicate
2019-01-03 10:04:38 -08:00
Seth Alves
ad1235ce94
also bump entity protocol version
2019-01-03 08:19:13 -08:00
Seth Alves
78aff6e95c
grab js api; send grab information through trait system
2019-01-03 08:17:52 -08:00
Thijs Wenker
725a14ce80
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-03 11:06:19 +01:00
SamGondelman
ea11497a67
Merge remote-tracking branch 'upstream/master' into NOverlays7
2019-01-02 18:09:19 -08:00
Sam Gondelman
aeafb3c9a7
Merge pull request #14569 from SamGondelman/NOverlays6
...
Case 20281: Add missing Text Entity properties
2019-01-02 18:07:37 -08:00
Thijs Wenker
cb91a4bc6d
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-03 00:10:22 +01:00
Antonina Savinova
4838a9107a
Merge pull request #14624 from davidkelly/dk/17207
...
ACs don't need to call into flagtimeForConnecitonStep
2019-01-02 13:41:30 -08:00
Roxanne Skelly
9dfb07c827
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-02 09:22:27 -08:00
Roxanne Skelly
4fc263ff24
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2018-12-27 14:13:40 -08:00
howard-stearns
af65e59ba3
Recognize data: URLs in Web entities.
2018-12-27 14:34:59 -05:00
Roxanne Skelly
da70271acf
Checkpoint #2 Case20377 - Add Ack for BulkAvatarTraits
2018-12-26 13:46:08 -08:00
Roxanne Skelly
3a282045ff
Checkpoint trait-level flow control
2018-12-21 15:48:58 -08:00
Thijs Wenker
ea901aa179
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-21 14:11:57 +01:00
SamGondelman
bb030660bd
Merge remote-tracking branch 'upstream/master' into NOverlays4
2018-12-20 13:26:23 -08:00
Thijs Wenker
79a9c82168
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-20 18:56:33 +01:00
David Kelly
2c647462b1
ACs don't need to call into flagtimeForConnecitonStep
2018-12-20 10:15:44 -07:00
SamGondelman
05e0fb464e
new improved polylines
2018-12-19 15:01:49 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3
2018-12-19 11:37:10 -08:00
Adam Smith
828672343a
Merge pull request #14523 from SamGondelman/NOverlays2
...
Case 20131: Cleanup some Entity Properties
2018-12-19 11:33:24 -08:00
Ryan Huffman
720cd90dc7
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-18 13:17:28 -08:00
Simon Walton
0d14e0bcf7
Set minimum timeout for retransmits
2018-12-17 14:07:21 -08:00
SamGondelman
6094a2f0a0
add back line entities, undo polyline changes temporarily
2018-12-14 15:41:11 -08:00
Ryan Huffman
78c4c2599e
Add start of marketplace uploading and project file list
2018-12-13 13:27:31 -08:00
SamGondelman
b261665072
working on lines
2018-12-12 09:39:01 -08:00
SamGondelman
250baa9c72
add missing properties to text entities
2018-12-11 15:42:24 -08:00
SamGondelman
fd8245e258
Merge remote-tracking branch 'upstream/master' into NOverlays6
2018-12-11 10:46:39 -08:00
Shannon Romano
a3c870ed90
Merge pull request #14479 from sabrina-shanman/hfm_mimetype
...
(case 20037) Add robust MIME type detection for loading models in ModelCache
2018-12-11 18:41:55 +00:00
Sam Gondelman
d21d764131
Merge branch 'master' into NOverlays4
2018-12-06 12:48:05 -08:00
Sam Gondelman
2291c7e5fb
Merge branch 'master' into NOverlays3
2018-12-06 12:37:18 -08:00
Sam Gondelman
533e0e0326
Merge branch 'master' into NOverlays2
2018-12-06 12:29:38 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays
2018-12-06 11:29:06 -08:00
Sam Gondelman
c38a6966a9
Merge branch 'master' into NOverlays4
2018-12-06 11:25:43 -08:00
Sam Gondelman
a7c083e97a
Merge branch 'master' into NOverlays2
2018-12-06 11:24:27 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3
2018-12-06 11:23:50 -08:00
Adam Smith
08d6e35d4d
Merge pull request #14372 from SamGondelman/decals
...
Case 19798: 3D projected Material Entities and materialRepeat option
2018-12-06 11:13:46 -08:00
SamGondelman
305cb6d323
grid entities
2018-12-03 18:04:34 -08:00
SamGondelman
3ce6f7f3d6
real image entities
2018-12-03 11:50:59 -08:00
SamGondelman
1fd8a21f8e
cleanup
2018-12-03 11:07:54 -08:00
sabrina-shanman
b809eed01f
Merge branch 'master' into hfm_mimetype
2018-11-28 15:06:04 -08:00
sabrina-shanman
2387641cbb
Store the MIME type in HTTPResourceRequest::onRequestFinished()
2018-11-26 16:09:41 -08:00
SamGondelman
e282d51883
CR
2018-11-26 01:15:07 -05:00
birarda
23857ea8c2
ensure packets are added to loss list after timeout
2018-11-19 17:40:55 -08:00
Dante Ruiz
f17723c216
disable interstitial for master
2018-11-14 14:50:38 -08:00
SamGondelman
079d1dcbd6
convert clientOnly to entityHost and add local entities
2018-11-14 11:25:37 -08:00
Jeff Clinton
6c90d7ed11
Merge pull request #14343 from ElderOrb/FB19514
...
FB19514 - Interface crashes on attempt to apply new animation url via…
2018-11-13 14:59:50 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
...
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
6e2024350d
Merge pull request #14282 from gcalero/android_new_login
...
Change Android login flow (MS case 19470)
2018-11-13 12:02:10 -08:00
Howard Stearns
ad7266062d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 10:33:27 -08:00
John Conklin II
85e5c1d6ef
Merge pull request #14363 from SimonWalton-HiFi/scale-avatar-joint-translations
...
Send avatar-joint translations at world scale
2018-11-13 10:04:30 -08:00
Howard Stearns
545b85bc9d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 09:55:54 -08:00
Howard Stearns
fc62700587
Merge branch 'no-url-logging' of github.com:howard-stearns/hifi into no-url-logging
2018-11-13 09:55:09 -08:00
Gabriel Calero
3d4893aba2
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-11-13 10:43:36 -03:00
John Conklin II
ec4f2f781d
Merge pull request #14352 from Atlante45/feat/solo-source
...
[master] Add audio soloing feature
2018-11-12 14:07:30 -08:00
Roxanne Skelly
762033580d
And remove another url log item.
2018-11-12 13:48:08 -08:00
Roxanne Skelly
7a14cb1bbc
Remove additional url logging message.
2018-11-12 13:36:14 -08:00
Howard Stearns
66ae01e0c3
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-12 12:55:20 -08:00
Brad Hefta-Gaub
22dd958582
Merge pull request #14297 from jherico/feature/vcpkg
...
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
2018-11-12 09:52:02 -08:00
SamGondelman
b3abd97707
projected materials and repeat property
2018-11-09 10:47:07 -08:00
Zach Fox
5cf2041c65
Remove unused variable
2018-11-09 10:38:20 -08:00
Brad Davis
8c4f0ec774
Vcpkg migration
2018-11-08 12:28:06 -08:00
Zach Fox
811b01816b
CR round 3
2018-11-08 10:41:31 -08:00
Zach Fox
1ab1cb95d8
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-08 09:57:10 -08:00
Zach Fox
48d3450c5a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-07 14:59:23 -08:00
Sam Gateau
e28560a9c7
Merge pull request #14311 from SamGondelman/interstitial
...
Case 19682: Disable interstitial on android
2018-11-07 10:47:31 -08:00
Sam Gateau
5d0be31fe7
Merge pull request #14354 from SamGondelman/deadlock
...
Case 19735: Fix ResourceCache mutex issues
2018-11-07 09:55:41 -08:00
Simon Walton
f88168bdfb
Send avatar-joint translations at world scale
2018-11-06 17:29:02 -08:00
Roxanne Skelly
cef7000a72
Case 19754 - Remove logging URLs and related file locations.
...
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
2018-11-06 16:24:32 -08:00
SamGondelman
1444b3a186
resource mutex issues
...
(cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e)
(cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)
2018-11-06 11:57:57 -08:00
Zach Fox
58dd690c0a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-06 10:29:05 -08:00
Clement
37c69ebe62
Add audio soloing feature
2018-11-05 19:02:26 -08:00
Alexander Ivash
cdfa38d4dd
FB19514 - Interface crashes on attempt to apply new animation url via AvatarApp
2018-11-04 19:16:43 +05:30
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07:00
Zach Fox
d0854ca2ab
Use AccountManager instead of settings
2018-11-02 16:42:18 -07:00
Gabriel Calero
6a3ccbbe02
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-11-02 17:08:55 -03:00
Gabriel Calero
160e633af5
Implement login through oauth for steam login button
2018-11-02 17:08:19 -03:00
Zach Fox
b43ad15fa7
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-01 11:32:38 -07:00
Stephen Birarda
41ec026f8d
cleanup packet times, avoid ambiguous RTT calcs, allow fast re-transmit
2018-10-31 13:32:27 -07:00
SamGondelman
8633dc0f66
disable interstitial on android
2018-10-31 12:34:20 -07:00
Zach Fox
d1556ae4e8
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 15:51:34 -07:00
Kerry Ivan Kurian
3cf000a71b
Merge pull request #14232 from kkurian/log-resource-requests-2
...
Display resource-access events in marketplace item tester
2018-10-23 15:18:30 -07:00
John Conklin II
7019439356
Merge pull request #14260 from SamGondelman/resourceCrash
...
Fix ResourceCache crash on shutdown
2018-10-23 15:03:55 -07:00
Stephen Birarda
5cbddfe0c4
consider all sockets in findNodeWithAddr
2018-10-23 13:35:07 -07:00
SamGondelman
78f0afd39f
fix crash on shutdown
2018-10-23 12:13:41 -07:00
Kerry Ivan Kurian
a2a6acd45c
Improve code formatting
2018-10-22 14:04:59 -07:00
Zach Fox
bccca94111
Prevent duplicate resources in logs. Thanks to Roxanne!
2018-10-22 13:59:55 -07:00
Zach Fox
493262052c
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
2018-10-22 13:59:52 -07:00
Zach Fox
7be5d5674d
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-22 13:59:35 -07:00
Stephen Birarda
3aac294a92
optimize sockAddrBelongsToNode and reduce connection filter usage
2018-10-22 13:57:30 -07:00
Zach Fox
1eca1bfd55
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-22 11:18:10 -07:00
Stephen Birarda
3c79a79487
Merge pull request #14163 from Atlante45/fix/bw-recorder
...
Fix crash with BandwidthRecorder
2018-10-22 10:11:26 -07:00
Stephen Birarda
ea3bdeb26e
Merge pull request #14181 from Atlante45/feat/timebox-packet-processing
...
Timebox packet processing
2018-10-22 09:43:30 -07:00
Brad Hefta-Gaub
219302a9b6
Merge pull request #14157 from SimonWalton-HiFi/domain-checkin-limit
...
Cap the number of domain-server duplicate check-ins sent upon retransmission
2018-10-19 16:41:09 -07:00
Brad Davis
2687c024eb
Fix light color / serialization
2018-10-19 14:47:02 -07:00
Zach Fox
2df9d28c5b
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-19 09:42:06 -07:00
John Conklin II
5095a4e0eb
Merge pull request #14196 from sethalves/interstitial-domain-full
...
go to error-room when failing to connect to a full domain
2018-10-18 17:49:35 -07:00
Zach Fox
2f37a2b1a1
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-18 11:12:26 -07:00
Zach Fox
2a9e0041b2
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-18 10:16:07 -07:00
Kerry Ivan Kurian
89a5da80e0
Do not display incomplete metadata
2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
Sam Gondelman
3f117cd3e0
Merge branch 'master' into scriptvec3
2018-10-17 13:57:21 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1
...
move grab pseudo-properties (userData) into first-class EntityItemProperties
2018-10-17 13:29:20 -07:00
Sam Gondelman
e3543cf098
Merge branch 'master' into scriptvec3
2018-10-17 13:10:29 -07:00
John Conklin II
e59e3720fe
Merge pull request #14139 from SamGondelman/animation
...
Fix various ResourceCache bugs
2018-10-17 11:13:35 -07:00
Seth Alves
47d3c9ba27
go to error-room when failing to connect to a full domain
2018-10-12 11:28:54 -07:00
Clement
bcbbe884c7
Timebox readPendingDatagrams
2018-10-10 12:56:41 -07:00
Zach Fox
7de784ce27
First steps (definitely not working)
2018-10-10 12:32:55 -07:00
Clement
8a95c58f86
Revert packet processing split
2018-10-10 11:46:53 -07:00
Clement
3eb7c80af3
Fix BandwidthRecorder storage concurrent accesses
2018-10-08 13:45:34 -07:00
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3
2018-10-08 12:59:34 -07:00
Simon Walton
12db6a4d10
Limit number of domain-checkin duplicates
2018-10-08 10:58:46 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged
...
Merged interstitial page/redirect domain improvements
2018-10-08 10:32:29 -07:00
Stephen Birarda
88f76ac760
suppress traits larger than INT16_MAX bytes
2018-10-05 09:46:55 -07:00
Dante Ruiz
651f37aceb
Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged
2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d
fix loading progress
2018-10-04 15:01:16 -07:00
SamGondelman
4024f2a180
fix various resourcecache bugs
2018-10-04 11:29:22 -07:00
Wayne Chen
0a7102b4d3
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-04 08:59:26 -07:00
Wayne Chen
d6af09ca62
ignoring entities in interstitial/saving address on 404 error
2018-10-03 17:40:42 -07:00
Sam Gondelman
4e96c3297b
Merge branch 'master' into scriptvec3
2018-10-03 17:14:15 -07:00
John Conklin II
4d7b2bb429
Merge pull request #14113 from Atlante45/feat/audio-mixer-throttle-equation
...
Audio Mixer Scaling
2018-10-03 13:17:28 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3
2018-10-02 08:58:04 -07:00
Seth Alves
834699fa12
Move grab pseudo-properties (userData) into first-class EntityItemProperties.
2018-10-02 08:54:12 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f
...
Mini tablet in palm
2018-10-01 16:56:36 -07:00
Wayne Chen
5f05be554f
check for hard refusal to 404
2018-10-01 10:06:13 -07:00
Wayne Chen
eab57633a5
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-01 09:21:26 -07:00
Stephen Birarda
371de312cc
enumerate a vector of mixable streams for each listener
2018-09-28 14:54:50 -07:00
Stephen Birarda
aed79b3b17
use a vector for ignored node IDs
2018-09-28 14:54:49 -07:00
David Rowe
2456fd0e99
Merge branch 'master' into M17428-f
2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-27 12:05:21 -07:00
Wayne Chen
9079c8a6b7
adding log for redirect cases
2018-09-27 10:42:21 -07:00
Wayne Chen
db41a1c16b
error state signal for 404/interstitial
2018-09-26 13:48:15 -07:00
Wayne Chen
de5614500a
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements
2018-09-25 21:52:01 -07:00
Wayne Chen
26b6967ba6
adding overlays to redirect domain
2018-09-25 18:16:18 -07:00
Wayne Chen
69d5299362
patching fix for previous commits
2018-09-24 15:22:46 -07:00
Wayne Chen
ac5814a1f8
Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect
2018-09-24 13:57:23 -07:00
Roxanne Skelly
61cbee72af
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-21 12:31:36 -07:00
Wayne Chen
7e796f7e7f
committing requested changes
2018-09-19 14:26:30 -07:00
Roxanne Skelly
d5f756c79d
Tray Notifier Checkpoint
...
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
2018-09-19 12:40:15 -07:00
Wayne Chen
01594d7a52
fixing settings check in domain handler
2018-09-19 10:17:14 -07:00
Wayne Chen
795580f4e1
adding 404 redirect toggle with interstitial
2018-09-19 09:55:15 -07:00
Wayne Chen
be5f498c2f
reversion
2018-09-18 15:47:54 -07:00
Wayne Chen
48e4b38312
reversion
2018-09-18 15:28:15 -07:00
Wayne Chen
8274f4cb4c
reverting domain handler change
2018-09-18 15:26:12 -07:00
Wayne Chen
f82063ed46
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-09-18 09:17:28 -07:00
Wayne Chen
0afea6fbd1
removing double login fail signal
2018-09-14 11:08:53 -07:00
SamGondelman
c522d1bc93
merge with master
2018-09-14 00:57:13 -07:00
Wayne Chen
fd1e64e4e6
Revert "Fix login fail twice call"
2018-09-13 17:01:59 -07:00
John Conklin II
aef3ed3e01
Merge pull request #13989 from wayne-chen/fixLoginFailTwiceCall
...
Fix login fail twice call
2018-09-13 16:59:00 -07:00
Wayne Chen
0fc1cc9af8
Revert "adding fix for getting DomainHandler into error state"
...
This reverts commit 49f26d968a
2018-09-13 15:39:18 -07:00
David Rowe
bbfb2b1374
Merge branch 'master' into M17428-f
2018-09-14 10:36:49 +12:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor
...
Fixing Error State for Timeout/localhost Redirection
2018-09-13 15:19:55 -07:00
Wayne Chen
647c4e1694
adding true fix for localhost timeouts
2018-09-13 13:51:42 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling
...
Performance improvements for Avatar Mixer
2018-09-13 13:43:18 -07:00
Wayne Chen
873859455a
Revert "adding fix for getting DomainHandler into error state"
...
This reverts commit 3fe3f674d0
2018-09-13 11:53:56 -07:00
Wayne Chen
380f24b37f
adding fix, changing window title
2018-09-13 11:53:21 -07:00
Wayne Chen
96ab7d417e
removing connection for on login failed
2018-09-13 10:35:43 -07:00
Wayne Chen
ad233677b8
adding changes for overriding host change for error state
2018-09-12 18:31:01 -07:00
Wayne Chen
3fe3f674d0
adding fix for getting DomainHandler into error state
2018-09-12 15:45:06 -07:00
Wayne Chen
49f26d968a
adding fix for getting DomainHandler into error state
2018-09-12 15:42:55 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged
...
Interstitial Page with 404 Redirect
2018-09-12 08:39:52 -07:00
Wayne Chen
20cab87a17
Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-11 18:53:06 -07:00
Wayne Chen
a7321f950a
pushing requested changes - adding timeout refusal
2018-09-11 18:32:17 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
Wayne Chen
8bca1bc5fe
reverting, oversight
2018-09-11 17:09:21 -07:00
Wayne Chen
a85a7a6119
adding back goToLastAddress back
2018-09-11 17:07:49 -07:00
Wayne Chen
490cdc901e
Merge pull request #3 from danteruiz/interstitalMerged
...
making requested changes and fixing compile issue for jenkins
2018-09-11 16:30:13 -07:00
Wayne Chen
0f25756908
expose domain connection error to Window
2018-09-11 16:29:39 -07:00
Dante Ruiz
c97d646083
making requested changes and fixing compile issue for jenkins
2018-09-11 15:57:44 -07:00
Wayne Chen
c194c236f1
adding inlines
2018-09-10 17:10:13 -07:00
Wayne Chen
e5a87aa58c
removing unused variables
2018-09-10 16:56:13 -07:00
Wayne Chen
ff86e480ba
adding debug statement to check for window close
2018-09-10 11:36:45 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling
2018-09-10 10:15:49 -07:00
David Rowe
7dba2e6a2e
Merge branch 'master' into M17428-f
2018-09-08 12:45:11 +12:00
Wayne Chen
77bb6fa4d5
adding position to try again zone; updating whitespace
2018-09-05 11:53:49 -07:00
Wayne Chen
0be7a5ffaa
fixing typo in domain handler
2018-09-04 19:58:56 -07:00
SamGondelman
589e88af4a
Merge remote-tracking branch 'upstream/master' into scriptvec3
2018-09-04 17:54:45 -07:00
Wayne Chen
9e0fa08cf1
adding property to location, updating domain
2018-09-04 17:46:23 -07:00
Simon Walton
7af69b5450
Check that a requested listened port is used in NodeList
2018-09-04 13:53:25 -07:00
Simon Walton
c2ea05b026
Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling
2018-09-04 09:31:05 -07:00
Wayne Chen
c95cb97b9b
adding working version with networking signals
2018-08-31 19:29:48 -07:00
Wayne Chen
e3f5f4c55a
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect
2018-08-30 19:55:51 -07:00
Wayne Chen
82c7495615
Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect
2018-08-30 19:41:06 -07:00
Wayne Chen
5f43f5b276
adding different method for handling redirect
2018-08-30 17:40:13 -07:00
Simon Walton
b45b0f54e4
Move unfilteredHandlers processing back into main loop
2018-08-30 11:59:53 -07:00
Zach Fox
b8cd5dd8b9
Fixup PR13870: Make the feature work in Master
2018-08-29 16:58:19 -07:00
Simon Walton
9711076dae
Use a queued signal for pending datagrams
2018-08-29 10:49:29 -07:00
Wayne Chen
6689c15564
Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect
2018-08-28 19:22:34 -07:00
Wayne Chen
223f86108f
adding debugging stuff
2018-08-28 17:34:48 -07:00
Wayne Chen
8a9ad421e7
adding serverless file + redirection if conn fail
2018-08-28 15:50:14 -07:00
David Rowe
e5c733e7f2
Merge branch 'master' into M17428-c
2018-08-29 08:20:00 +12:00
Stephen Birarda
7ddd70a84a
Merge pull request #13871 from birarda/bug/double-domain-connect
...
force NodeList reset if DS changes session or local ID
2018-08-27 11:59:24 -07:00
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3
2018-08-27 10:43:52 -07:00
Simon Walton
861d1e26a9
Remove unused variable
2018-08-24 18:02:28 -07:00
Simon Walton
bf839ca291
Handle _unfilteredHandlers first upon processing datagrams
2018-08-24 16:53:38 -07:00
Simon Walton
4392b3c2a8
Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling
2018-08-24 16:07:00 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom
...
Enable bloom in zone properties
2018-08-24 14:46:31 -07:00
Stephen Birarda
cb4ce4fedb
make sure settings are re-requested on new connection
2018-08-24 13:05:04 -07:00
Stephen Birarda
1263db5688
force NL reset if the domain changes session ID or local ID
2018-08-23 16:48:46 -07:00
Simon Walton
9dac399c20
Merge branch 'master' into avatar-mixer-scaling
2018-08-23 13:58:38 -07:00
John Conklin II
5dd64645eb
Merge pull request #13861 from SimonWalton-HiFi/safe-landing-fixes
...
Fix safe-landing protocol for sparse domains
2018-08-23 10:17:08 -07:00
Simon Walton
c0966d738e
Use EntityVersion for the EntityQueryInitialResultsComplete packet
2018-08-22 16:40:49 -07:00
Simon Walton
c4b916af62
Just bump packet version for EntityQueryInitialResultsComplete
2018-08-22 16:22:30 -07:00
David Rowe
883479d654
Merge branch 'master' into M17428-c
2018-08-23 10:43:44 +12:00
Simon Walton
dd098f05c2
Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number
2018-08-22 14:54:07 -07:00
Simon Walton
d8d940b06a
Cap datagrams-at-once processed; debugging output
2018-08-22 10:28:32 -07:00
Simon Walton
4084973cca
Changes for linux compilation
2018-08-21 16:04:08 -07:00
Simon Walton
e867ae86f4
Split readPendingDatagrams() into two slots
2018-08-21 14:44:55 -07:00
Stephen Birarda
7d8db482a3
put back ExtendedIODevice ctor for ubuntu warning
2018-08-21 13:21:21 -07:00
Stephen Birarda
3e2d4dc696
fixes and improvments addressing CR comments
2018-08-21 10:53:52 -07:00
Stephen Birarda
e6b419d283
add instanced traits and migrate avatar entities
2018-08-21 10:31:15 -07:00
Stephen Birarda
be7eb57205
handle whitelist avatar URL override via traits
2018-08-21 10:31:14 -07:00
Stephen Birarda
a80d19a44a
remove skeleton from identity, handle in clients
2018-08-21 10:31:14 -07:00
Stephen Birarda
26a1f03314
send traits in bulk to avatar mixer client
2018-08-21 10:31:14 -07:00
Stephen Birarda
f23a036f4a
add node local ID retreivable from NodeData
2018-08-21 10:31:14 -07:00
Stephen Birarda
486557e28a
initial trait packet sending on skeleton URL change
2018-08-21 10:31:14 -07:00
Sam Gondelman
f0986a7f5a
Merge branch 'master' into scriptvec3
2018-08-20 10:56:45 -07:00
David Rowe
846f38584f
Merge branch 'master' into M17428
2018-08-17 15:01:35 +12:00
John Conklin II
bbf6162361
Merge pull request #13632 from Atlante45/fix/udt-rtt
...
Fix potential reliable connection lockup.
2018-08-16 13:15:23 -07:00
David Rowe
a86fdeafc0
Merge branch 'master' into M17248-a
2018-08-16 10:38:30 +12:00
Seth Alves
527b27da96
pseudo-joints for far-grab positions
2018-08-14 08:55:20 -07:00
David Rowe
2a177e04e1
Misc. tweaks
2018-08-11 10:11:56 +12:00
David Rowe
38d8a9a2da
Send messages locally if not connected to a domain
2018-08-11 07:00:50 +12:00
SamGondelman
fb75b42059
working on enabling bloom
2018-08-07 22:26:30 -07:00
John Conklin II
3a6a72a079
Merge pull request #13643 from SimonWalton-HiFi/user-setting-hmac
...
Add DS option to disable HMAC packet authentication
2018-08-03 17:45:32 -07:00
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3
2018-08-03 14:57:49 -07:00
John Conklin II
243bd5ea69
Merge pull request #13536 from SimonWalton-HiFi/script-engine-thread-agent
...
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
2018-08-03 13:32:11 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics
...
Enable physics after ES indicates all nearby entities received
2018-08-01 18:15:00 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244
...
Move scriptable caches' APIs into scripting interfaces
2018-08-01 11:50:13 -07:00
Simon Walton
ecfba312ef
Merge remote-tracking branch 'upstream/master' into script-engine-thread-agent
2018-07-31 15:54:54 -07:00
Simon Walton
33a46a6a82
Make ThreadedAssignment::setFinished() protected
2018-07-31 15:46:43 -07:00
Simon Walton
64fc3e1091
ThreadedAssignment calls virtual stop() upon domain disconnect
2018-07-31 15:30:33 -07:00
SamGondelman
7c8d080050
Merge remote-tracking branch 'upstream/master' into scriptvec3
2018-07-31 14:04:23 -07:00
Simon Walton
a320308eaf
Fix sequence number encoding issue
...
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
2018-07-31 13:54:22 -07:00
