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
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
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
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
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
d02795cc85
have data-web respond with ice server hostname to use for connection
2014-10-03 10:48:09 -07:00
Stephen Birarda
cb6e420392
fix for peer addition from ice-server
2014-10-03 09:50:58 -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
5be067cf11
disable automatic networking by default
2014-10-03 09:31:17 -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
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
Stephen Birarda
15cc08da97
initial handling of ping replies in domain-server
2014-10-02 17:21:11 -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
6425276eb0
have domain-server using full networking heartbeat with ice-server
2014-10-02 14:33:39 -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
9baf983d07
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-02 10:47:54 -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
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
e88b3311ad
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-02 09:20:08 -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
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
Stephen Birarda
d5b0904d7a
handle new automatic networking option in domain-server
2014-10-01 12:08:19 -07:00
Stephen Birarda
2eec6c1401
changes to settings.js to allow for select inputs
2014-10-01 12:00:10 -07:00
Stephen Birarda
a4b4fc52b6
handle select inputs in domain server settings creation
2014-10-01 11:57:44 -07:00
Stephen Birarda
d3cef7e592
add select for automatic networking to describe settings
2014-10-01 11:57:24 -07:00
Stephen Birarda
a0487e0a57
send public and local sockets to data-server in new format
2014-10-01 10:42:14 -07:00
Stephen Birarda
0174a985ee
add a domain-server scripts folder that is ignored for clean symlink
2014-10-01 09:56:13 -07:00
Stephen Birarda
f1de2ac937
rename jquery for easier updating in domain-server
2014-10-01 09:00:24 -07:00
Stephen Birarda
4ef2863b79
fix setting posting for checkbox values
2014-09-30 15:01:37 -07:00
Stephen Birarda
fed7dad2b6
use an auto_ptr to be able to reset the AccountManager
2014-09-30 14:36:32 -07:00
Stephen Birarda
909a6e89a8
resolve conflicts on merge with upstream master
2014-09-30 13:50:04 -07:00
Atlante45
b571fb86ae
Changed attenuation setting help
2014-09-30 12:53:33 -07:00
Atlante45
4e7bf0487b
Add attenuation setting on DS page
2014-09-30 12:50:50 -07:00
Stephen Birarda
3969c8bfe0
don't allow a username and password for domain auth, require access token
2014-09-30 12:23:04 -07:00
Stephen Birarda
df5ab50703
clear up domain ID selection on domain settings page
2014-09-30 11:34:03 -07:00
Stephen Birarda
26c2aece7a
fix target blank link from domain-server settings
2014-09-30 11:21:35 -07:00
Stephen Birarda
f566b42d18
make My Tokens link open in a new tab
2014-09-30 11:17:55 -07:00
