Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 04:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17422 commits 71 branches 56 tags 1.2 GiB
Commit graph

17422 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
f89b225da2 handle local socket changes by monitoring every so often 2014-10-06 09:17:25 -07:00
AndrewMeadows
f284fc548f Merge pull request #3539 from ey6es/metavoxels 
Blend between directional textures on dual contour surfaces.
 2014-10-06 08:00:24 -07:00
AndrewMeadows
85a2d297d4 Merge pull request #3535 from stojce/20061 
CR for Job #20061 - Style our address bar / "go to" UI
 2014-10-06 07:57:00 -07:00
AndrewMeadows
a91d66d8bb Merge pull request #3533 from stojce/20091 
CR for Job #20091 - Windows : Popup to download update is unreadable on Windows (see attached screenshot)
 2014-10-06 07:53:44 -07:00
Andrzej Kapolka
1f10b1744f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-03 17:19:13 -07:00
Andrzej Kapolka
91942e6188 Reduce the size of the smoothing step. 2014-10-03 17:17:22 -07:00
Philip Rosedale
864dd0152d Merge pull request #3532 from birarda/master 
remove files for gh-pages that are no longer in use, enable auto reconnection to ICE domain-servers
 2014-10-03 17:11:26 -07:00
Stephen Birarda
aa15ef7f85 only have the ice-server respond if there was a matching conectee 2014-10-03 17:10:56 -07:00
Andrzej Kapolka
3d88463569 Blend between cube face textures. 2014-10-03 17:05:14 -07:00
Stephen Birarda
5203113b41 separate ICE ID and domain ID for reconnections to moved domains 2014-10-03 17:01:33 -07:00
Stephen Birarda
cbc505e71a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-03 15:35:47 -07:00
Stephen Birarda
e32de3208d Merge pull request #3538 from birarda/hydra-crash 
fix for path for hydras in installer release
 2014-10-03 15:34:25 -07:00
Stephen Birarda
2ce2c9e953 add a missing slash in path for release hydra support 2014-10-03 15:33:51 -07:00
Philip Rosedale
f38ddb0f6e Merge pull request #3537 from Atlante45/move_att_setting 
Moved attenuation setting to non advanced
 2014-10-03 15:30:58 -07:00
Clément Brisset
36b2028884 Merge pull request #3536 from birarda/domain-tunnel 
notify data-server about auto networking change to full
 2014-10-03 15:29:22 -07:00
Stephen Birarda
8ce474d3e1 make the ice server const scoped to remove warning 2014-10-03 15:29:16 -07:00
Stephen Birarda
4e0bb94cdd fix for double ICE connect attempts from domain-server 2014-10-03 15:25:47 -07:00
Atlante45
1d37545511 Moved attenuation setting to non advanced 2014-10-03 15:25:03 -07:00
Stephen Birarda
f673ab316a tell the data-server about auto networking change to full 2014-10-03 15:06:27 -07:00
AndrewMeadows
2df27900fa Merge pull request #3534 from ey6es/metavoxels 
Fix for normalization crash.
 2014-10-03 14:02:06 -07:00
Andrzej Kapolka
7c942e1010 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-03 13:53:11 -07:00
Andrzej Kapolka
78825f0c4d Fix for normalization crash. 2014-10-03 13:52:50 -07:00
Philip Rosedale
b1e6327eba Merge pull request #3531 from birarda/domain-tunnel 
initial pass at using an ice-server to allow interface to connect to domains without open ports
 2014-10-03 13:27:27 -07:00
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