Zach Fox
|
fdcc149c34
|
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
|
2017-08-30 13:27:18 -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 |
|
humbletim
|
9348048387
|
Merge remote-tracking branch 'upstream/master' into 21180-C++
|
2017-08-24 16:23:47 -04: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
|
1eb7fb5b3d
|
always write rank ID to variant when present
|
2017-08-21 17:15:44 -07: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 |
|