5486 commits

Author	SHA1	Message	Date
Stephen Birarda	5203113b41	separate ICE ID and domain ID for reconnections to moved domains	2014-10-03 17:01:33 -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
Leonardo Murillo	aa1af0e144	Merge pull request #3524 from birarda/master ... fix for domain-server script deployment with auth	2014-10-02 12:50:21 -06:00
Stephen Birarda	4749fdb0ba	allow calls to HTTPManager to skip the subHandler and ask for direct processing	2014-10-02 10:38:46 -07:00
Stephen Birarda	e0a721209a	add a Node superclass to handle P2P connection	2014-10-02 09:55:00 -07:00
Andrzej Kapolka	42e95f2b38	Working on spanner metavoxel edits.	2014-10-01 18:46:23 -07:00
Stephen Birarda	15156519b3	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel	2014-10-01 16:19:16 -07:00
Andrzej Kapolka	1ca212f43d	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-10-01 11:55:27 -07:00
ZappoMan	e65f383b25	add localRenderAlpha property to entities	2014-10-01 09:43:03 -07:00
Brad Hefta-Gaub	15ccec676c	Merge pull request #3513 from Atlante45/recording_audio_offset ... Recording audio offset	2014-10-01 09:07:06 -07:00
Atlante45	56acc86f4f	Missed some qints	2014-09-30 21:20:37 -07:00
Andrzej Kapolka	4dbd2367f4	Working on shapes for metavoxel edits.	2014-09-30 17:34:01 -07:00
Stephen Birarda	ac4a767d60	include memory for auto_ptr	2014-09-30 15:25:40 -07:00
Andrzej Kapolka	5d2f6b98e2	Added erase buttons, initialize color editor on creation.	2014-09-30 15:20:24 -07:00
Stephen Birarda	cd9029bb92	add some debug to NodeList instance refresh	2014-09-30 14:59:12 -07:00
Stephen Birarda	9950ed9f9f	use auto_ptr in NodeList and LimitedNodeList for cleaner mem management	2014-09-30 14:57:32 -07:00
Andrzej Kapolka	70847ff3f9	Allow painting boxes that aren't grid-aligned; merged color and material ... tools.	2014-09-30 14:53:19 -07:00
Stephen Birarda	fed7dad2b6	use an auto_ptr to be able to reset the AccountManager	2014-09-30 14:36:32 -07:00
Atlante45	68c25e805a	Switch int64 to int	2014-09-30 14:31:40 -07:00