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
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
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
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
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
Zach Fox
af346f2ced
Protocol change
2017-12-14 10:09:10 -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
