Stephen Birarda
d064919cb0
fix a missed reference to NetworkAccessManager
2014-10-08 10:41:16 -07:00
Stephen Birarda
7773a94df7
resolve conflicts on merge with upstream master
2014-10-08 09:27:16 -07:00
Stephen Birarda
f19c5c9850
repair NetworkAccessManager returns, handle custom AS port in assignment-client
2014-10-06 14:57:38 -07:00
Leonardo Murillo
7400104f87
Merge pull request #3551 from ZappoMan/fixHTTPSIncludes
...
fix include for https relative urls
2014-10-06 15:43:30 -06:00
Brad Hefta-Gaub
4b33cfe838
Merge pull request #3547 from birarda/new-qt
...
fix for ThreadedAssignment readyRead on Qt 5.3.x
2014-10-06 14:35:25 -07:00
ZappoMan
07832fdd68
fix include for https relative urls
2014-10-06 14:34:19 -07:00
Stephen Birarda
2d3f3edcad
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-06 14:31:39 -07:00
Stephen Birarda
499e748d54
rebind the node socket when switching to ThreadedAssignment
2014-10-06 13:45:11 -07:00
Stephen Birarda
319cf34b83
use an ephemeral port when using auto-networking for domain-server
2014-10-06 12:24:18 -07:00
Stephen Birarda
253fe53571
cleanup a couple of debug lines
2014-10-06 12:24:12 -07:00
Stephen Birarda
484c0d30cb
don't require refresh of NetworkAccessManager, should handle restarts
2014-10-06 09:54:52 -07:00
Stephen Birarda
78f8aba504
fix for NetworkAccessManager getInstance return
2014-10-06 09:44:47 -07:00
Stephen Birarda
a441c5fb16
don't use an unecessary subclass of QNetworkAccessManager
2014-10-06 09:42:47 -07:00
Stephen Birarda
89cc7c7b0d
add an optional forced reset of NetworkAccessManager
2014-10-06 09:35:44 -07:00
Stephen Birarda
f89b225da2
handle local socket changes by monitoring every so often
2014-10-06 09:17:25 -07:00
Sam Gateau
bd5c6517a5
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
...
Conflicts:
interface/src/ui/MetavoxelEditor.cpp
interface/src/ui/overlays/Sphere3DOverlay.cpp
2014-10-03 17:31:05 -07:00
Stephen Birarda
5203113b41
separate ICE ID and domain ID for reconnections to moved domains
2014-10-03 17:01:33 -07:00
Sam Gateau
738369e21f
Replacing glutSolidSphere by a cached Geometry
...
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)
- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using fOuterRadius
2014-10-03 16:55:58 -07:00
Stephen Birarda
4e0bb94cdd
fix for double ICE connect attempts from domain-server
2014-10-03 15:25:47 -07:00
Stephen Birarda
52ec949aac
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-03 11:26:23 -07:00
Stephen Birarda
ea0a1a4fb6
don't store domain hostname, leverage AddressManager only
2014-10-03 10:46:05 -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
Philip Rosedale
56c71b667b
Merge pull request #3530 from ZappoMan/editToolsImprovements
...
Experimental Version of new Entity Editing UI/UX
2014-10-03 10:26:09 -07:00
Stephen Birarda
cb6e420392
fix for peer addition from ice-server
2014-10-03 09:50:58 -07:00
Stephen Birarda
55a7180838
re-send heartbeat to ICE server after max connection attempts
2014-10-03 09:47:15 -07:00
Stephen Birarda
d9e0c91e02
remove a peer in domain-server after max connection attempts
2014-10-03 09:45:44 -07:00
Stephen Birarda
63024663b2
don't require settings request for agent nodes
2014-10-03 09:37:13 -07:00
Stephen Birarda
c96e7f72f8
use the ice server sock addr returned for the domain
2014-10-03 09:31:38 -07:00
Stephen Birarda
720f8ecae8
handle case where access_token is empty
2014-10-03 09:08:27 -07:00
Stephen Birarda
49d081088a
mode nodes to connected hash upon ping reply receipt
2014-10-03 08:58:03 -07:00
ZappoMan
729e40881d
removed some old debug
2014-10-02 17:55:55 -07:00
ZappoMan
aa634c8ff2
added new methods to Vec3 and Quat
2014-10-02 17:55:32 -07:00
Stephen Birarda
5786d828a0
pass ICE client ID through to domain-server for identification
2014-10-02 17:30:48 -07:00
Stephen Birarda
0d4ef4aaca
ping connecting ICE peers from domain-server
2014-10-02 17:18:05 -07:00
Stephen Birarda
63877b0756
handle domain connection via ICE from NodeList
2014-10-02 16:51:12 -07:00
Stephen Birarda
c7aaf0ce4a
handle ping out from node requiring ice connection to domain
2014-10-02 16:24:46 -07:00
Stephen Birarda
c36774e85d
handle ice response packet in domain handler
2014-10-02 16:05:15 -07:00
Stephen Birarda
956c212db2
manage sets of potential connections in ice server
2014-10-02 15:24:23 -07:00
ZappoMan
d666f9ce98
Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements
...
Conflicts:
examples/editModels.js
2014-10-02 15:17:59 -07:00
Stephen Birarda
d26a94f84c
remove inactive peers from memory in IceServer
2014-10-02 15:00:59 -07:00
Stephen Birarda
970ba2296a
initial response from ice server to nodes
2014-10-02 14:50:48 -07:00
Stephen Birarda
6425276eb0
have domain-server using full networking heartbeat with ice-server
2014-10-02 14:33:39 -07:00
Stephen Birarda
262054d0eb
handle ICE requirement in address manager response
2014-10-02 14:18:17 -07:00
Stephen Birarda
11659401ee
add an identifier for repeated requests to the ice server
2014-10-02 13:47:53 -07:00
Stephen Birarda
cca1c30207
build out more of the ice-server, make connect requests from NodeList
2014-10-02 13:39:58 -07:00
Andrzej Kapolka
27099f6dcd
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-02 13:03:00 -07:00
Andrzej Kapolka
4e19cc21f6
Remove the "box edit" in favor of using the spanner edit.
2014-10-02 13:01:39 -07:00
Andrzej Kapolka
bce0147776
Added aspect fields to cuboids.
2014-10-02 12:51:56 -07:00
Andrzej Kapolka
d3761cd753
Cuboid shape implementation.
2014-10-02 12:25:19 -07:00
