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 |
|