Stephen Birarda
b4cfce8ffa
final NetworkAccessManager return repairs
2014-10-06 14:58:23 -07:00
Stephen Birarda
a358b4e2af
repair another reference to NetworkAccessManager
2014-10-06 14:57:54 -07:00
Stephen Birarda
f19c5c9850
repair NetworkAccessManager returns, handle custom AS port in assignment-client
2014-10-06 14:57:38 -07:00
Stephen Birarda
78920234bb
handle changed domain-server port on start
2014-10-06 14:49:15 -07:00
Stephen Birarda
14cd044359
handle custom local UDP port for domain-server from webpage
2014-10-06 14:41:16 -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
Brad Hefta-Gaub
4e038687cf
Merge pull request #3550 from murillodigital/master
...
Missed one reference to the old bucket.
2014-10-06 14:31:35 -07:00
Leonardo Murillo
65b559ca3d
Missed one
2014-10-06 15:21:51 -06:00
Brad Hefta-Gaub
e867b49701
Merge pull request #3546 from murillodigital/master
...
Fixing globals var scopt
2014-10-06 13:29:20 -07:00
Leonardo Murillo
1de473a013
Fixing globals var scopt
2014-10-06 14:27:25 -06:00
Stephen Birarda
3cd71a33c9
disable ephemeral port for DS until ACs can discover
2014-10-06 12:28:44 -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
Andrzej Kapolka
0d5f81c062
Merge pull request #3540 from samcake/temp0
...
replacing glutSolidSPhere by a cached Geometry
2014-10-06 12:23:44 -07:00
Sam Gateau
ba2d072a65
fix syntax issues for constant names and the CmakeLists.txt useless change
2014-10-06 12:15:36 -07:00
Clément Brisset
b8c7a9263c
Merge pull request #3544 from murillodigital/master
...
Changing bucket name
2014-10-06 11:39:52 -07:00
Sam Gateau
4f26c9e0fa
fix formatting and syntax issues
2014-10-06 11:06:23 -07:00
Leonardo Murillo
0b7ff18970
Changes in non-Js code
2014-10-06 11:24:10 -06:00
Leonardo Murillo
f0852ba283
Using new variable in all references to S3 bucket
2014-10-06 11:21:35 -06:00
Brad Hefta-Gaub
644bbacfe3
Merge pull request #3541 from thoys/remember-selected-audio-device
...
Remember the last selected audio device
2014-10-06 10:05:00 -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
0459254e3f
fix connection to slot for local addr update, refresh AcctManager after restart
2014-10-06 09:24:48 -07:00
Stephen Birarda
b61e659382
send an ICE heartbeat anytime the domain-server local socket changes
2014-10-06 09:18:50 -07:00
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
Thijs Wenker
b7165cb353
store the last selected audio device
2014-10-05 21:11:42 +02: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
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
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
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
