Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-20 06:20:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70106 commits 25 branches 0 tags 1.1 GiB
Commit graph

3969 commits

Author SHA1 Message Date
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2 
Commerce: Add Passphrase Auth Status data tracking
 2017-12-18 16:26:59 -08:00
Thijs Wenker
1bfb62bd7f list assignment types in assignment-client help 2017-12-18 15:32:32 -08:00
Zach Fox
e075cd79fb Add Passphrase Auth Status data tracking 2017-12-18 11:51:12 -08:00
howard-stearns
d730b7b87b consistent goToUser behavior in PAL, and be able to go to flying user. 2017-12-15 17:00:54 -08:00
Stephen Birarda
a5c951a666 remove tracking of last receiver response from SendQueue 2017-12-14 16:41:20 -08:00
Stephen Birarda
75e56b5daa make the _lastMessageNumber in Connection default to 0 2017-12-14 16:41:20 -08:00
Stephen Birarda
8a2c31d342 only de-activate the SendQueue when it has nothing to send 2017-12-14 16:41:20 -08:00
Stephen Birarda
cf28fdf188 fix message erase in conn, SendQueue ctor order 2017-12-14 16:41:20 -08:00
Atlante45
34c1c27455 Keep track of message numbers 2017-12-14 16:41:20 -08:00
Atlante45
702d2c34a5 Reset ACK in ctor 2017-12-14 16:41:20 -08:00
Atlante45
b2beeae6b1 Keep connection alive as long as the node is connected 2017-12-14 16:41:20 -08:00
Stephen Birarda
da56d47307 make the _lastMessageNumber in Connection default to 0 2017-12-14 15:30:51 -08:00
Stephen Birarda
8b5e8f8d08 only de-activate the SendQueue when it has nothing to send 2017-12-14 15:30:25 -08:00
Stephen Birarda
7f948586dd fix message erase in conn, SendQueue ctor order 2017-12-14 12:07:32 -08:00
Zach Fox
af346f2ced Protocol change 2017-12-14 10:09:10 -08:00
Atlante45
ad547f483d Keep track of message numbers 2017-12-13 19:25:24 -08:00
Atlante45
44190f16c0 Reset ACK in ctor 2017-12-13 16:55:08 -08:00
Atlante45
3a45907df0 Keep connection alive as long as the node is connected 2017-12-13 14:42:20 -08:00
Stephen Birarda
7a81c3e8e7 allow passing of custom URL on env 2017-12-12 16:32:43 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Zach Fox
3183a1a8b9 Add setupAttemptID to every step (thanks Dave) 2017-12-05 16:48:30 -08:00
Zach Fox
902064ed37 Cleanup debug stuff 2017-12-05 15:26:55 -08:00
Zach Fox
7521e4870e Bugfixes 2017-12-05 14:56:47 -08:00
Zach Fox
668f6d50b5 Add data tracking for wallet setup 2017-12-05 14:13:48 -08:00
Zach Fox
4334bf8222 Add data tracking for purchase and rez 2017-12-05 13:09:09 -08:00
Bradley Austin Davis
59aea9c401
Merge pull request #11862 from jherico/android_nov 
Make buildable APK from Gradle
 2017-11-30 11:23:29 -08:00
Brad Davis
d769acd345 Updating Android toolchain 2017-11-28 11:32:32 -08:00
Stephen Birarda
8978254037 kick logged in by fingerprint/ip if enabled in DS settings 2017-11-27 18:23:14 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -08:00
Brad Hefta-Gaub
ebac2556e4
Merge pull request #11841 from ZappoMan/makeAddEntityAtomic 
Make add entity atomic
 2017-11-18 14:27:12 -08:00
Brad Hefta-Gaub
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain 
Adjustable master avatar volume
 2017-11-17 16:58:27 -08:00
ZappoMan
66454e7288 fix unix warnings 2017-11-17 16:33:43 -08:00
ZappoMan
71a46a3374 cleanup 2017-11-17 13:03:04 -08:00
Stephen Birarda
239b116874
Merge pull request #11835 from birarda/bug/octree-connection-id 
Reset EntityTreeSendThread known state if client disconnects from Entity Server
 2017-11-17 12:56:25 -08:00
Stephen Birarda
16d93ee168 clarify signatures in LNL to send packet lists 2017-11-17 11:17:11 -08:00
ZappoMan
cd0fa989e1 debugging 2017-11-17 08:55:55 -08:00
ZappoMan
e438ac54d5 make adds go over NLPacketList as reliable 2017-11-16 13:16:23 -08:00
Stephen Birarda
eedb77dae9 add clearing of known state if client resets ES connection 2017-11-16 11:40:35 -08:00
ZappoMan
4c4f23e312 Merge branch 'master' of https://github.com/highfidelity/hifi into makeAddEntityAtomic 2017-11-16 10:09:46 -08:00
Atlante45
e68ce97697 Remove the number of socket change tracking 2017-11-15 11:19:54 -08:00
ZappoMan
c6947dd165 some side by side plumbing for NLPackets and NLPacketLists 2017-11-09 18:20:06 -08:00
Melissa Brown
a14e98053e
Merge pull request #11138 from Nex-Pro/21466 
Fix Avatar Rotation upon Teleporting Using PAL
 2017-11-03 11:58:15 -07:00
Zach Fox
48979a5ce8
Merge pull request #11730 from zfox23/pop_avatarEntityTests 
Commerce: Avatar Entity Tests
 2017-11-02 15:34:37 -07:00
Stephen Birarda
25c10d5de2
Merge pull request #11735 from highfidelity/stable 
Merge stable back into master
 2017-11-02 14:22:31 -07:00
