Commit graph

17492 commits

Author SHA1 Message Date
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
ZappoMan
4ed047cf98 first pass at newEditEntities.js 2014-10-02 15:15:52 -07:00
ZappoMan
bfde23349f moving libraries style JS files to libraries 2014-10-02 15:15:09 -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
8cb258e14c don't use just filename when searching in application framework 2014-10-02 14:35:54 -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
Ryan Huffman
d7f383f74a Fix failure case when resizing a new model 2014-10-02 12:10:20 -07:00
Ryan Huffman
b2229a9a9f Update editModels.js to automatically resize new models to their naturalDimensions 2014-10-02 12:05:20 -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
AndrewMeadows
8345ae37d3 Merge pull request #3525 from birarda/hydra-crash
don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD
2014-10-02 11:30:31 -07:00
Stephen Birarda
60e3f3edfa add skipSubHandler to OctreeServer HTTPRequestHandler calls 2014-10-02 11:20:56 -07:00
Stephen Birarda
138e57bcd8 don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD 2014-10-02 11:16:25 -07:00
Stephen Birarda
9baf983d07 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-02 10:47:54 -07:00
Brad Hefta-Gaub
949c39bf6b Merge pull request #3522 from birarda/hydra-crash
add failsafe for hydra load, look in app frameworks folder
2014-10-02 10:42:28 -07: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
ZappoMan
d0026cd529 latest selection UI features: grabbers, and rotate handles in correct locations 2014-10-02 10:19:51 -07:00
ZappoMan
5bcbfe96b8 add alpha color support to billboard overlay 2014-10-02 10:19:08 -07:00
ZappoMan
b2e725c964 add dashed line support to cube overlay 2014-10-02 10:18:42 -07:00
Stephen Birarda
157fdf6afa cleanup debug for script path 2014-10-02 10:17:31 -07:00
Stephen Birarda
89907136fa one more debug line for script redirect 2014-10-02 10:15:12 -07:00
Leonardo Murillo
78670245df Merge pull request #3523 from birarda/master
add debug to domain server if script not saved
2014-10-02 11:10:13 -06:00
Stephen Birarda
b6e0b08a29 add debug to domain server if script not saved 2014-10-02 10:07:02 -07:00
Stephen Birarda
e0a721209a add a Node superclass to handle P2P connection 2014-10-02 09:55:00 -07:00
Stephen Birarda
e88b3311ad Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-02 09:20:08 -07:00
Stephen Birarda
172ee3d7dc add failsafe for hydra load, look in app frameworks folder 2014-10-02 09:06:29 -07:00
Brad Hefta-Gaub
5d67739ab7 Merge pull request #3521 from birarda/domain-wizard
handle select inputs in domain server settings creation
2014-10-02 08:36:10 -07:00
Brad Hefta-Gaub
4e752f9bb8 Merge pull request #3520 from Adrianl3d/20082
CR for Job #20082 - Entity properties bad readable, background is wrong sized
2014-10-02 08:35:50 -07:00
AndrewMeadows
be3a6e490a Merge pull request #3519 from birarda/master
add a domain-server scripts folder that is ignored for clean symlink
2014-10-02 08:35:33 -07:00
Andrzej Kapolka
42e95f2b38 Working on spanner metavoxel edits. 2014-10-01 18:46:23 -07:00
David Rowe
51f229af57 Make recalibrate Leap-on-desk if avatar head or skeleton changes 2014-10-01 18:34:56 -07:00
Stephen Birarda
ae90b38172 add the ice server 2014-10-01 17:19:34 -07:00
Stephen Birarda
d6572c3e2e handle automatic networking changes with data-server 2014-10-01 16:38:44 -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
Stephen Birarda
3292808342 update domain network address updating for IP auto networking 2014-10-01 16:19:10 -07:00
David Rowe
38b6d5dd5d Make leapHands.js handle Leap-on-HMD setting changes 2014-10-01 16:05:19 -07:00
stojce
0634d15abb Fix update dialog layout on WIn 2014-10-02 00:49:20 +02:00
stojce
9c926d9e67 Layout changes 2014-10-02 00:17:57 +02:00