Ryan Huffman
5950006111
Remove extraneous logging
2017-09-19 11:18:25 -07:00
Atlante45
7d9daea0f6
Transmit baking errors to interface for display.
2017-09-13 09:54:54 -07:00
Artur Gomes
b65520e788
Merge remote-tracking branch 'upstream/master'
2017-09-13 12:32:17 +01:00
Stephen Birarda
5e1decb02b
Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake
2017-09-07 12:06:53 -07:00
Clément Brisset
7d4f17506e
Merge branch 'feat/auto-bake' into feat/bake-meta-errors
2017-09-01 17:33:25 -07:00
Seth Alves
0855dfc1c6
PR-11290 didn't actually bump protocol version
2017-09-01 17:26:32 -07:00
Stephen Birarda
55d44a8c8f
Merge pull request #11285 from Atlante45/feat/baking-enabled
...
Wire "Use baked" checkbox
2017-09-01 16:25:49 -07:00
Ryan Huffman
c67fcc1384
Add RedirectFail to ResourceRequest::getResultString()
2017-09-01 10:41:31 -07:00
Ryan Huffman
bf53161a0b
Fix comparison between signed and unsigned int in MappingRequest
2017-08-31 15:55:27 -07:00
Ryan Huffman
25f64e1aa9
Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors
2017-08-31 15:17:40 -07:00
Brad Davis
65b49a958f
Merge branch 'master' into 21484
2017-08-31 14:59:30 -07:00
Ryan Huffman
d2c7235fed
Fix update to count width in GetAllMappings
2017-08-31 14:41:29 -07:00
Atlante45
a9cfc01df3
Set Baking Enabled API
2017-08-31 13:11:27 -07:00
Atlante45
764e5d2e4c
Move constant to central location
2017-08-31 13:08:18 -07:00
Stephen Birarda
b1bc899121
Merge pull request #11270 from birarda/feat/auto-bake
...
refuse to perform mapping operations in /.baked/
2017-08-31 13:06:28 -07:00
Stephen Birarda
da8ae23756
move default to the bottom of bakingStatusToString
2017-08-31 11:52:42 -07:00
Daniela
42be6434af
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-08-31 18:03:39 +01:00
Stephen Birarda
ed21ad11d2
add baking to default build, add default to baking status
2017-08-30 15:14:53 -07:00
Ryan Huffman
70430c009d
Fix ATP requests not keeping track of all mapping redirects
2017-08-30 14:35:12 -07:00
Zach Fox
fdcc149c34
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-30 13:27:18 -07:00
Ryan Huffman
31345e4264
Fix ATP requests not keeping track of all mapping redirects
2017-08-30 13:15:14 -07:00
Daniela
58f0601af2
Fix identation.
2017-08-29 17:19:41 +01:00
Ryan Huffman
e9258ec97a
Fix loading standalone baked textures from Asset Server
...
NetworkTexture was not properly handling redirected ATP files. For
instance, if going from .jpg -> .ktx, the NetworkTexture class needs to
be aware of this so it can stop the current request and make multiple
requests for the individual mip levels.
2017-08-28 15:54:40 -07:00
Zach Fox
0cdef28cfd
Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-28 14:55:18 -07:00
Atlante45
eaa2b9fda8
Fix packet version conflict
2017-08-25 15:36:33 -07:00
Atlante45
8a291f16ff
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake
2017-08-25 15:26:38 -07:00
Atlante45
348be788f7
Add BakingEnabled protocol
2017-08-25 10:56:27 -07:00
Atlante45
28c9aa031c
Setup script model status
2017-08-25 10:54:34 -07:00
Atlante45
fd3156b57c
Move BakingStatus
2017-08-25 10:54:33 -07:00
Ryan Huffman
39f04adc8d
Improve baking interface and add automatic baking to asset server
2017-08-24 16:15:28 -07:00
humbletim
9348048387
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-08-24 16:23:47 -04:00
Menithal
e47dfeaeab
Merge remote-tracking branch 'upstream/stable' into 21484
2017-08-24 21:37:20 +03:00
Stephen Birarda
133b7e66b7
adjust a comment and remove some debug
2017-08-23 16:38:23 -07:00
Stephen Birarda
c122b22dfc
add additional IP check to DS packet filter operator
2017-08-23 15:32:25 -07:00
Zach Fox
2a75d97006
First steps
2017-08-22 12:56:16 -07:00
Stephen Birarda
9dfc74de57
always write rank ID to variant when present
2017-08-22 11:24:32 -07:00
Stephen Birarda
1eb7fb5b3d
always write rank ID to variant when present
2017-08-21 17:15:44 -07:00
Menithal
dc5e374485
Merge remote-tracking branch 'upstream/master' into 21484
2017-08-17 22:28:43 +03:00
Artur Gomes
678dd5fbae
Do not test!
...
Add missing information to property.
2017-08-16 18:33:43 +01:00
Delanir
e70303c53e
Add the following items to the libraries/networking/src/udt/PacketHeaders.h and cpp files.
...
add new value to the PacketVersion enum
in the versionForPacketType function, return the new version number when
packetType is EntityAdd, EntityEdit or EntityData.
2017-08-16 18:28:50 +01:00
Stephen Birarda
a59103aad5
truncate filename for relative path URL in RR
2017-08-15 15:38:47 -07:00
Stephen Birarda
100ac65975
store relative path URL in resource request on redirect
2017-08-15 15:27:44 -07:00
Stephen Birarda
96672becc6
read redirected path info in MappingRequest
2017-08-15 15:19:20 -07:00
Stephen Birarda
db3524a48f
add re-direct of get mapping for baked assets
2017-08-11 14:26:27 -07:00
Menithal
982d4a451f
Updated Protocol to add allowTranslation
...
There still is a bug for the value no actually updating
2017-08-08 23:47:37 +03:00
Gerard Maguire
6facc02125
Merge branch 'master' of https://github.com/highfidelity/hifi into 21466
2017-08-08 13:58:32 +01:00
Gerard Maguire
6f81dd53f2
Fixed avatar rotation upon teleportation using Pal
...
Added "VisitUserFromPAL" to LookupTrigger enum
and bool "shouldMatchOrientation" to goToUser()
2017-08-08 05:08:20 +01:00
Liv Erickson
da70071b5a
Merge branch 'master' into feat/domain-setup
2017-08-07 10:04:54 -07:00
Seth Alves
83a30e2f35
missed some statics
2017-08-06 13:12:27 -07:00
Seth Alves
186035dc5d
adjust various things that cause a crash-on-exit on Linux
2017-08-06 11:57:55 -07:00
humbletim
3bcbec87e0
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-30 16:15:34 -04:00
Zach Fox
bd5f7b85d8
Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_renderMOde
2017-07-26 14:11:28 -07:00
Zach Fox
9147bc21d0
Getting there.
2017-07-26 11:41:27 -07:00
Liv
57b27a7bb7
change packet type to be sourced, change from packet list to single packet
2017-07-25 20:17:20 -07:00
Stephen Birarda
2d0c5ff37a
remove preloading of allowed user keys since it happens on connect
2017-07-25 11:41:34 -07:00
Liv
9458e4a1eb
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-07-25 11:32:13 -07:00
Liv
26558da794
Fix stupid typo that was giving connection refused - now working
2017-07-20 18:07:08 -07:00
humbletim
d9de0a8687
bump AvatarMixer protocol version
2017-07-18 17:46:59 -04:00
Liv
e0fd391766
Add permission level for replacing domain content
2017-07-18 14:34:22 -07:00
Clément Brisset
bcc9cf7c60
Merge pull request #10947 from Atlante45/fix/ignore-ac-crash
...
Fix Avatar/Audio Mixer crash
2017-07-18 09:59:30 -07:00
utkarshgautamnyu
758ae9825d
Merge pull request #10939 from highfidelity/bug/6118
...
Record total number of ATP/HTTP/File bytes downloaded during session
2017-07-17 13:53:21 -07:00
Dante Ruiz
68fa426da9
set file url as higher priority
2017-07-14 18:17:13 +01:00
utkarshgautamnyu
6b969bc39d
added code to record total number of ATP/HTTP/File bytes downloaded during session
...
Update FileResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update HTTPResourceRequest.cpp
Update AssetResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update AssetResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update FileResourceRequest.cpp
Update HTTPResourceRequest.cpp
Update FileResourceRequest.cpp
Update FileResourceRequest.cpp
Update Application.cpp
Update Application.cpp
2017-07-12 11:13:13 -07:00
Stephen Birarda
f6d9a79fb5
Revert "Revert "fix for invisible avatars after radius ignore""
2017-07-12 10:36:53 -07:00
Atlante45
bf13d0cc80
Send ordered packet lists for ignore feature
2017-07-11 17:12:12 -07:00
Atlante45
0c18f04e58
Fix Audio Mixer crash
2017-07-06 18:41:25 -07:00
Clément Brisset
34e3f56002
Merge pull request #10843 from birarda/bug/user-activities-interface-only
...
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
Stephen Birarda
916f57772b
default the UAL off for all targets, enable manually for Interface
2017-07-06 10:21:07 -07:00
David Kelly
4a22fbca1b
redo cache switch
2017-07-05 17:01:31 -07:00
Brad Davis
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
David Kelly
01155ba4e3
this handles redirecting ktx_cache, data8, prepared
2017-06-27 08:47:54 -07:00
Ryan Huffman
209a4f33b5
Merge pull request #10784 from huffman/feat/pal-replicated
...
Disable silence + ban buttons for replicated users
2017-06-26 12:50:23 -07:00
Ryan Huffman
86ed61a15d
Push avatar packet version for isReplicated
2017-06-23 14:26:13 -07:00
Brad Hefta-Gaub
dc649e84df
Merge pull request #10792 from jherico/qml_crashes
...
Trying to fix QtQml/QtScript crashes
2017-06-23 12:41:43 -07:00
Brad Davis
4439de240a
Trying to fix QtQml/QtScript crashes
2017-06-22 16:39:57 -07:00
Stephen Birarda
8b7eaaa23a
activate the public socket always for upstream/downstream servers
2017-06-22 13:33:57 -07:00
Stephen Birarda
0e0f216aed
cleanup indentation in packet filter
2017-06-22 13:33:57 -07:00
Stephen Birarda
d05996c13d
fix upstream filter check, audio interest set
2017-06-22 13:33:57 -07:00
Stephen Birarda
6da5a63152
verify replicated packets in packet filter
2017-06-22 13:33:57 -07:00
Stephen Birarda
ea45e341ee
send upstream nodes down to avatar/audio
2017-06-22 13:33:57 -07:00
seefo
48b5989b60
add upstream nodes to domain nodelist
2017-06-22 13:33:57 -07:00
Stephen Birarda
c516dd06e4
Merge pull request #10714 from highfidelity/replicants
...
add broadcasting/replication to downstream avatar mixers and audio mixers
2017-06-21 17:55:07 -07:00
Stephen Birarda
aeb3f443f8
address code review comments
2017-06-21 16:14:14 -07:00
Brad Hefta-Gaub
f7d42c782d
Merge pull request #10764 from thoys/feat/ac-location-jsapi
...
Expose location scripting interface to Agent (AC script)
2017-06-21 10:22:48 -07:00
Thijs Wenker
2a4e9cb603
fix local include / headers
2017-06-21 06:38:16 +02:00
Thijs Wenker
47643e1efe
Expose location API to Agent scripts (side-effect, agents now can teleport)
2017-06-21 06:31:36 +02:00
Stephen Birarda
cf9a97cf10
use length sent by AssetServer to verify asset size
2017-06-19 15:15:45 -07:00
Stephen Birarda
2933a20a0c
some cleanup for audio/avatar replicated packet checking
2017-06-19 10:45:33 -07:00
Brad Davis
1d4b443113
Prevent cache ejection of textures in use
2017-06-19 09:51:11 -07:00
Brad Davis
1632e3b35a
PR feedback
2017-06-16 20:04:23 -07:00
Brad Davis
a675dfe7d2
Prevent deadlocks from different locking orders in FileCache
2017-06-16 15:30:50 -07:00
Stephen Birarda
c332244f4f
fix race for isUpstream and node hole punch
2017-06-15 17:34:20 -07:00
Stephen Birarda
10649c8f6e
change new Node flag to isForcedNeverSilent
2017-06-14 17:20:37 -07:00
Stephen Birarda
224a559602
keep downstream nodes around in domain, alive in upstream
2017-06-14 17:17:14 -07:00
Stephen Birarda
1ed0b693da
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist
2017-06-14 16:57:28 -07:00
Ryan Huffman
785156ad9f
Move downstram server adding to DS
2017-06-14 16:54:04 -07:00
Stephen Birarda
ca196f6141
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/avatar-mixer-downstream
2017-06-14 15:03:26 -07:00
Clément Brisset
44117ac001
Merge pull request #10694 from highfidelity/master
...
Update replicants branch with master
2017-06-14 15:01:22 -07:00
Stephen Birarda
50b56ec761
don't unpack avatar identity that is old
2017-06-14 14:02:22 -07:00
Atlante45
3cc2396021
CR
2017-06-14 11:42:25 -07:00
Atlante45
a15660993d
Fix comment
2017-06-14 11:42:25 -07:00
Atlante45
61eb93af35
Fix SharedNodePointer leak
2017-06-14 11:42:25 -07:00
Stephen Birarda
57cd819307
Merge pull request #10690 from Atlante45/fix/node-leak
...
Fix for Jurisdiction listener
2017-06-14 11:15:17 -07:00
Stephen Birarda
9085a0896a
manually activate sockets for downstream servers
2017-06-13 17:19:58 -07:00
Stephen Birarda
76f1a7445e
handle replicated bulk avatar data packets
2017-06-13 17:19:57 -07:00
Ryan Huffman
da3cd59a96
Fix avatar mixer not setting last broadcast time for downstream nodes
2017-06-13 17:19:57 -07:00
Ryan Huffman
52150ad971
Add node data to downstream avatar mixers
2017-06-13 17:19:57 -07:00
Stephen Birarda
dc94f83591
build out bulk avatar data replication
2017-06-13 17:19:57 -07:00
Stephen Birarda
8ce6590f0b
remove ReplicatedAvatarData and immediate replication of identity
2017-06-13 17:19:57 -07:00
Stephen Birarda
44a63ca27e
handle node killed and remove double IDs in kill packets
2017-06-13 17:19:57 -07:00
Atlante45
d0e8612a65
First pass at AvatarMixer replication
2017-06-13 17:19:57 -07:00
Ryan Huffman
ea56c568a7
Add support for replicating by username
2017-06-13 17:18:28 -07:00
Atlante45
a877bf44fb
CR
2017-06-13 11:26:40 -07:00
Stephen Birarda
30d2e9fd23
add unsafeEachNode to iterate nodes when read lock held elsewhere
2017-06-12 17:54:16 -07:00
Stephen Birarda
682fa24745
fix downstream server parsing from settings
2017-06-12 16:51:25 -07:00
Brad Hefta-Gaub
347742be1b
Merge pull request #10601 from birarda/mannequin-avatar
...
Update default avatar to baked mannequin
2017-06-12 16:42:37 -07:00
Stephen Birarda
63c8273a41
do not send keep alive pings to upstream nodes
2017-06-12 16:29:20 -07:00
Stephen Birarda
880157695a
do not attempt to hole punch an upstream node
2017-06-12 16:29:20 -07:00
Stephen Birarda
4539d615d7
add downstream server settings handling to ThreadedAssignment
2017-06-12 16:29:20 -07:00
Stephen Birarda
9fa97d611a
remove invoked addOrUpdate and move node to node list thread
2017-06-12 16:29:20 -07:00
Stephen Birarda
4042e04946
add isDownstream for cleaner conditionals
2017-06-12 16:29:20 -07:00
Stephen Birarda
88af8b5842
use new downstream/upstream nomeclature
2017-06-12 16:29:20 -07:00
Stephen Birarda
fe668b1bb1
make codec negotiation stateless for replicated agents
2017-06-12 16:29:20 -07:00
Stephen Birarda
2929573cb0
do not punch to replicant nodes
2017-06-12 16:29:20 -07:00
Stephen Birarda
d5b466e3ae
fix replicant handling slot, add node strings for replicants
2017-06-12 16:29:20 -07:00
Ryan Huffman
a1d3c0dc7b
Fix initialization ordering error in Node
2017-06-12 15:27:24 -07:00
Ryan Huffman
eb2a417448
Add parent back to Node ctor
2017-06-12 15:24:14 -07:00
Ryan Huffman
3b3465ea05
Add isUpstream to Node
2017-06-12 14:59:45 -07:00
Ryan Huffman
4851d3b564
Remove superfluous node log
2017-06-12 14:52:02 -07:00
Ryan Huffman
3142842d5d
Fix Node initialization warnings
2017-06-12 14:51:08 -07:00
Ryan Huffman
84e1a6f893
Rename isReplicant to isReplicated
2017-06-12 13:38:58 -07:00
Ryan Huffman
2ff065f751
Add isReplicant to node list packet processing
2017-06-12 13:38:57 -07:00
Ryan Huffman
ff2800e8d5
Add isReplicant to Node
2017-06-12 13:37:49 -07:00
Atlante45
dc7c331d4c
Merge branch 'fix/node-leak' into replicants
2017-06-12 11:32:11 -07:00
Stephen Birarda
8ebf1db9a8
switch to replicator/replicant and add new node types
2017-06-12 10:58:34 -07:00
Atlante45
0b847488d7
Fix comment
2017-06-12 10:54:22 -07:00
Stephen Birarda
b5c26b596e
seek past source UUID in mirrored packets
2017-06-12 02:39:54 -07:00
Stephen Birarda
e629881665
mirror audio format negotiation
2017-06-12 02:18:27 -07:00
Stephen Birarda
45bb323723
experimental support for mirrored audio packets to other mixers
2017-06-12 00:19:24 -07:00
Stephen Birarda
3582e5110e
Merge pull request #10644 from seefo/fb5005
...
Resolved FB5005
2017-06-09 11:55:45 -07:00
seefo
06a5d0970c
Fixed issue with invalid time being sent when logging
2017-06-09 10:58:07 -07:00
seefo
fce3badd1d
Resolved FB#5005
2017-06-08 11:57:44 -07:00
Atlante45
7b10b8a6c3
Fix SharedNodePointer leak
2017-06-06 19:04:12 -07:00
Bradley Austin Davis
b4bbf98fe3
Suppress TBB warnings
2017-06-06 15:02:16 -07:00
Bradley Austin Davis
fc6a278217
Fixing dangling thread issues, consolidating thread management
2017-06-06 15:02:16 -07:00
Brad Davis
171d3212fe
Merge pull request #10623 from jherico/qml_engine_singleton
...
Migrate to single QML engine
2017-06-06 15:00:43 -07:00
Stephen Birarda
0ccd0d3fd6
Merge pull request #10621 from highfidelity/stable
...
Merge Stable back into Master
2017-06-06 10:39:03 -07:00
Bradley Austin Davis
995fe11c05
Migrate to single QML engine
2017-06-05 15:14:44 -07:00
Chris Collins
6cc6cd3bf6
Merge pull request #10604 from highfidelity/RC-42
...
Beta Release 42 - Includes up to Developer Release 6626
2017-06-05 09:13:19 -07:00
Clément Brisset
c636922a5d
Merge pull request #10590 from huffman/fix/running-marker
...
Update server-console to watch interface via pid rather than marker
2017-06-02 15:57:44 -07:00
Ryan Huffman
a5296d50fc
Replace static use of qApp with QCoreApplication
2017-06-02 13:51:39 -07:00
Stephen Birarda
f5d732f332
initial version of the ClosureEventSender using std::thread
2017-06-02 13:21:28 -07:00
Chris Collins
34201ea1da
Merge pull request #10599 from jherico/ktx_cache_wipe
...
Add versioning support to the KTX cache
2017-06-02 13:02:18 -07:00
Ryan Huffman
0d96f82888
Merge pull request #10592 from birarda/close-report
...
Send a close event to API on shutdown
2017-06-02 10:57:41 -07:00
David Kelly
70b6236890
Merge pull request #10605 from davidkelly/dk/analyticsForBubble
...
Add UserActivity calls for bubble usage
2017-06-02 09:48:15 -07:00
Ryan Huffman
aa48f3f063
Rename watchProcessShutdown to shutdownWith
2017-06-01 18:13:27 -07:00
Stephen Birarda
6a89726a6a
Merge pull request #10593 from birarda/log-api-session-id
...
print the metaverse session ID to the debug log
2017-06-01 18:02:17 -07:00
Stephen Birarda
2de6162d38
change the packet version across the board for avatar mixer
2017-06-01 17:35:23 -07:00
Brad Davis
b9f9cddea0
Add versioning support to the KTX cache
2017-06-01 17:16:24 -07:00
Stephen Birarda
2c2f154360
push packet version for default mannequin avatar
2017-06-01 17:13:08 -07:00
David Kelly
37b738ff8b
initial cut at some UserActivities for the bubble
2017-06-01 16:46:31 -07:00
Brad Davis
3fdad14ca4
Merge pull request #10571 from jherico/ktx_tests
...
FileCache refactoring and test, plus KTX unit tests
2017-06-01 16:09:14 -07:00
Stephen Birarda
0f22b07026
move session ID logging later in app startup
2017-06-01 16:07:36 -07:00
Stephen Birarda
06b3ecfdc3
also log metaverse session ID during ctor of AccountManager
2017-06-01 15:50:56 -07:00
Stephen Birarda
3d98f1b3ee
print metaverse session ID to debug log
2017-06-01 13:46:37 -07:00
Ryan Huffman
aaf9b9ac7f
Update server-console to watch interface via pid rather than marker
2017-06-01 11:20:36 -07:00
Stephen Birarda
1d9d83b157
initial version of the ClosureEventSender using std::thread
2017-05-31 19:00:41 -07:00
Brad Davis
a77491ccb1
FileCache refactoring and tests
2017-05-31 13:45:59 -07:00
Ryan Huffman
4a52f4090d
Merge pull request #10552 from huffman/fix/multiple-nic-lockup
...
Fix SendQueue not setting lastReceiverResponse when recv handshake ack
2017-05-30 13:05:01 -07:00
Chris Collins
5db0975554
Merge pull request #10556 from highfidelity/RC-41
...
Beta Release 41 - Includes up to Developer Release 6603
2017-05-30 12:52:30 -07:00
Zach Fox
21d396bbb5
Pull out ownership bidding changes
2017-05-26 13:25:25 -07:00
Zach Fox
827daade1b
Make this PR a protocol change
2017-05-26 13:24:38 -07:00
Ryan Huffman
f0c3a0ac28
Fix SendQueue not updating lastReceiverResponse when recv handshake ack
2017-05-25 13:39:47 -07:00
Zach Fox
b86b07c08f
Pull out ownership bidding changes
2017-05-25 13:01:40 -07:00
Zach Fox
acd85b379f
Make this PR a protocol change
2017-05-25 13:01:40 -07:00
Brad Hefta-Gaub
a0484c5f0b
Merge pull request #10544 from birarda/bug/refresh-access-token
...
require a valid access token and expiry to attempt token refresh
2017-05-25 08:35:18 -07:00
Brad Hefta-Gaub
ca87b792de
Merge pull request #10531 from Atlante45/fix/current-address
...
Never store an address with an empty host
2017-05-25 08:33:16 -07:00
Stephen Birarda
d7b3ee9bcb
check for cached ATP assets in right place
2017-05-24 19:22:44 -07:00
Stephen Birarda
a04fc41e17
don't capture strong pointer to stat tracker
2017-05-24 17:54:07 -07:00
Stephen Birarda
c37fd335e1
track the number of local socket changes
2017-05-24 17:41:52 -07:00
Atlante45
05f69ade32
Never store an address with an empty host
2017-05-24 17:39:27 -07:00
Stephen Birarda
48c4db1ca4
nest the download stats so they are cleaner
2017-05-24 17:36:21 -07:00
Stephen Birarda
3743cd23b4
add detailed download stats for file/http/atp
2017-05-24 17:22:38 -07:00
Stephen Birarda
9cd11a32e2
add a debug log for failed token refresh
2017-05-24 13:47:24 -07:00
Stephen Birarda
14ff6a06b4
require a valid access token and expiry to attempt refresh
2017-05-24 13:16:26 -07:00
Chris Collins
b0efb6d956
Merge pull request #10525 from seefo/master
...
Added refreshing of Account Managers access token
2017-05-22 21:42:16 -07:00
seefo
a638704a8c
Modified AccountManager code to better meet style guidelines
2017-05-22 17:01:37 -07:00
seefo
e77e900812
Added refreshing of Account Manager's access token
...
Changed indentention style to match guidelines
2017-05-22 14:46:44 -07:00
anshuman64
bfb44693a3
Merge pull request #10482 from ctrlaltdavid/21361
...
Fix AC playback script not logging
2017-05-22 12:58:20 -07:00
Marko Kudjerski
986d63cdbb
making sure that the first time landing in *welcome domain is updated for dev builds too
2017-05-19 10:17:02 -07:00
Marko Kudjerski
303bb05b3d
changing the location in welcome to which a user is sent on the first run
2017-05-19 10:17:02 -07:00
David Kelly
057718bde3
remove clockSkew, reference new version for Avatar packets
2017-05-17 15:14:56 -07:00
David Kelly
689a0b5bad
Switch from timestamp to sequence id for avatar identity
2017-05-17 14:22:36 -07:00
David Rowe
e69c322fd3
Get UserActivityLogger working in AC scripts
2017-05-17 14:30:32 +12:00
Atlante45
201f81f20a
Don't wait on the sandbox
2017-05-16 14:41:57 -07:00
samcake
bdb0414add
Adding a validation step at runtime for the cached KTX file in order to regenerate them if anything seems wrong
2017-05-12 18:04:22 -07:00
Atlante45
9138ec53e9
Don't send avatars to previous lookup on server restart
2017-05-11 14:07:36 -07:00
Ryan Huffman
d92bdbf0ed
Fix unsigned/signed comparision warning
2017-05-10 09:43:55 -07:00
Ryan Huffman
6e4c5d1ab4
Update FileCache writing to check QSaveFile::write return value
2017-05-09 16:29:57 -07:00
Ryan Huffman
542001b14f
Update FileCache to use QSaveFile for atomic writes
2017-05-09 14:08:43 -07:00
Ryan Huffman
d86071d783
Fix possible corruption of ktx cache files
...
When creating a file like this:
1. Create file
2. Write file
3. Close file
there is an opening before the file is written and closed where, if the
application were to crash (or not finish for any other reason), the file
would be left in an undefined state. Instead, this change updates it to
do this:
1. Create temp file
2. Write temp file
3. Close temp file
4. Move temp file to final path
This ensures that at step 3 we have a valid file, before we rename it.
We should never end up with a final file in an undefined state, but it is
possible to end up with a temp file that is an undefined state if we,
for instance, crash during step 2.
2017-05-09 12:08:52 -07:00
Chris Collins
1264c34f6c
Merge pull request #10349 from birarda/machine-guid-fingerprint
...
use MachineGuid for slightly safer windows machine fingerprint
2017-05-08 10:42:14 -07:00
Clément Brisset
479e810173
Merge pull request #10364 from huffman/fix/ktx-skybox-loading
...
Fix progressive loading of KTX skybox textures
2017-05-05 14:11:03 -07:00
Stephen Birarda
1857b297e0
don't re-grab the machine fingerprint every DS connection
2017-05-04 16:00:46 -07:00
Stephen Birarda
f39411656a
use machine GUID from registry for machine ID
2017-05-04 16:00:46 -07:00
Chris Collins
7d1ffe181f
Merge pull request #10340 from huffman/fix/obj-atp
...
Fix OBJ material loading not working over ATP
2017-05-04 15:50:52 -07:00
Seth Alves
a259d00b63
Merge pull request #10332 from sethalves/bullet-constraints-5
...
Bullet constraints
2017-05-03 16:30:34 -07:00
Ryan Huffman
7999ed6f60
Fix Resource::refresh for NetworkTexture
2017-05-03 11:26:52 -07:00
Ryan Huffman
0263021c0c
Fix loaded being reset to false for KTX resources
2017-05-03 11:26:52 -07:00
Stephen Birarda
5d1abe4499
Merge pull request #10307 from huffman/fix/ktx-crash
...
Fix for resource downloads getting capped
2017-05-03 11:25:51 -07:00
Ryan Huffman
c839118c6b
Add ResourceManager::resourceExists
2017-05-01 13:22:23 -07:00
Ryan Huffman
074a11306c
Add support for atp and file urls in OBJReader
2017-05-01 13:22:02 -07:00
Seth Alves
1b67a8b251
cleanups
2017-04-30 12:23:34 -07:00
Seth Alves
6623028d71
ball-and-socket constraint
2017-04-29 08:35:55 -07:00
Seth Alves
9e7ef83bd1
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4
2017-04-29 07:01:44 -07:00
Stephen Birarda
fed747a545
Merge pull request #10325 from huffman/atp-range-caching
...
Fix for stuck ATP downloads
2017-04-28 16:54:21 -07:00
Ryan Huffman
89fb0a917b
Fix poorly indented if in AssetRequest
2017-04-28 16:27:44 -07:00
Ryan Huffman
765a061086
Fix stuck ATP downloads
...
Occasionally ATP requests would get stuck because of a race inside
AssetClient::handleAssetReply. This was more likely to happen to small
resources.
2017-04-28 16:26:03 -07:00
Stephen Birarda
c518aa55be
Merge pull request #10312 from birarda/upload-new-models-to-entity
...
add an entity file replacement via domain-server content page
2017-04-28 16:06:05 -07:00
Stephen Birarda
b44a56db80
don't save ATP requests to cache if they are range requests
2017-04-28 10:32:06 -07:00
Stephen Birarda
a21a34a4a4
add entities file replacement to DS and ES
2017-04-27 16:56:27 -07:00
Ryan Huffman
4b0bd80c27
Fix NetworkTexture not cleaning itself up on destruction
2017-04-27 13:03:42 -07:00
Seth Alves
68b59e4601
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux
2017-04-27 07:56:49 -07:00
Seth Alves
b196dd082b
expose bullet slider constraint to javascript
2017-04-27 07:56:35 -07:00
ZappoMan
bc2f893294
format and spelling changes
2017-04-26 21:47:54 -07:00
ZappoMan
c0df82ff69
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62
remove debugging code
2017-04-26 18:36:44 -07:00
Ryan Huffman
ac0a738945
Merge pull request #10261 from Atlante45/feat/progressive-load-ktx
...
Add progressive load for KTX textures
2017-04-26 18:36:01 -07:00
ZappoMan
a26dca73b1
more logging
2017-04-26 18:02:09 -07:00
Ryan Huffman
f5b7feccde
Update AssetClient/Request to use const byteRange
2017-04-26 18:01:56 -07:00
ZappoMan
3de92121e0
more logging
2017-04-26 15:28:10 -07:00
Andrew Meadows
08972da843
remove unused Node::_isAlive cruft
2017-04-26 12:47:56 -07:00
Ryan Huffman
1555fc3088
Update Resource to only clear load priorities if successful
2017-04-26 11:37:48 -07:00
Ryan Huffman
01724c9c90
Update default load priority to be 0
2017-04-26 11:37:47 -07:00
Ryan Huffman
4f16eb9bcc
Cleanup KTX logging and add fragment to resource url to indicate mip level
2017-04-26 11:32:35 -07:00
Atlante45
043c587395
Fix byte range for file resource requests
2017-04-26 10:49:23 -07:00
Atlante45
8269e01474
Fix atp-get compile error
2017-04-26 10:49:23 -07:00
Stephen Birarda
3928e11611
fix valid byte range check and send asset from 0
2017-04-26 10:48:57 -07:00
Stephen Birarda
814970c4e2
cleanup invalid byte range handling
2017-04-26 10:48:57 -07:00
Stephen Birarda
fab1bdaeb7
push asset server packet versions for range requests
2017-04-26 10:48:57 -07:00
Stephen Birarda
7ae8c741c5
pass the byte range to asset client from AssetResourceRequest
2017-04-26 10:48:57 -07:00
Stephen Birarda
229a481232
add byte range handling to FileResourceRequest
2017-04-26 10:48:57 -07:00
Stephen Birarda
397a29039e
add support for byte range requests to ATP
2017-04-26 10:48:57 -07:00
Ryan Huffman
8d03d50d35
Cleanup progressive ktx debugging
2017-04-26 10:48:57 -07:00
Ryan Huffman
4e58341631
Remove http proxy
2017-04-26 10:48:24 -07:00
Ryan Huffman
18fb695614
Disable pipelining in HTTPResourceRequest
2017-04-26 10:48:24 -07:00
Ryan Huffman
ce12a216c0
I think it might be working.
2017-04-26 10:48:24 -07:00
Ryan Huffman
70b816827e
Improve handling of KTX downloads in NetworkTexture
2017-04-26 10:48:24 -07:00
Ryan Huffman
11751611e1
Update NetworkTexture to track current KTX download state
2017-04-26 10:48:23 -07:00
Ryan Huffman
39c3fee838
Add caching of imageOffset to ktx ImageDescriptor
2017-04-26 10:47:32 -07:00
Ryan Huffman
cf3dc12542
Add object labels to GL objects and add ktx min mip kv
2017-04-26 10:47:32 -07:00
Ryan Huffman
b20fcbfcdb
Add a way to write data to a storage object
2017-04-26 10:45:50 -07:00
Ryan Huffman
ccd9c4697b
Add extended ktx header/high-mip request handling to NetworkTexture
2017-04-26 10:45:50 -07:00
Ryan Huffman
1fec531c68
Add basic mip writing to gpu::Texture
2017-04-26 10:45:50 -07:00
Ryan Huffman
00cbfa0f70
Add start of progressive ktx-loading
2017-04-26 10:45:50 -07:00
Ryan Huffman
105d17e85e
Add byte range support to HTTPResourceRequest
2017-04-26 10:45:14 -07:00
David Rowe
4a5f84f4b9
Merge branch 'master' into 21249
...
# Conflicts:
# libraries/audio-client/src/AudioClient.cpp
2017-04-26 13:24:18 +12:00
ZappoMan
90cdeb9582
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-25 16:09:59 -07:00
Andrew Meadows
157dc1475b
Merge pull request #10281 from birarda/bug/session-refresh-login
...
force DS to use new node ID if connect is re-sent
2017-04-25 15:02:57 -07:00
Stephen Birarda
c00dfcc7d7
send the domain disconnect packet before UUID is cleared
2017-04-25 14:32:21 -07:00
David Rowe
c05954ee4b
Add logAction() method to UserActivityLogger JavaScript API
2017-04-25 13:40:57 +12:00
ZappoMan
d179135a87
remove dead code
2017-04-24 18:21:22 -07:00
ZappoMan
95a3e0a092
fix whitespace
2017-04-24 18:06:33 -07:00
ZappoMan
c9aad6b762
new approach to the tpose fix, as well as other improvements
2017-04-24 17:36:05 -07:00
ZappoMan
da68c49dc1
more cleanup
2017-04-21 13:31:40 -07:00
ZappoMan
f07884602a
more CR feedback
2017-04-21 13:13:29 -07:00
ZappoMan
088cdae320
CR feedback
2017-04-21 11:14:47 -07:00
ZappoMan
ff45ad53a3
some more CR cleanup
2017-04-21 10:40:41 -07:00
ZappoMan
f133713d0e
CR feedback
2017-04-21 10:21:34 -07:00
ZappoMan
7f1a87ac4f
remove random http failure
2017-04-20 17:31:20 -07:00
ZappoMan
e89b6c5d2c
some initial debugging on tpose avatars
2017-04-20 17:26:31 -07:00
Seth Alves
41fb05ecf7
bump protocol version
2017-04-14 16:26:54 -07:00
Seth Alves
d17d12446b
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 12:49:03 -07:00
Thijs Wenker
6f58e91d76
Merge pull request #10121 from birarda/bug/recording-cache
...
cleanup Agent RSI handling, make loadRecording async
2017-04-14 21:35:51 +02:00
Seth Alves
7695d2ac05
put the protocol version back to what's in master, for now
2017-04-13 11:29:40 -07:00
Seth Alves
1ab3a1eb60
bump entity-protocol version
2017-04-12 16:36:04 -07:00
Chris Collins
c86acfafef
Merge pull request #10120 from huffman/feat/stick-default-avatar
...
Change default avatar to ball and stick avatar
2017-04-11 12:56:25 -07:00
Seth Alves
938fab6f59
Merge pull request #10061 from humbletim/fix-cached-ResourceCache
...
Fix cached ResourceCache::prefetch() state updates
2017-04-11 07:04:06 -07:00
Ryan Huffman
af11f5f327
Update avatar mixer packet version for stick+ball avatar
2017-04-10 21:27:47 -07:00
Seth Alves
a1cab2c0d1
working toward fixing compound hulls
2017-04-09 17:23:56 -07:00
David Kelly
1b6bf90843
initial analytics for connections
2017-04-05 11:10:06 -07:00
Stephen Birarda
c7a28a527a
cleanup Agent recording handling, make loadRecording async
2017-04-04 10:56:25 -07:00
humbletim
6f2f1d6452
call finished() when cached resource has already failed to load
2017-03-29 19:42:19 -04:00
Zach Fox
e1a880a5d4
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-27 09:10:12 -07:00
Zach Fox
e88895935b
Revert "Actually merge from master"
...
This reverts commit 056d6fbe4f
2017-03-24 17:56:48 -07:00
Brad Davis
82d502ae9f
Correctly initialize a file cache with the proper key
2017-03-24 13:35:37 -07:00
Zach Fox
056d6fbe4f
Actually merge from master
2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087
Revert "Merge from Master"
...
This reverts commit e48123b5bb
2017-03-24 10:04:51 -07:00
Zach Fox
e48123b5bb
Merge from Master
2017-03-23 09:54:14 -07:00
Brad Davis
e482eac437
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-20 16:22:13 -07:00
Zach Fox
fc2a501474
Cleanup JS<->QML messaging
2017-03-16 15:38:39 -07:00
Brad Davis
2837ae9183
More VS 2017/2015 fixes
2017-03-15 16:13:15 -07:00
Brad Davis
b8ded015c6
Fix packetlist compilation on VS 2017
2017-03-15 15:20:41 -07:00
Brad Davis
3e68018a12
Fix node persmissions hash
2017-03-15 14:33:32 -07:00
Zach Pomerantz
808973d7d2
use QStandardPaths instead of hardcoded paths
2017-03-13 17:26:42 -04:00
Zach Pomerantz
463f6454f8
use Local instead of Roaming for FileCache
2017-03-13 17:26:38 -04:00
Zach Pomerantz
172a638ef0
move resource paths to PathUtils
2017-03-13 17:26:34 -04:00
Zach Pomerantz
a0c56618b3
update FileCache to rm manifest
2017-03-13 13:41:44 -04:00
Brad Davis
43d8433d9a
Removing unused include
2017-03-10 09:19:00 -08:00
Bradley Austin Davis
8a438948b9
Fix OSX link failure
2017-03-09 10:42:56 -08:00
Zach Pomerantz
170df4a1f4
Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27
2017-03-06 17:14:11 -07:00
Andrew Meadows
6ea6477c73
Merge pull request #9683 from jherico/cache_flush
...
Clear caches on domain switch
2017-03-06 11:05:44 -08:00
Zach Pomerantz
6a7ee4321b
suppress logs for file_cache
2017-03-02 13:30:51 -05:00
Zach Pomerantz
cca1f2fb25
include <atomic> in FileCache
2017-03-02 11:28:49 -05:00
Zach Pomerantz
1425eb0936
Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27
2017-03-01 21:01:37 -05:00
Zach Pomerantz
febeeeca3a
namespace cache::FileCache and use unique_ptr
2017-03-01 20:58:00 -05:00
Zach Pomerantz
c71e614dd5
add loading from persisted files
2017-03-01 20:18:31 -05:00
Zach Pomerantz
a6a0fd3851
fix FileCache persistence
2017-03-01 11:32:11 -05:00
David Kelly
efe44425a6
cr feedback, plus something I missed
2017-03-01 09:26:03 -07:00
Zach Pomerantz
de23a11dee
wip
2017-02-28 17:25:56 -05:00
David Kelly
c10b0389de
Add a getAvatarGain method to NodeList and UsersScriptingInterface
2017-02-28 14:45:34 -07:00
Zach Pomerantz
b03f51dd26
fix double fclose
2017-02-28 16:08:54 -05:00
Zach Pomerantz
8969d7df1d
FileCache
2017-02-27 17:58:48 -05:00
Seth Alves
73774a6590
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-24 11:34:59 -08:00
Seth Alves
0a2a1b1637
include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet
2017-02-23 15:25:09 -08:00
Brad Hefta-Gaub
05995163cf
add support for tuning sorting
2017-02-22 09:49:47 -08:00
Brad Hefta-Gaub
a58ddad3aa
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
2017-02-21 14:36:03 -08:00
Brad Hefta-Gaub
a526db1779
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-21 14:18:36 -08:00
Stephen Birarda
3b996f2b7f
bump packet version for new JSON query options
2017-02-21 09:29:07 -08:00
Brad Hefta-Gaub
d49c83cac3
fix build buster, some tweaks
2017-02-16 14:19:14 -08:00
Brad Hefta-Gaub
d532b3a4b8
more work on multi-core
2017-02-16 13:25:51 -08:00
Stephen Birarda
a3c123818d
Merge pull request #9661 from Atlante45/fix/possible-race
...
Fix possible race condition
2017-02-15 18:38:01 -08:00
Brad Davis
127a014b46
Clear caches on domain switch
2017-02-15 15:21:08 -08:00
David Kelly
5184cbe615
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-15 12:08:55 -07:00
Zach Pomerantz
2f52c09320
alphabetize io_stats
2017-02-14 23:17:11 +00:00
Zach Pomerantz
276c1abd0a
Merge branch 'master' of https://github.com/highfidelity/hifi into load/audio/packets-in
2017-02-14 23:06:36 +00:00
Brad Hefta-Gaub
f433347362
Merge pull request #9652 from sethalves/avatar-as-child-fixes
...
some fixes for when an avatar is a child of something else
2017-02-14 09:07:47 -08:00
Seth Alves
4393bc3c2e
Merge pull request #9656 from humbletim/21114-part1
...
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
2017-02-14 06:49:05 -08:00
David Kelly
156e365eff
update version
...
since new property was added, things will appear broken if this
version is used with old version (server or client).
2017-02-13 15:02:31 -07:00
Seth Alves
3d7633a11f
Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes
2017-02-13 13:44:05 -08:00
Atlante45
a1371a4f06
Fix possible race
2017-02-13 13:20:31 -08:00
Seth Alves
27d55d6ff0
bump avatar-mixer protocol version
2017-02-13 07:30:33 -08:00
Brad Hefta-Gaub
d82edaa36e
implement support for larger message payloads
2017-02-12 13:33:07 -08:00
humbletim
831bf93500
* refactor ScriptCache per FIXMEs
...
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
2017-02-11 04:47:31 -05:00
Brad Hefta-Gaub
765500ebce
remove debug and fix bug in test script
2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub
f6d4dbb7a4
some debugging
2017-02-10 09:18:04 -08:00
Zach Pomerantz
9b0f9e8d33
log full i/o stats
2017-02-10 04:32:42 -05:00
Brad Hefta-Gaub
6a4f66677e
Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages
2017-02-09 21:10:10 -08:00
Brad Hefta-Gaub
987f147ed4
implement support for binary data over messages
2017-02-09 20:41:34 -08:00
Atlante45
fcb74bce10
First draft for entity script server log streaming
2017-02-09 13:04:43 -08:00
samcake
24a3a514a4
Merge pull request #9594 from AndrewMeadows/cap-fbx-texture-size
...
Cap fbx texture size
2017-02-07 12:46:22 -08:00
David Kelly
9788b4bdaf
Merge pull request #9601 from davidkelly/dk/deadlockPrevention
...
Minor cleanup
2017-02-07 12:56:03 -07:00
Seth Alves
e3af5032c0
send UserActivityLogger events when tablet is opened or closed
2017-02-06 16:49:26 -08:00
Andrew Meadows
b3ae6f9aec
cap size of textures from FBX files
2017-02-06 11:53:37 -08:00
howard-stearns
8b44e83d9e
Add new EntityPhysics packet type.
2017-02-06 11:11:18 -08:00
David Kelly
8612302f07
Revert "I like this better"
...
This reverts commit 069c85c7c2
2017-02-03 10:08:46 -07:00
David Kelly
069c85c7c2
I like this better
2017-02-03 08:52:33 -07:00
David Kelly
93fee0cf83
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/deadlockPrevention
2017-02-03 08:29:28 -07:00
David Kelly
77ca4cf515
Avoid holding 2 locks at same time
...
If they are always called in same order, you are fine. But just in
case, lets instead grab one lock, update the data, release it and then
grab the other. No possible deadlock in that, even if the order is
changed in one place or another.
2017-01-26 17:38:32 -07:00
ZappoMan
3c3dcbbbaa
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 08:20:03 -08:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
ZappoMan
29fff2e556
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 13:09:59 -08:00
Clément Brisset
6da188b6ae
Merge pull request #33 from huffman/feat/entity-server-script-property
...
Fix compilation error and move MessageID to CilentServerUtils
2017-01-20 17:37:01 -08:00
Ryan Huffman
e9c6e9dd5c
Move MessageID to ClientServerUtils
2017-01-20 16:43:11 -08:00
Stephen Birarda
7e9dffc028
fix version number for EntityQuery JSON filter
2017-01-20 14:08:28 -08:00
Ryan Downe Karpf
03851d4188
Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics
...
Some initial analytics for PAL usage
2017-01-20 08:30:46 -08:00
Atlante45
3203e8c7c2
Use Huffman's version of getEntityScriptDetails
2017-01-19 15:49:40 -08:00
Ryan Huffman
091c353a85
Add comment to endif in EntityScriptUtils
2017-01-19 15:47:52 -08:00
Ryan Huffman
36a46c1bd6
Add EntityScriptUtils
2017-01-19 15:44:15 -08:00
Ryan Huffman
ff65d0c8cb
Fix property assignment in GetScriptStatusRequest
2017-01-19 15:33:17 -08:00
Ryan Huffman
465f5c6789
Add getters to ScriptStatusRequest
2017-01-19 15:09:16 -08:00
Ryan Huffman
fa28933464
Update EntityScriptClient to receive more status information
2017-01-19 13:27:44 -08:00
David Kelly
d9fbf832e2
Some initial analytics for PAL usage
2017-01-19 11:35:17 -08:00
Clément Brisset
89d1242925
Merge pull request #10 from huffman/feat/entity-server-script-property
...
Entity script status + reload
2017-01-19 11:19:40 -08:00
Stephen Birarda
ed68d5a7a2
add JSON filter to OctreeQuery
2017-01-18 14:58:36 -08:00
Zach Fox
0ec01c0dc5
CR feedback
2017-01-18 14:55:53 -08:00
Zach Fox
346cfbfe02
First checkpoint
2017-01-18 12:55:24 -08:00
Ryan Huffman
3b5b88e719
Move MessageID to AssetUtils
2017-01-18 11:17:13 -08:00
Ryan Huffman
8137c59ef7
Add support for sending requests to entity script server
2017-01-18 11:15:29 -08:00
Zach Fox
7a568ed8a7
Merge pull request #9401 from zfox23/PAL_DisplayName
...
PAL: Editable Display Names & Immediate Update
2017-01-17 16:00:41 -08:00
Ryan Huffman
812aaee48c
Add Entities.reloadServerScripts
2017-01-17 14:47:57 -08:00
Ryan Huffman
b0c2a9d614
Add serverScripts entity property
2017-01-17 14:47:06 -08:00
Atlante45
163d65d784
Setup basic EntityScriptServer
2017-01-17 13:47:45 -08:00
Zach Fox
246f5fb7f5
Add log; fix whitespace
2017-01-17 11:51:09 -08:00
David Kelly
2460e89a57
CR feedback
2017-01-17 09:53:04 -08:00
David Kelly
6c07a9aece
remove debuggng logspam
2017-01-16 19:06:36 -08:00
David Kelly
6c701bb0f0
remove ignored avatars from PAL when they disconnect
2017-01-16 18:22:53 -08:00
Zach Fox
1e8effdcc4
Packet verison bump
2017-01-16 15:28:53 -08:00
ZappoMan
c884b276e2
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-14 22:15:22 -08:00
Zach Fox
b0b6aeac6c
Ken's feedback
2017-01-13 13:00:03 -08:00
Zach Fox
8c3766dfe8
Fixme
2017-01-13 12:59:24 -08:00
Zach Fox
8bb200902f
First pass
2017-01-13 12:57:35 -08:00
Brad Davis
e256f7cccc
Remove sendqueue spam in traces
2017-01-11 14:27:27 -08:00
Brad Hefta-Gaub
ef7b9bfde0
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 10:07:05 -08:00
Zach Fox
dec41f67cc
Fix bugs and generally fix behavior
2017-01-06 13:58:23 -08:00
Zach Fox
b7d64804c1
Remove errant //FIXME
2017-01-05 21:55:09 -08:00
Zach Fox
495925a017
This behavior was harder to change than expected...
2017-01-05 16:58:32 -08:00
Brad Hefta-Gaub
5242375215
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-05 08:57:10 -08:00
Ken Cooke
84af90ad96
Bump the audio packet version
2017-01-04 19:59:50 -08:00
Brad Hefta-Gaub
acca9dbe87
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2017-01-04 18:07:22 -08:00
Zach Fox
e80ae92327
Also clear personalmutedlist upon reset()
2017-01-04 15:06:18 -08:00
Howard Stearns
3d8da683db
Merge pull request #9290 from zfox23/PersonalMute
...
Personal mute; Quasi-ignore; Reversible PAL actions
2017-01-04 14:37:09 -08:00
Zach Fox
14def61eb8
More CR comments; 1 bug remaining re: sig slot
2017-01-03 17:32:47 -08:00
Zach Fox
899dd21328
Lots of CR feedback
2017-01-03 15:43:30 -08:00
Brad Hefta-Gaub
60d48bcd49
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-03 14:42:59 -08:00
Zach Fox
10b5b957f2
Ahh...It's beautiful and simple now.
2016-12-29 13:09:40 -08:00
Zach Fox
24eac77115
I'm about to refactor this.
2016-12-29 11:57:51 -08:00
Zach Fox
bb2b48d424
Getting very close.
2016-12-29 11:35:20 -08:00
Brad Hefta-Gaub
a72f60152b
audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate
2016-12-29 08:53:37 -08:00
Zach Fox
af1c67a252
Progress!
2016-12-28 17:23:56 -08:00
Zach Fox
e26d347682
It seems to be working, minus removing from list
2016-12-28 15:15:39 -08:00
Zach Fox
46e8bf5283
First steps, holding off til Howard finishes
2016-12-28 15:12:21 -08:00
Zach Fox
800389cf20
Remove HRS logging
2016-12-28 14:37:19 -08:00
David Kelly
38a3ee4104
Some code review feedback
...
more to come
2016-12-27 10:17:39 -08:00
howard-stearns
a9e781f565
naming consistentcy. No functional changes.
2016-12-27 10:17:39 -08:00
howard-stearns
8b9c1446cd
protocol versions
2016-12-27 10:17:39 -08:00
howard-stearns
2f2940b7cc
fixes
2016-12-27 10:14:28 -08:00
Howard Stearns
344272f24a
unignore checkpoint (untested)
2016-12-27 10:14:24 -08:00
howard-stearns
0ad9786f6b
requestsDomainsListData
2016-12-27 10:14:20 -08:00
Brad Hefta-Gaub
02a6060b5e
hacking on new format
2016-12-22 16:16:44 -08:00
Brad Davis
e58623bcc0
Working on test/trace script interface
2016-12-22 11:46:40 -08:00
Brad Hefta-Gaub
be62df2001
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-21 08:59:29 -08:00
David Kelly
50554e934e
Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn
2016-12-20 16:30:10 -08:00
Brad Hefta-Gaub
d09afa9454
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
...
Conflicts:
assignment-client/src/avatars/AvatarMixer.h
assignment-client/src/avatars/AvatarMixerClientData.h
libraries/avatars/src/AvatarData.cpp
libraries/networking/src/udt/PacketHeaders.h
2016-12-20 16:25:12 -08:00
David Kelly
4a25b727d8
Add comment back, with interest
2016-12-20 14:26:45 -08:00
David Kelly
7750e86c13
Only send machine fingerprint when not logged in
...
While at it, no longer grabbing it at all when starting up, as that
was just a dev thing. Should consider not sending MAC address too, but
we may revisit that later.
2016-12-20 13:47:58 -08:00
Brad Hefta-Gaub
9b11c7cc9c
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/networking/src/NodeList.cpp
2016-12-20 10:46:57 -08:00
Howard Stearns
9aad93465d
Merge pull request #9227 from howard-stearns/sessionDisplayNames
...
Session display names
2016-12-20 10:07:05 -08:00
Howard Stearns
9ff06e53d4
Merge pull request #9235 from davidkelly/dk/fingerprintInPAL
...
Expose Machine Fingerprint in PAL
2016-12-20 10:06:36 -08:00
Brad Hefta-Gaub
c65471e880
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/script-engine/src/FileScriptingInterface.cpp
2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
Chris Collins
61c60fca2d
Merge pull request #8968 from ctrlaltdavid/21089
...
Clara.io marketplace improvements
2016-12-19 18:21:45 -08:00
David Kelly
4feec85337
CR feedback
...
Though this seems like a hard place to remember, when we make further
changes.
2016-12-19 17:23:24 -08:00
David Kelly
5b9c19b39e
Versioning
2016-12-19 16:06:12 -08:00
howard-stearns
60cb7acb50
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-19 15:28:07 -08:00
David Kelly
36792e005a
initial commit
2016-12-19 14:19:39 -08:00
David Kelly
c0d7c06d4a
Merge pull request #9221 from davidkelly/dk/machineFingerprintToDS
...
Adding Machine Fingerprint to Domain Server permissions
2016-12-19 11:49:33 -08:00
Zach Fox
a912fec496
PR comments; need particular fix on Master for full QA
2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4
Comments and clarity
2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08
Super close
2016-12-19 10:20:08 -08:00
Zach Fox
802e283508
Another checkpoint, getting closer
2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f
Checkpoint
2016-12-19 10:20:08 -08:00
howard-stearns
9d9345cb65
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-19 09:19:14 -08:00
Brad Davis
ee3c8e6efd
Merge pull request #9225 from jherico/chrome_tracing
...
Additional work on tracing
2016-12-16 17:53:55 -08:00
David Kelly
0553dbdcb7
CR feedback
2016-12-16 17:17:10 -08:00
Ryan Huffman
8f536fcf5e
Fix syntax error in UserActivityLogger
2016-12-16 15:05:17 -08:00
Ryan Huffman
f3f6317c91
Add controller name and update version in tutorial user stats
2016-12-16 15:05:17 -08:00
howard-stearns
3adc78fecc
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de
sessionDisplayName set at server and passed to all clients (including
...
oneself)
2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
David Kelly
126ae52cb4
Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS
2016-12-16 12:17:54 -08:00
Brad Davis
a12b8b4b62
Cleanup dead code
2016-12-16 09:21:41 -08:00
David Kelly
7a346b99b9
Add CoreFoundation to libraries we link to on MacOS
...
Turns out vhacd-util and ice-server don't link to it, and we need
it for machine fingerprint. So the build system doesn't make mac
vhacd-util or ice-server builds I guess, or this would have shown
up awhile ago.
2016-12-16 08:58:20 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
David Rowe
9459b967be
Merge branch 'master' into 21089
2016-12-16 20:02:43 +13:00
Brad Hefta-Gaub
8497ad1e29
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-15 16:42:41 -08:00
Seth Alves
26639aac15
Merge pull request #8789 from Atlante45/fix/settings
...
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
David Kelly
2566778654
Handle no setting manager case
...
Can't save the fallback generated UUID for machine fingerprint if
the user of this stuff doesn't have a settings file. Found this when
I noticed needed to initialize com for all the assignment clients
2016-12-14 16:43:37 -08:00
David Kelly
cb14b0e3e0
inital cut, passing fingerprint in
...
does permissions same as mac address, more or less. Not exposed
yet, just a beginning.
2016-12-14 16:09:13 -08:00
Brad Hefta-Gaub
a7750501c6
first cut at adding view frustum support to avatar mixer
2016-12-13 18:58:11 -08:00
Zach Fox
44c6eb303b
Fix the bug
2016-12-13 12:46:31 -08:00
David Rowe
1f3045ad30
Merge branch 'master' into 21089
...
Conflicts:
interface/src/Application.cpp
2016-12-13 14:05:24 +13:00
David Rowe
efb784f703
Code review
2016-12-13 13:11:21 +13:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
David Rowe
a52d8d1982
Merge branch 'master' into 21089
2016-12-10 11:47:43 +13:00
Chris Collins
ec4edf5030
Merge pull request #9130 from zzmp/feat/audio-threading
...
Threaded Audio
2016-12-09 10:46:54 -08:00
Zach Pomerantz
b2f995d3df
algorithm->nestedEach in LimitedNodeList
2016-12-07 00:03:30 +00:00
David Kelly
562cd12bca
More CR feedback
...
Breaking into 2 functions - one public, one private, so I can avoid
nested control structures and so on in dealing with errors on the
windows side of things. So, no more namespace, back to a class with
2 static functions, one public one private
2016-12-06 15:17:47 -08:00
David Rowe
d857f943f8
Handle Clara marketplace downloads
2016-12-07 09:16:59 +13:00
David Kelly
dc47c5fc0c
CR feedback
...
lame mistake - it is always the error branches that get you.
2016-12-06 11:12:50 -08:00
David Kelly
7880b5bfe0
Simple fallback now
...
If the bios uuid isn't a valid UUID (on mac or windows it 'should be`)
then we read the fallback from the settings and use that, or create and
write one to the settings if it is missing.
2016-12-05 17:05:39 -08:00
David Kelly
54716f70e5
Now works on mac, small build change for that
...
Plus does nothing for linux, but there's a comment.
2016-12-05 11:11:30 -08:00
David Kelly
643353a31e
Initial push
...
Works on windows, have not tried it on mac. Lots more to do, but
need to get it pushed to remote just in case.
2016-12-02 15:46:20 -08:00
Zach Pomerantz
8a6dcdeb68
mix audio with single node list read lock
2016-11-30 16:37:34 -05:00
Atlante45
1d8c97b337
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-30 10:22:16 -08:00
Zach Pomerantz
e6dfc5204d
expose mutex in LimitedNodeList
2016-11-28 17:13:21 -05:00
howard-stearns
b37feb20de
signal from ignoreNodesInRadius
2016-11-23 11:23:06 -08:00
howard-stearns
8b9efb461e
bubble state
2016-11-23 10:22:24 -08:00
howard-stearns
066a518142
expose metaverse url to javascript and use it rather than hardcoding
2016-11-21 13:07:38 -08:00
Atlante45
3035d43772
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-21 13:05:08 -08:00
howard-stearns
5b216578d7
Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup
2016-11-21 11:47:30 -08:00
Brad Hefta-Gaub
fe709f51de
personal space feature
2016-11-19 16:30:15 -08:00
howard-stearns
f1806eb649
server protocols
2016-11-18 17:05:14 -08:00
Stephen Birarda
47f82a8046
send the mac address with domain-server check in
2016-11-18 13:50:11 -08:00
howard-stearns
9f2b6dc40b
location cleanup
2016-11-16 12:53:57 -08:00
Chris Collins
0876dbc809
Merge pull request #9050 from sethalves/last-edited-by
...
lastEditedBy property for entities
2016-11-11 16:02:18 -08:00
Chris Collins
6581a51bc9
Merge pull request #9052 from davidkelly/dk/2226
...
Add ability to mute user
2016-11-11 16:02:08 -08:00
Ryan Huffman
2203607044
Merge pull request #9056 from Atlante45/networking
...
Protect against empty packet lists
2016-11-11 15:28:46 -08:00
Atlante45
a38846aeed
Protect against empty packet lists
2016-11-11 14:32:52 -08:00
David Kelly
9c8f22e0e7
straight to audio mixer
...
since we can get the canKick there too. (doh)
2016-11-11 09:30:58 -08:00
Seth Alves
899dec8b10
Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by
2016-11-11 06:11:49 -08:00
Seth Alves
5629db9109
Merge pull request #9049 from birarda/max-min-av-scale
...
add a min/max avatar scale in domain-server settings
2016-11-11 06:11:02 -08:00
David Kelly
285520dff7
Initial cut
...
No script work yet, just first stab at underpinnings
2016-11-10 16:24:35 -08:00
Seth Alves
850361f222
lastEditedBy property for entities
2016-11-10 15:26:28 -08:00
Stephen Birarda
6f442a74b1
request settings from agents and debug results
2016-11-10 14:43:15 -08:00
Anthony J. Thibault
839b1a3c5e
Added some jsdoc comments to the C++ source
2016-11-09 18:09:10 -08:00
Brad Hefta-Gaub
5454dca82e
Merge pull request #9030 from highfidelity/stable
...
Update master with Stable hotfix
2016-11-07 18:48:54 -08:00
Atlante45
f34cf64f3e
Disable updater on Steam
2016-11-07 16:09:56 -08:00
humbletim
2139e979da
map specific HTTP errors to corresponding ResourceRequest enums
2016-11-06 10:31:02 -05:00
Chris Collins
dc8d0bf31c
Merge pull request #8935 from zzmp/log/silence-udt-socket
...
group udt::Socket errors as debug logs
2016-10-31 10:31:10 -07:00
Clément Brisset
95c175ae74
Merge pull request #8950 from huffman/tutorial/gotoentrystep
...
Add tutorial tracking for going through the welcome portal
2016-10-28 16:26:40 -07:00
Ryan Huffman
9a99cd0ec6
Add tutorialID and tutorialVersion to tutorial progress event
2016-10-28 12:53:16 -07:00
Stephen Birarda
7ddfddc567
make the socket readyRead check fire after 2s of no packets
2016-10-28 10:30:20 -07:00
Stephen Birarda
20f042a15a
add slightly more information to last packet debug in Socket
2016-10-27 22:10:32 -07:00
Stephen Birarda
db7f5724f7
output last seq number and last socket before readyRead sticks
2016-10-27 21:50:29 -07:00
Zach Pomerantz
72282257bd
group udt::Socket errors as debug logs
2016-10-27 13:45:58 -07:00
Stephen Birarda
4abc4adde9
add a timer to check for readyRead backup
2016-10-26 16:18:12 -07:00
Chris Collins
de419c2818
Merge pull request #8912 from Atlante45/nodelist-race
...
Fix potential race in NodeList
2016-10-26 13:00:05 -07:00
Brad Hefta-Gaub
2fa4f53c4c
Merge pull request #8915 from highfidelity/stable
...
Stable to master
2016-10-25 18:52:29 -07:00
Stephen Birarda
b16f5a4752
include BuildInfo for USE_STABLE_GLOBAL_SERVICES
2016-10-25 17:42:12 -07:00
Atlante45
384f3d9321
Fix potential race in NodeList
2016-10-25 16:58:21 -07:00
Brad Hefta-Gaub
4aa96c9acc
add location and build info to user activity stats
2016-10-25 15:48:03 -07:00
Brad Hefta-Gaub
272055b6ee
add location and build info to user activity stats
2016-10-25 14:19:44 -07:00
Stephen Birarda
b753871fc1
don't change DF or buffer sizes for ice-server
2016-10-25 11:20:10 -07:00
David Kelly
bdcb58bf8b
Merge pull request #8847 from sethalves/fix-audio-mixer-data-race-1
...
fix some data-races in logging system
2016-10-21 15:33:40 -07:00
Chris Collins
8481d0baa5
Merge pull request #8872 from birarda/master
...
always go to dev welcome when not using stable services
2016-10-21 06:16:26 -07:00
Clément Brisset
b63eb6ba9f
Merge pull request #8665 from zzmp/feat/audio-stats
...
move audio stats to QML/JS, with graphs
2016-10-20 16:43:49 -07:00
Stephen Birarda
5886996bc3
always go to dev-welcome when not using stable services
2016-10-20 16:29:40 -07:00
Seth Alves
8ac799ddaf
Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1
2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb
Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0
...
Fix some audio mixer data races
2016-10-20 10:01:26 -07:00
Brad Hefta-Gaub
6109f41ae2
Merge pull request #8859 from Atlante45/seq-num-race
...
Fix sequence number race condition
2016-10-20 08:26:31 -07:00
Brad Hefta-Gaub
00d613a60e
Merge pull request #8848 from sethalves/quiet-compiler
...
quiet warnings in Linux build
2016-10-19 17:41:19 -07:00
Atlante45
bc8554fd90
Fix sequence number race condition
2016-10-19 13:31:00 -07:00
Stephen Birarda
eb8f67b612
cleanup asset file regex, comment in renameMapping
2016-10-19 11:47:57 -07:00
Stephen Birarda
7aac2e6916
restrict asset file mapping operations to file path
2016-10-19 10:57:23 -07:00
Seth Alves
b936252609
quiet compiler
2016-10-18 17:56:57 -07:00
Seth Alves
a801f27c7c
Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-1
2016-10-18 17:34:22 -07:00
Seth Alves
72998b190c
Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-0
2016-10-18 17:33:57 -07:00
Stephen Birarda
22e0e649b1
add a comment for ack count calculations
2016-10-18 16:16:09 -07:00
Stephen Birarda
5bd6cc9fac
fix comparison for reno slow start
2016-10-18 16:01:35 -07:00
Seth Alves
af5be8d1d9
reduce data-races in logging
2016-10-18 15:59:00 -07:00
Stephen Birarda
ddce913095
cleanup math for leftover ACKs
2016-10-18 15:54:25 -07:00
Stephen Birarda
214d2e4c91
break slow start on vegas timeout loss
2016-10-18 15:54:25 -07:00
Stephen Birarda
71de9701e0
add some additional comments to reno congestion avoidance
2016-10-18 15:54:25 -07:00
Stephen Birarda
974cccf519
cleanup initialization of min RTT member variables
2016-10-18 15:54:25 -07:00
Stephen Birarda
b817e72976
comment clarity and readability improvements
2016-10-18 15:54:25 -07:00
Stephen Birarda
d5a450ad30
add comment about Jacobson's formula for RTT estimation
2016-10-18 15:54:25 -07:00
Stephen Birarda
1041443796
use __FUNCTION__ and clearup zero us RTT comment
2016-10-18 15:54:25 -07:00
Stephen Birarda
13c38760b3
switch to wireSize, use time only, remove double public
2016-10-18 15:54:25 -07:00
Stephen Birarda
7567cff590
fix comment for ACK interval of 1
2016-10-18 15:54:25 -07:00
Stephen Birarda
41d48b12bd
add a comment clearing up onACK return
2016-10-18 15:54:25 -07:00
Stephen Birarda
7480d1e45d
switch default hifi address back to welcome
2016-10-18 15:54:25 -07:00
Stephen Birarda
9407efbbc5
protect against an overflow in TCPVegasCC
2016-10-18 15:54:25 -07:00
Stephen Birarda
7ef596a9f0
use ova-welcome for default hifi address
2016-10-18 15:54:25 -07:00
Stephen Birarda
ef660722cd
force duplicated sends to use highest RTT, not lowest
2016-10-18 15:54:25 -07:00
Stephen Birarda
d15cb6171d
fix bubble up of duplicated packet info
2016-10-18 15:54:25 -07:00
Stephen Birarda
0a7d799abf
don't double set _lastACK in TCPVegasCC
2016-10-18 15:54:25 -07:00
Stephen Birarda
fdcface8cb
use enum in PacketHeaders, coding standard fixes in Connection
2016-10-18 15:54:25 -07:00
Stephen Birarda
e7c0ed035f
remove SendQueue fast re-transmit debug
2016-10-18 15:54:25 -07:00
Stephen Birarda
6d69a0dc71
push version for asset packets to mismatch for TCPVegasCC
2016-10-18 15:54:25 -07:00
Stephen Birarda
af969231e7
remove some extra lines
2016-10-18 15:54:25 -07:00
Stephen Birarda
54b28e646a
remove congestion window halving on reno dupe loss
2016-10-18 15:54:25 -07:00
Stephen Birarda
ec51f01c59
remove debugs from TCPVegasCC
2016-10-18 15:54:25 -07:00
Stephen Birarda
a075bb6b1c
slow down new UDT debug for asset-server tests
2016-10-18 15:54:25 -07:00
Stephen Birarda
b03bb6b73f
halve the congestion window on 3rd duplicate ACK
2016-10-18 15:54:25 -07:00
Stephen Birarda
b74a967c95
fix an additional reference to preAIWindowSize
2016-10-18 15:54:25 -07:00
Stephen Birarda
d05e3e1dd6
drop CWS to 2 if reno fast re-transmit is hit
2016-10-18 15:54:25 -07:00
Stephen Birarda
64a0239248
add reno fallback for fast re-transmit
2016-10-18 15:54:25 -07:00
Stephen Birarda
0b2e0a4167
initial re-implementation of reno cong avoid
2016-10-18 15:54:25 -07:00
Stephen Birarda
dbbdda3468
keep track of num RTT and debug reno fallback
2016-10-18 15:54:25 -07:00
Atlante45
2c026d7b0f
Disable packet probes
2016-10-18 15:54:25 -07:00
Atlante45
202641a349
Debug tweaks
2016-10-18 15:54:25 -07:00
Stephen Birarda
5174891b66
move receive time of packet higher in Socket
2016-10-18 15:54:25 -07:00
Stephen Birarda
afc59eea19
grab earliest possible receive time in socket
2016-10-18 15:54:25 -07:00
Stephen Birarda
6a3dd15887
emit packetSent signal immediately after send
2016-10-18 15:54:25 -07:00
Stephen Birarda
b0192df04f
allow congestion control to disable ACK2
2016-10-18 15:54:25 -07:00
Atlante45
3d0f449afb
Ignore ack syn when using vegas
2016-10-18 15:54:25 -07:00
Stephen Birarda
9760fdc906
use MAX_PACKETS_IN_FLIGHT as receiver max flow window
2016-10-18 15:54:25 -07:00
Stephen Birarda
5ffbd2d11e
start num ACKs since FRT to 3
2016-10-18 15:54:25 -07:00
Stephen Birarda
456bcbca67
use max and not min for CW clamp
2016-10-18 15:54:25 -07:00
Stephen Birarda
c0219d9ddf
remove numRTT from TCPVegasCC
2016-10-18 15:54:25 -07:00
Stephen Birarda
995f383edb
default EWMA RTT and variance to first value
2016-10-18 15:54:25 -07:00
Atlante45
f0dcc54a18
Start in slow start
2016-10-18 15:54:25 -07:00
Atlante45
f143e9bf3f
Register SequenceNumber and time_point
2016-10-18 15:54:25 -07:00
Stephen Birarda
7731b407bd
only attempt SQ sleep with > 0 PSP
2016-10-18 15:54:25 -07:00
Stephen Birarda
3ecfd6af67
added debug for fast re-transmit
2016-10-18 15:54:25 -07:00
Stephen Birarda
c794c4af1a
adjust EWMA RTT start values in TCPVegasCC
2016-10-18 15:54:25 -07:00
Stephen Birarda
96ef1fa483
add FRT debug
2016-10-18 15:54:25 -07:00
Stephen Birarda
7cc1f3261e
use last adjustment time to adjust every RTT
2016-10-18 15:54:25 -07:00
Stephen Birarda
0d2e83e0fc
cleanup according to Vegas paper, add fast retransmit
2016-10-18 15:54:25 -07:00
Stephen Birarda
ecbba3d4cd
send time point with packet sent signal
2016-10-18 15:54:25 -07:00
Atlante45
75d4b156f1
Added shouldNAK to CC class
2016-10-18 15:54:25 -07:00
Atlante45
eee617e39c
Remove congestion window size clamp
2016-10-18 15:54:25 -07:00
Stephen Birarda
0954d5bf93
cleanup sent packet time hash after RTT calc
2016-10-18 15:54:25 -07:00
Stephen Birarda
8e05a2893a
change congestion window size to an int
2016-10-18 15:54:25 -07:00
Stephen Birarda
5e637c31de
rename congestion window size var in TCPRenoCC
2016-10-18 15:54:25 -07:00
Stephen Birarda
b232a44c8d
don't send sync ACK when interval is == 1
2016-10-18 15:54:25 -07:00
Stephen Birarda
69ca0d2675
point TCPVegasCC at correct TCPRenoCC base
2016-10-18 15:54:25 -07:00
Stephen Birarda
8c9b46c1e0
fix method signatures, adjust ssthresh increases
2016-10-18 15:54:25 -07:00
Stephen Birarda
eb180b15d8
only raise ssthresh if not reducing cwnd
2016-10-18 15:54:25 -07:00
Stephen Birarda
8304bb81d1
create the base of the TCPVegasCC class
2016-10-18 15:54:25 -07:00
Atlante45
59bcd724ea
More Reno work
2016-10-18 15:54:25 -07:00
Atlante45
bad96d54ea
TCP congestion control first draft
2016-10-18 15:54:25 -07:00
Seth Alves
21ccc58e04
don't pass statsObject by reference
2016-10-18 14:41:33 -07:00
Seth Alves
0c6dedff45
avoid various data-races related to stats collection and delivery
2016-10-18 13:05:53 -07:00
Seth Alves
0cda01f105
send stats to domain-server with networking thread
2016-10-18 10:29:35 -07:00
Atlante45
3955c6c4c6
Don't override place name path with index path
2016-10-17 14:41:05 -07:00
Chris Collins
1c30d98cf9
Merge pull request #8823 from ZappoMan/shutdownSandbox
...
Auto-shutdown of sandbox if it was launched by interface
2016-10-17 13:20:15 -07:00
Brad Hefta-Gaub
d46170bec0
auto shutdown of sandbox when interface quits
2016-10-17 07:55:24 -07:00
Stephen Birarda
d1cd99e035
remove a useless two dots
2016-10-14 18:24:39 -07:00
Stephen Birarda
9184a500a0
move faked handshake logic to Socket for handshake req flag
2016-10-14 14:46:58 -07:00
Stephen Birarda
ccbfdf7bb9
only emit client connection reset on requested handshake
2016-10-14 14:46:58 -07:00
Stephen Birarda
eb77258c55
fix magic numbers and hide sendFakedHandshake
2016-10-14 14:46:58 -07:00
Stephen Birarda
5e03e55ca2
fix for dual alias in LimitedNodeList std::bind
2016-10-14 14:46:58 -07:00
Stephen Birarda
a2de31909c
remove define of UDT connection debug
2016-10-14 14:46:58 -07:00
Stephen Birarda
b81eaa649f
make faked handshake request usable in dev/PR
2016-10-14 14:46:58 -07:00
Stephen Birarda
ea2da34bd1
bubble up receiver handshake from udt::Connection
2016-10-14 14:46:58 -07:00
Stephen Birarda
27617b8479
add forced kill of AS for test
2016-10-14 14:46:58 -07:00
