Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets
...
Remove some unneeded Qt dependencies
2018-02-05 15:32:54 -08:00
Seth Alves
14d8259a5e
try harder to bump avatar-mixer protocol version
2018-02-05 11:54:48 -08:00
SamGondelman
4d4294dd6a
Merge remote-tracking branch 'upstream/master' into decals
2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8
wip finish adding material entity
2018-02-02 16:49:33 -08:00
Stephen Birarda
eb9d100fc8
reset count on conn refusal, soft reset DH in Interface on limit reached
2018-02-02 13:47:48 -08:00
Stephen Birarda
e16a3859c2
reset silent check in packet check on domain connection reset
2018-02-02 13:47:48 -08:00
Atlante45
8ebb3e52d8
Misc bug fixes
2018-02-02 13:10:49 -08:00
Elisa Lupin-Jimenez
3d000d3d01
changed packet number
2018-02-02 10:08:39 -08:00
David Rowe
f46362906d
Bump avatar mixer packet version
2018-02-02 10:02:20 +13:00
Brad Hefta-Gaub
f5614618b9
Merge pull request #12288 from ctrlaltdavid/21729
...
Add location.domainID as a synonym for location.domainId
2018-01-31 13:50:48 -08:00
Sam Gateau
9a131cfab6
Merge pull request #12265 from SamGondelman/resourceCache
...
Remove unnecessary invokeMethod from ResourceCache::getResource
2018-01-31 09:35:05 -08:00
David Rowe
280264d7ed
Add location.domainID as a synonym for location.domainId
...
And deprecate location.domainId.
2018-01-30 20:46:27 +13:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request
...
Leopoly_Phase1_003_Asset-Request
2018-01-29 11:40:41 -08:00
Brad Davis
0781d8eaf0
Remove some unneeded Qt dependencies
2018-01-28 22:18:24 -08:00
SamGondelman
78d72a1703
remove unnecessary invokeMethod from ResourceCache::getResource
2018-01-25 16:07:26 -08:00
humbletim
e8f0df4363
switch to bool per CR feedback
2018-01-24 14:28:22 -05:00
humbletim
3ebf322fcf
switch to foreach per CR feeddback
2018-01-24 14:13:34 -05:00
humbletim
c2ee13931e
changes per CR feedback; additional jsdoc
2018-01-24 13:38:10 -05:00
Brad Davis
fb559f3e4a
Use custom default location for android and GLES/Windows
2018-01-23 13:30:36 -08:00
Brad Davis
5bf2bda96d
Merge branch 'android' into android_new
2018-01-23 08:17:46 -08:00
humbletim
97889b30d5
remove unnecessary lambda capture
2018-01-23 03:21:19 -05:00
humbletim
3a735c1fc7
CR feedback and code cleanup
2018-01-23 03:12:26 -05:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
Brad Davis
8f993e5a68
Merge branch 'android' into android_new
2018-01-22 12:48:38 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
Brad Davis
d2fe9e2710
PR feedback
2018-01-19 20:24:34 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
humbletim
395cc663dd
reuse same disk cache as AssetClient
2018-01-19 15:10:36 -05:00
Brad Davis
3dba928b72
Merge remote-tracking branch 'upstream/android' into android_new
2018-01-19 10:36:46 -08:00
humbletim
dfb1619dc6
CR feedback; using namespace AssetUtils => inline AssetUtils::
2018-01-18 21:49:53 -05:00
Brad Davis
bdfa1273ba
Merge remote-tracking branch 'upstream/master' into android
2018-01-18 17:33:10 -08:00
Brad Davis
a4572f3f8f
Log when the file selector chooses a different file than asked for
2018-01-18 16:48:09 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702
...
Add Window.protocolSignature() as a replacement for location.protocolVersion()
2018-01-18 15:20:03 -08:00
David Rowe
8c2427dd58
Rename Window.protocolVersion() to Window.protocolSignature()
2018-01-19 09:06:16 +13:00
Atlante45
482ca3f038
Make type name hash static const
2018-01-18 10:28:43 -08:00
Brad Davis
cbb2d9d854
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 17:51:39 -08:00
humbletim
49bb9420cc
Merge branch 'master' into Leopoly_Phase1_003_Asset-Request
2018-01-17 17:11:33 -05:00
Seth Alves
7af90d5429
Merge pull request #12171 from mnafees/21671
...
CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files
2018-01-17 13:42:47 -08:00
Bradley Austin Davis
9f6c2c3cdd
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 11:44:00 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities
...
Soft Entities
2018-01-17 08:02:37 -08:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
David Rowe
2883e24285
Add Window.protocolVersion() as a replacement for location's
2018-01-17 12:00:35 +13:00
David Rowe
f836a5f2b6
Fix typo
2018-01-17 08:06:04 +13:00
Mohammed Nafees
885801c5ca
Fix copying to clipboard from JS scripts
2018-01-16 13:17:47 -05:00
David Rowe
02179e3efd
Doc review
2018-01-16 17:14:30 +13:00
David Rowe
f319fa70cb
Merge branch 'master' into 21679
2018-01-16 16:22:34 +13:00
Brad Davis
30bd8977b7
Remove android specific start address
2018-01-15 15:16:37 -08:00
Dante Ruiz
645f608814
fixing merge conflict
2018-01-15 10:45:51 -08:00
Brad Davis
58530c595a
Pre-merge cleanup
2018-01-14 19:48:12 -08:00
Brad Davis
bee869d88e
Merge remote-tracking branch 'upstream/master' into android
2018-01-14 13:53:47 -08:00
Anthony J. Thibault
088f227df2
Pass model offset from avatar skeletonModel to attached entity
2018-01-12 10:26:02 -08:00
Nissim Hadar
a1f25bf49c
Moved variable setting to outside of loop.
...
Added copy of ambient URL.
2018-01-11 19:35:13 -08:00
Nissim Hadar
4bd09fd9af
Corrected default values - for reading legacy content.
2018-01-11 14:53:58 -08:00
David Rowe
309e7f7333
Tidying
2018-01-11 14:48:45 +13:00
Brad Davis
560fd38547
Merge remote-tracking branch 'upstream/master' into android
2018-01-10 17:31:50 -08:00
Brad Davis
97593bc4d8
Fixing compiled resource access
2018-01-10 17:18:12 -08:00
David Rowe
951f52c4b2
Merge branch 'master' into 21679
2018-01-11 13:54:06 +13:00
David Rowe
753bd21e68
location API JSDoc
2018-01-11 13:44:16 +13:00
Brad Davis
2c35242af1
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-10 13:40:12 -08:00
Nissim Hadar
8396997dec
Renamed enum element.
2018-01-10 13:35:57 -08:00
Nissim Hadar
c99a936720
Bumped up protocol version.
2018-01-10 11:45:37 -08:00
Dante Ruiz
d0bff29471
fixing merge conflict
2018-01-10 10:11:53 -08:00
Dante Ruiz
c4253f3b3b
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-09 15:31:38 -08:00
Brad Davis
d6dd29b952
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-09 11:43:03 -08:00
Brad Davis
bd5af2b493
Working on android avatar rendering
2018-01-09 11:40:32 -08:00
Nissim Hadar
7811ddb904
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2018-01-08 15:39:09 -08:00
Nissim Hadar
b2b1807490
Changes per code review.
2018-01-08 15:37:06 -08:00
MiladNazeri
56d4429a8b
Merge pull request #12020 from ctrlaltdavid/21646
...
Window JSDoc
2018-01-08 11:53:34 -08:00
Nissim Hadar
a33f3446f6
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2018-01-08 11:51:13 -08:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser
...
Consistent go to user
2018-01-07 11:07:39 -08:00
David Rowe
5463f1ae6b
Merge branch 'master' into 21646
2018-01-05 16:58:58 +13:00
Nissim Hadar
e797a77262
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# interface/resources/qml/js/Utils.jsc
2018-01-04 15:58:08 -08:00
Dante Ruiz
b526842a46
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-04 14:23:10 -08:00
Atlante45
294a7ca3c6
Make sure the protocol signature still changes
2018-01-04 13:15:01 -08:00
Atlante45
d4a239731c
Add Unused packet type back for ICE servers
2018-01-04 13:07:02 -08:00
humbletim
a863aec4a0
put existing AssetUtils functions in namespace per CR feedback
2018-01-03 04:01:43 -05:00
humbletim
8d2e041678
remove debug prints; CR feedback
2018-01-03 03:39:24 -05:00
Atlante45
aec5ab5921
CR
2017-12-29 12:46:52 -08:00
Atlante45
28f164d7e5
Remove legacy jurisdiction code
2017-12-29 12:46:52 -08:00
Dante Ruiz
30bbe6e41b
added relayParentJoints property
2017-12-28 15:43:59 -08:00
Nissim Hadar
affc5d1b86
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2017-12-24 15:27:32 -08:00
John Conklin II
0dd5bbc2d6
Merge pull request #12057 from birarda/61-1-merge-back
...
Merge stable back into master after RC61.1
2017-12-22 16:26:08 -08:00
Stephen Birarda
e3cbfd92a0
Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back
2017-12-22 15:48:04 -08:00
Nissim Hadar
8ee5f642a9
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2017-12-22 15:41:59 -08:00
Zach Fox
808b9cbc31
Merge pull request #12047 from zfox23/commerce_dataTracking3
...
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-22 14:31:03 -08:00
Stephen Birarda
d299b9a56c
Merge pull request #12024 from birarda/bug/entity-sequence-skip
...
handle sequence number from reliably sent adds in OctreeEditPacketSender
2017-12-22 12:30:27 -08:00
Stephen Birarda
95c7f876bf
manually force OwnershipChallengeFix to avoid StaticCertJsonVersionOne
2017-12-21 18:52:01 -08:00
John Conklin II
5a839ebd93
Merge pull request #12049 from zfox23/RC61.1_commerce_fixEcdsaError1
...
RC61.1: Commerce: Fix some rezzing errors; Fix ECDSA errors
2017-12-21 17:46:32 -08:00
Zach Fox
07a1cf434a
IT'S WORKING!!!
2017-12-21 16:33:47 -08:00
Zach Fox
618e5c9032
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-21 15:46:01 -08:00
Zach Fox
73eb258e79
IT'S WORKING!!!
2017-12-21 15:17:52 -08:00
Stephen Birarda
31e9f26772
fix use after free of pending message
2017-12-21 11:35:11 -08:00
humbletim
8c7a8f0df3
expanded Assets scripting interface
2017-12-21 12:04:47 -05:00
Nissim Hadar
d4b34b71ad
First version with packet update.
2017-12-20 13:12:07 -08:00
Stephen Birarda
1a6546999a
track reliably sent adds in sent packet history from OEPS
2017-12-19 16:00:55 -08:00
David Rowe
e6c40f4aae
Window JSDoc
2017-12-20 10:16:09 +13:00
howard-stearns
16a58ddf5a
Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser
2017-12-19 10:48:34 -08:00
Howard Stearns
f8cef6631b
Merge pull request #11995 from birarda/bug/fix-connection-reset
...
make udt::Connection live as long as node connection
2017-12-19 09:43:54 -08:00
SamGondelman
90d0e9dc32
bump protocol version
2017-12-18 18:35:15 -08:00
Thijs Wenker
3a55fcfaf5
Merge pull request #12014 from thoys/feat/list-assignment-types
...
list assignment types in assignment-client help
2017-12-18 16:55:57 -08:00
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