Ryan Huffman
edc7b91a42 Fix comment in NetworkingConstants referencing shared.js location 2017-11-01 12:57:07 -07:00
Zach Fox
bb1ffbc06f Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests 2017-11-01 12:38:34 -07:00
Ken Cooke
82d9827571 Merge branch 'master' into audio-louder-mastergain 2017-11-01 08:10:55 -07:00
Nissim Hadar
03d2ca19b9 Moving consts into mode::Haze namespace. 2017-10-31 13:46:58 -07:00
Zach Fox
90e9251176 It's a start 2017-10-31 11:28:19 -07:00
Ken Cooke
cfba6ae819 Implement master avatar gain in the audio-mixer 2017-10-31 11:18:03 -07:00
Ken Cooke
6ba2a83bbe Send and receive Avatar MASTER Gain packets, signaled using null nodeID. 
Packet protocol change is not needed (existing audio-mixer will ignore).
 2017-10-29 10:47:56 -07:00
divya
de4fd269ef
Merge pull request #11701 from birarda/bug/local-ds-inconnect 
only respond to expected ICE peers in DS
 2017-10-28 21:23:05 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster 
Commerce: Owner Verification for Certified Entities
 2017-10-27 12:28:04 -07:00
Stephen Birarda
689828e3fa add packet version change for ICE ping change 2017-10-27 10:00:49 -07:00
Stephen Birarda
10d05ba6c9 only respond to expected ICE peers in DS 2017-10-26 16:34:49 -07:00
Zach Fox
002141724b Return to using NetworkingConstants 2017-10-26 14:12:36 -07:00
Stephen Birarda
e450ac5bd3 don't use COW-less SpecialAddress assignment 2017-10-25 15:28:30 -07:00
Zach Fox
14150c09ac Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-25 12:59:36 -07:00
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -07:00
Zach Fox
d7bdbfb37b Fix unix build errors 2017-10-25 09:53:59 -07:00
ZappoMan
aad91edba2 actually remove all those defines 2017-10-24 14:45:33 -07:00
Zach Fox
b092862b03 Missed another spot 2017-10-24 14:23:06 -07:00
ZappoMan
5901d1a311 clean up VERSION_ENTITIES stuff 2017-10-24 13:48:27 -07:00
Zach Fox
48c8d52c09 Cleanup 2017-10-24 13:30:27 -07:00
ZappoMan
12c32d5834 bump protocol version 2017-10-24 13:08:48 -07:00
Zach Fox
c64c2e17c8 First pass at consolidation 2017-10-24 12:01:05 -07:00
ZappoMan
a1885926b5 some cleanup 2017-10-24 11:46:42 -07:00
ZappoMan
1128a98e88 implement callEntityClientMethod 2017-10-24 11:15:57 -07:00
Zach Fox
cda43ec1ea Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-23 11:52:59 -07:00
ZappoMan
fb7f6df694 CR feedback 2017-10-22 11:40:41 -07:00
ZappoMan
934c9479af implement support for Entities.callEntityServerMethod() 2017-10-21 20:27:35 -07:00
Zach Fox
0dc6211a7d Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 14:43:33 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00
Zach Fox
9537e19ad4 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 10:58:55 -07:00
Zach Fox
3f0b08aea8 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-18 10:37:47 -07:00
Zach Fox
552defb418 Change protocol version 2017-10-16 11:23:34 -07:00
Nissim
0a5302ce25 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-10-16 11:01:13 -07:00
Ryan Huffman
4a9aa30630 Merge pull request #10956 from birarda/feat/update-default-avatar 
update default avatar to be better with oculus grab triggers
 2017-10-13 15:57:37 -07:00
Nissim Hadar
30fdf9d08e Merge branch 'master' into hazeZone 2017-10-11 22:12:52 -07:00
Seth Alves
ca128a3251 merge from upstream 2017-10-11 11:09:33 -07:00
Clément Brisset
3b48833cc0 Merge pull request #11451 from huffman/feat/upload-user-event 
Add uploading to asset server event
 2017-10-10 11:03:33 -07:00
Daniela
a46ef56af9 Merge with hifi:master. Packet Headers version were increased. 2017-10-10 17:26:33 +01:00
Gerard Maguire
afb03b3d2d Avatar pitch and roll cleared 2017-10-10 16:19:31 +01:00
Stephen Birarda
72b23a0fbb update default avatar to be better with oculus grab triggers 2017-10-09 10:33:34 -07:00
Seth Alves
4d2f16efc3 allow project to be built with clang on Linux 2017-10-08 18:01:41 -07:00
Gerard Maguire
93caa7e259 Merge branch 'master' of https://github.com/highfidelity/hifi into 21466 2017-10-06 17:52:42 +01:00
Nissim Hadar
86c497a12f Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2017-10-03 10:34:33 -07:00
Daniela
2b18296cfd Merge remote-tracking branch 'upstream/master' 
# the commit.
 2017-10-03 15:26:22 +01:00
Howard Stearns
73c8da99dc Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-29 16:46:43 -07:00
Nissim Hadar
4d8a1db895 Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/entities-renderer/src/RenderableModelEntityItem.cpp
 2017-09-27 17:50:51 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463) 
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
 2017-09-27 14:43:51 -07:00
Ryan Huffman
014a7bc9b0 Fix bytes downloaded stat tracking 2017-09-27 09:33:10 -07:00
Daniela
c22d2add17 Resolve conflict with hifi/master. 2017-09-27 17:06:12 +01:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Daniela
179a426389 Address QA comments. 2017-09-26 17:44:46 +01:00
Nissim Hadar
c4419fede8 Bumped up the version number. 2017-09-22 19:07:05 -07:00
Howard Stearns
7724fc204b working checkpoint 2017-09-22 14:19:54 -07:00
Daniela
d054c6dc36 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-21 18:29:45 +01:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
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