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
