Commit graph

17451 commits

Author SHA1 Message Date
Stephen Birarda
f40127a000 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-03 11:27:11 -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
1b294443ac remove the jenkins groovy that is no longer used 2014-10-03 11:25:47 -07:00
Stephen Birarda
17223a5100 remove stylesheets for gh-pages 2014-10-03 11:23:51 -07:00
Stephen Birarda
f2d0e539a0 remove files for gh-pages that are no longer in use 2014-10-03 11:23:08 -07:00
Stephen Birarda
d02795cc85 have data-web respond with ice server hostname to use for connection 2014-10-03 10:48:09 -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
ZappoMan
6846426f23 CR feedback 2014-10-03 10:13:56 -07:00
ZappoMan
cd6adb8f28 CR feedback 2014-10-03 10:13:09 -07:00
ZappoMan
f6b8a51074 CR feedback 2014-10-03 10:03:54 -07:00
ZappoMan
46d96c22fa CR feedback 2014-10-03 10:01:58 -07:00
ZappoMan
602404c569 CR feedback 2014-10-03 09:55:29 -07:00
Stephen Birarda
cb6e420392 fix for peer addition from ice-server 2014-10-03 09:50:58 -07:00
ZappoMan
4ab0a8e13d CR feedback 2014-10-03 09:49:54 -07:00
ZappoMan
00799e39e1 CR feedback 2014-10-03 09:48:54 -07:00
ZappoMan
467e9b1831 CR feedback 2014-10-03 09:47:17 -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
ZappoMan
515789927b fix float defines from CR feedback 2014-10-03 09:43:46 -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
5be067cf11 disable automatic networking by default 2014-10-03 09:31:17 -07:00
ZappoMan
23f584d9da added file headers 2014-10-03 09:26:09 -07:00
Stephen Birarda
05cf0142e9 fix for default value search 2014-10-03 09:19:51 -07:00
Stephen Birarda
bd68126b19 fix for values without defaults 2014-10-03 09:14:23 -07:00
Stephen Birarda
720f8ecae8 handle case where access_token is empty 2014-10-03 09:08:27 -07:00
Philip Rosedale
84b2bc14c0 Merge pull request #3526 from ey6es/metavoxels
Tweaks to the way dual contour edits are performed, added cuboid shape and made snapping to grid optional for boxes.
2014-10-03 09:08:18 -07:00
Stephen Birarda
1a1ae43bc7 send back to the network peer on established sock addr if it exists 2014-10-03 09:02:18 -07:00
Stephen Birarda
49d081088a mode nodes to connected hash upon ping reply receipt 2014-10-03 08:58:03 -07:00
stojce
a1d3e3289c close icon size fix 2014-10-03 14:51:29 +02:00
stojce
429ddd7115 address bar style fix 2014-10-03 14:30:03 +02:00
stojce
6d9091e35f Merge branch 'master' of https://github.com/highfidelity/hifi into 20091 2014-10-03 14:22:13 +02:00
stojce
420326b212 Layout changes 2014-10-03 14:21:05 +02:00
stojce
be5f348e22 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-10-03 14:03:13 +02:00
stojce
f2095dacbd more dialog fixes 2014-10-03 13:45:26 +02:00
ZappoMan
4ad10cb6cc fix comment 2014-10-03 04:27:41 -07:00
ZappoMan
023916e7e5 Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements 2014-10-03 04:25:24 -07:00
ZappoMan
f7a8689436 hide rotate handles till implemented 2014-10-03 04:25:13 -07:00
ZappoMan
98c959d94c implement more corner stretching 2014-10-03 04:21:44 -07:00
stojce
e158185296 layout changes on update dialog 2014-10-03 13:20:02 +02:00
ZappoMan
f6fc1173e6 fix RBN stretching, tweak some names, add some additional edge grabbers to some sides 2014-10-03 03:52:57 -07:00
ZappoMan
ea0d74b957 implement TOP, BOTTOM, LEFT, RIGHT side stretching 2014-10-03 03:33:32 -07:00
ZappoMan
6207e951b6 implement FAR side stretching 2014-10-03 03:17:45 -07:00
ZappoMan
88c983cd3b dry up some code 2014-10-03 03:12:09 -07:00
ZappoMan
4af3968e01 move XZ translation into the selection tool so that it plays nice with stretchers 2014-10-03 03:03:48 -07:00
ZappoMan
f59185c00b allow 3d overlays to be ignored from ray intersection 2014-10-03 03:02:54 -07:00
ZappoMan
05f2263c9c implement NEAR face stretch 2014-10-03 02:31:45 -07:00