Atlante45
|
327daacecd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
libraries/networking/src/NodeList.cpp
|
2014-12-22 13:34:18 -08:00 |
|
Stephen Birarda
|
979f5f8fc5
|
fix for coding standard compliance
|
2014-12-19 12:19:49 -08:00 |
|
Stephen Birarda
|
3a4f75ff62
|
fix AddressManager domain lookup to handle port
|
2014-12-18 16:40:02 -08:00 |
|
Stephen Birarda
|
1ab66c2bfe
|
split port and hostname for cleaner domain changes
|
2014-12-18 16:17:03 -08:00 |
|
Stephen Birarda
|
087ac1db90
|
send port along with domain hostname lookup
|
2014-12-18 16:03:13 -08:00 |
|
Atlante45
|
0bd9ed469e
|
Changed NodeList::getInstance() calls to use the DM
|
2014-12-17 15:28:25 -08:00 |
|
Stephen Birarda
|
1b48cf7f5a
|
use DependencyManager for AddressManager
|
2014-12-15 14:54:20 -08:00 |
|
Stephen Birarda
|
1aa98dfc4c
|
trim whitespace for place name lookup
|
2014-11-20 09:24:43 -08:00 |
|
Stephen Birarda
|
33c247918e
|
fix for domainID wrapped in braces
|
2014-10-28 15:37:42 -07:00 |
|
Stephen Birarda
|
2816e8f114
|
fix location DataWebDialog missing InterfaceLocation object
|
2014-10-28 15:32:23 -07:00 |
|
Stephen Birarda
|
27f7cdb2d4
|
handle location set/get in AddressManager, handle set to address map
|
2014-10-28 10:35:56 -07:00 |
|
Stephen Birarda
|
b90db2856b
|
add a method to AddressManager to handle address maps from JS
|
2014-10-28 10:00:39 -07:00 |
|
Stephen Birarda
|
e9bcc90166
|
handle remaining conversions for AccountManager passing QNetworkReply
|
2014-10-14 16:16:54 -07:00 |
|
Stephen Birarda
|
46fb7fb4a9
|
return QNetworkReply for AccountManager callbacks
|
2014-10-14 16:12:04 -07:00 |
|
Stephen Birarda
|
96aacab8ab
|
load Address from settings to get back to domain and path
|
2014-10-03 10:42:15 -07:00 |
|
Stephen Birarda
|
f27105100a
|
have AddressManager know its current domain and current path
|
2014-10-03 10:29:02 -07:00 |
|
Stephen Birarda
|
262054d0eb
|
handle ICE requirement in address manager response
|
2014-10-02 14:18:17 -07:00 |
|
Stephen Birarda
|
3cbfad69cd
|
fix indentation issues for merged AddressBarDialog classes
|
2014-09-26 14:32:59 -07:00 |
|
stojce
|
c14bf84af8
|
layout fix
|
2014-09-24 00:14:00 +02:00 |
|
stojce
|
5a7b7cca44
|
Add finish lookup event
|
2014-09-23 11:32:16 +02:00 |
|
stojce
|
466dbdcee5
|
added address bar dialog
|
2014-09-22 20:51:19 +02:00 |
|
Stephen Birarda
|
866f2005bd
|
handle case where a location should be faced
|
2014-09-16 10:08:21 -07:00 |
|
Stephen Birarda
|
0033dfe5af
|
use quat orientation to store locations and user locations
|
2014-09-16 09:57:21 -07:00 |
|
Stephen Birarda
|
4cef21aa4f
|
don't prepend relative paths with hifi scheme
|
2014-09-16 09:14:06 -07:00 |
|
Stephen Birarda
|
3b21348a63
|
make sure AddressManager signal is connected to before file event
|
2014-09-12 15:22:51 -07:00 |
|
Stephen Birarda
|
29dae39ad7
|
handle location lookup for offline user or not found
|
2014-09-12 15:01:08 -07:00 |
|
Stephen Birarda
|
892e0e7cbf
|
fix node auth url, NAN break on windows
|
2014-09-12 11:43:50 -07:00 |
|
Stephen Birarda
|
88a75a3585
|
fix for goToUser from ChatWindow
|
2014-09-12 11:27:54 -07:00 |
|
Stephen Birarda
|
ab7df8679d
|
fix broken hifi linking
|
2014-09-12 11:19:22 -07:00 |
|
Stephen Birarda
|
1f2020d169
|
some url handling repairs, move existing error reply handlers to new format
|
2014-09-12 10:13:33 -07:00 |
|
Stephen Birarda
|
b56ea5c936
|
centralize path creation from position and orientation to AddressManager
|
2014-09-11 17:17:47 -07:00 |
|
Stephen Birarda
|
23a0ef2de1
|
remove some spacing in AddressManager
|
2014-09-11 12:13:13 -07:00 |
|
Stephen Birarda
|
6d21c4bf0d
|
make lookup for hostnames case insensitive
|
2014-09-11 11:07:42 -07:00 |
|
Stephen Birarda
|
684aa97b98
|
add port parsing for domain hostname in address bar
|
2014-09-11 11:00:24 -07:00 |
|
Stephen Birarda
|
aaabe6b1e1
|
handle domain changes via address bar
|
2014-09-11 10:45:45 -07:00 |
|
Stephen Birarda
|
71f2c0b542
|
initial addition of the AddressManager with location switch hooked up
|
2014-09-11 10:14:00 -07:00 |
|