Brad Hefta-Gaub
3119b654dc
additional revert related change
2016-05-31 20:50:12 -07:00
Brad Hefta-Gaub
b8c80e2222
Revert "refresh API info during re-connect - case 570"
...
This reverts commit e8d7f9614a
2016-05-31 20:39:16 -07:00
Brad Hefta-Gaub
0ec7eae58c
fix shapes to property polymorph and persist
2016-05-27 16:59:42 -07:00
Stephen Birarda
1ec421350d
send the UUID session ID without curly braces
2016-05-26 14:56:51 -07:00
Brad Hefta-Gaub
78b6a6c661
Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub
f2acc82899
Merge pull request #7971 from birarda/session-id-with-place-request
...
optionally include the metaverse session ID as HTTP header when sending usage data
2016-05-25 17:14:27 -07:00
Brad Hefta-Gaub
06cb625d09
Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision
...
Improved Avatar Mixer Rotation Precision
2016-05-25 17:14:12 -07:00
Stephen Birarda
66bdbf910d
optionally include the metaverse session ID as an http header
2016-05-25 11:55:04 -07:00
Stephen Birarda
3137cd64e1
clear AddressManager previous lookup on 404
2016-05-25 11:40:17 -07:00
Brad Hefta-Gaub
ff45633c21
bump entities version/CR feedback
2016-05-24 17:36:52 -07:00
Brad Hefta-Gaub
5668db9e4a
cleanup and dead code removal
2016-05-24 15:43:30 -07:00
Brad Hefta-Gaub
3b0081fbbb
cleanup and dead code removal
2016-05-24 15:42:55 -07:00
Brad Hefta-Gaub
0553ff5f9f
cleanup and dead code removal
2016-05-24 15:41:11 -07:00
Brad Hefta-Gaub
2eef07e414
cleanup and dead code removal
2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280
check point with protocol refusal working
2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1cf8236860
Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck
2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624
first cut at support for verifying all protocol version compatibility
2016-05-24 13:31:19 -07:00
Brad Hefta-Gaub
bfb3f2cdfe
Merge pull request #7955 from sethalves/quiet-compiler
...
quiet gcc 5 warnings
2016-05-23 19:44:21 -07:00
Clément Brisset
a8b359dd60
Merge pull request #7943 from birarda/api-recheck-on-fail
...
refresh connection info for place/domain while not connected
2016-05-23 10:57:58 -07:00
Anthony J. Thibault
a1c32f8c44
Merge branch 'master' into tony/improved-avatar-mixer-precision
2016-05-23 10:24:52 -07:00
Seth Alves
40e862cf9e
quiet gcc 5 warnings
2016-05-21 16:53:01 -07:00
Seth Alves
f91a2403be
merge from upstream
2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
e012630db2
Merge pull request #7860 from birarda/place-referrer
...
send lookup hostname to DS for split counts, correct number of DS connected users
2016-05-20 17:00:46 -07:00
Brad Hefta-Gaub
18613908df
Merge pull request #7800 from sethalves/no-fly-zones
...
No fly zones
2016-05-20 16:59:55 -07:00
Stephen Birarda
33379824c8
clear place name if switching to a domain ID string
2016-05-20 11:25:26 -07:00
Stephen Birarda
5ab876114f
send hostname to DS with every DS packet to handle changes
2016-05-20 11:24:54 -07:00
Stephen Birarda
7110fe98eb
associate incoming place name with DomainServerNodeData
2016-05-20 11:24:54 -07:00
Stephen Birarda
51c16739f2
provide a getter for the place name in AddressManager
2016-05-20 11:24:54 -07:00
Stephen Birarda
e8d7f9614a
refresh API info during re-connect - case 570
2016-05-19 17:59:42 -07:00
Seth Alves
1de9598243
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 16:37:40 -07:00
Seth Alves
74520f5c92
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 09:49:18 -07:00
Ryan Huffman
64c89a5dde
Fix AccountManager not compiling on Windows
2016-05-18 15:38:54 -07:00
Ryan Huffman
e622c17f6b
Pull default UserAgentGetter out of func signature
2016-05-18 15:38:54 -07:00
Ryan Huffman
bfb4bb0896
Add userAgentGetter to AccountManager for custom UserAgent
2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd
Make AccountManager a DependencyManager singleton
2016-05-18 15:38:54 -07:00
Brad Hefta-Gaub
67891abf17
Merge pull request #7877 from Atlante45/fix/asset-client
...
Fix Asset Client crash
2016-05-18 11:37:34 -07:00
Anthony J. Thibault
b82356a249
AvatarMixer: Clients will show incompatible version dialog
...
For this to work, the server needs to send an empty AvatarIdentity packet back to the sender
when it receives a packet mismatch error. This AvatarIdentity packet will be different then
what the client expects and will trigger the incompatible version dialog.
Previously, the avatar-mixer was just silently dropping incoming mismatched version packets.
Causing the client to never get a response, and thus never showing the incompatible version dialog.
2016-05-17 15:02:04 -07:00
Ryan Huffman
cf6eba96a4
Remove unused variable
2016-05-17 11:17:34 -07:00
Ryan Huffman
2dbea37690
Fix address manager sometimes double adding address history
2016-05-17 11:17:34 -07:00
Ryan Huffman
d47c74408e
Cleanup handleViewpoint
2016-05-17 11:17:34 -07:00
Ryan Huffman
0ec9d9e277
Remove goToAddressFromObject from slots
2016-05-17 11:17:34 -07:00
Ryan Huffman
f213a059fb
Fix AddressManager not always storing history when it should
2016-05-17 11:17:34 -07:00
Ryan Huffman
fde1f0740c
Fix goBackPossible not being triggered correctly in AddressManager
2016-05-17 11:17:34 -07:00
Anthony J. Thibault
55b0060df9
Convert JointData from relative frame to absolute.
2016-05-16 17:48:52 -07:00
Atlante45
419ff3bbea
Track request lifetime in lambda callbacks
2016-05-14 14:50:02 -07:00
Seth Alves
c9c619916c
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-11 19:37:57 -07:00
Seth Alves
fcd2e45d67
merge from upstream
2016-05-11 18:45:32 -07:00
Brad Hefta-Gaub
e01681eb52
Merge pull request #7856 from ZappoMan/NUEtweaks
...
don't show help or login on first run
2016-05-11 10:53:09 -07:00
Brad Hefta-Gaub
62b3c12d0f
fix comment
2016-05-10 15:53:10 -07:00
