Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 05:43:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18419 commits 76 branches 59 tags 1.2 GiB
Commit graph

775 commits

Author SHA1 Message Date
Stephen Birarda
188320a7b7 badge sidebar for table removal 2014-10-09 09:37:24 -07:00
Stephen Birarda
ed6b62cea4 clear a row value after it is added to the table 2014-10-08 17:07:31 -07:00
Stephen Birarda
1fa0d8df72 change the add and remove style for glyphs in settings 2014-10-08 16:56:41 -07:00
Stephen Birarda
01e6acda39 changes to allow an array setting via table 2014-10-08 16:52:04 -07:00
Stephen Birarda
e6dee30a6a handle drawing a table for array values 2014-10-08 16:01:43 -07:00
Stephen Birarda
1136c1bf13 remove custom font and large X for errors 2014-10-08 15:49:08 -07:00
Stephen Birarda
4daa379b03 use sweet alert for nice error messages in domain-settings 2014-10-08 15:32:56 -07:00
Stephen Birarda
51afd52ffb vertically center the glyphicon for table button 2014-10-08 14:56:09 -07:00
Stephen Birarda
f4eddbc93b change number to numbered for domain-server settings 2014-10-08 14:54:41 -07:00
Stephen Birarda
fb8c5c3bf0 initial styling changes to domain table 2014-10-08 14:52:53 -07:00
Stephen Birarda
1d63fc3dfa Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-08 14:27:12 -07:00
Stephen Birarda
b368e866fb change oauth request packet type to username request 2014-10-08 14:26:23 -07:00
Atlante45
19d103c343 Indentation 2014-10-08 13:54:53 -07:00
Atlante45
9a87e764e2 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
	domain-server/src/DomainServerSettingsManager.cpp
 2014-10-08 11:46:07 -07:00
Atlante45
cd67c9d456 Removed console logs 2014-10-08 11:40:43 -07:00
Atlante45
11b38d554f reindentation 2014-10-08 11:24:01 -07:00
Atlante45
e2d3ca53e6 Changed data to row-data 2014-10-08 11:14:39 -07:00
Atlante45
dd90ea01bd Removed setting-input 2014-10-08 10:25:01 -07:00
Stephen Birarda
7773a94df7 resolve conflicts on merge with upstream master 2014-10-08 09:27:16 -07:00
Atlante45
ebfb9495dc Made helpers private methods 2014-10-07 21:04:59 -07:00
Atlante45
9c2e688477 indentation 2014-10-07 21:03:02 -07:00
Atlante45
c9e4c12ce2 Removed line number 2014-10-07 21:00:53 -07:00
Atlante45
4e0e9d1dba Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-07 20:52:27 -07:00
Atlante45
91727232f8 Indentation 2014-10-07 20:52:06 -07:00
Atlante45
ec8fcb6b59 removed debug and name in posted object 
:
 2014-10-07 20:43:41 -07:00
Atlante45
92be06bb84 Reordered a few operations 2014-10-07 18:12:56 -07:00
Atlante45
2a5292732c DomainServerSettings handles any types of objects 2014-10-07 18:01:32 -07:00
Stephen Birarda
67fdfbb7f1 fix for user domains path in domain settings 2014-10-07 14:19:15 -07:00
Stephen Birarda
ea4c5a8900 repairs for new user scoped paths 2014-10-07 14:18:05 -07:00
Atlante45
8be5c18412 Get table data over to DS 2014-10-06 17:52:41 -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
Atlante45
ace8b98064 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-06 14:12:57 -07: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
Stephen Birarda
484c0d30cb don't require refresh of NetworkAccessManager, should handle restarts 2014-10-06 09:54:52 -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
Atlante45
011e848c04 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/describe-settings.json
 2014-10-03 17:52:40 -07: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
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
Atlante45
1aab86884d Move table view code + wire row delete 2014-10-03 14:25:36 -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
Atlante45
a5108375b8 Table JSON data 2014-10-02 15:39:02 -07:00
Atlante45
61e38f545e new table type 2014-10-02 15:38:36 -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
Stephen Birarda
541c3c6da8 handle style of button while domains are loading 2014-09-30 11:02:47 -07:00
Stephen Birarda
5b03a445a8 allow user to choose domain ID from High Fidelity domains 2014-09-30 10:47:52 -07:00
Stephen Birarda
7e184d67e5 handle transition from dashed JSON settings keys to underscore 2014-09-30 09:49:34 -07:00
Stephen Birarda
68a70cc914 don't use dashes in settings JSON keys 2014-09-30 09:40:54 -07:00
Stephen Birarda
f07a8fd672 add a message for domain query with missing access token 2014-09-30 09:37:41 -07:00
Stephen Birarda
85aa0c34fb stub of domain-server choose domain handler 2014-09-30 09:31:04 -07:00
Stephen Birarda
c84aac9d2e remove an extra console log 2014-09-30 09:12:53 -07:00
Stephen Birarda
bd4a32551b fix for settings save without organization 2014-09-29 10:09:33 -07:00
Stephen Birarda
46258ae78f add a tooltip to say why locked settings cannot be changed 2014-09-29 10:02:01 -07:00
Stephen Birarda
58b03c7ef2 disable form inputs for values set by master config 2014-09-29 09:53:27 -07:00
Stephen Birarda
ec0805acc5 add locked settings to json return for auth'ed settings 2014-09-29 09:34:04 -07:00
Stephen Birarda
5e2870ac5f require a distinction between master config and user config 2014-09-29 09:30:08 -07:00
Stephen Birarda
ae542419d1 fix for static assignments from queue 2014-09-26 16:36:18 -07:00
Stephen Birarda
9e02a36d3d fix for domain-server allowed roles 2014-09-26 16:23:57 -07:00
Stephen Birarda
d389f13e1b fix for role lookup in domain-server 2014-09-26 16:21:12 -07:00
Stephen Birarda
ae5a7b40a6 don't symlink the web directory on WIN32 2014-09-26 15:19:40 -07:00
Stephen Birarda
42d40d5a13 some help text cleanup for audio settings 2014-09-26 15:11:12 -07:00
Stephen Birarda
6bc81e6ff4 use panels on main domain-server page 2014-09-26 14:45:32 -07:00
Stephen Birarda
e8c3fa3cf1 use ID from new domain settings, don't disable save button 2014-09-26 14:39:50 -07:00
Stephen Birarda
cccacf4e6a disable the save button if no settings are changed 2014-09-26 14:31:44 -07:00
Stephen Birarda
bbf111a9a0 disable the save button when nothing has changed 2014-09-26 14:27:29 -07:00
Stephen Birarda
05b80e3fb4 remove scrollspy while sections are not large enough 2014-09-26 14:21:49 -07:00
Stephen Birarda
401eb7df4f remove the offset from scrollspy 2014-09-26 14:19:56 -07:00
Stephen Birarda
2a7626159c stop the refresh countdown once we hit zero 2014-09-26 14:15:56 -07:00
Stephen Birarda
80f1594a17 add a restart modal to settings page 2014-09-26 14:12:30 -07:00
Stephen Birarda
0f41ca65a9 add a save button on domain settings when viewport small 2014-09-26 13:53:12 -07:00
Stephen Birarda
33856be29e add period to help text for http password 2014-09-26 13:16:08 -07:00
Stephen Birarda
96627a8f97 allow authenticated access to full domain-server settings 2014-09-26 12:56:35 -07:00
Stephen Birarda
94f30fe4d9 handle password setting by not converting to double 2014-09-26 12:20:12 -07:00
Stephen Birarda
21809cc9df fix http username with no password 2014-09-26 12:09:29 -07:00
Stephen Birarda
60258e4989 remove the save requires restart signal 2014-09-26 11:26:38 -07:00
Stephen Birarda
3c71d4d96e add ability for domain-server to restart after setting save 2014-09-26 11:26:21 -07:00
Stephen Birarda
954fbc2017 use DomainServerSettingsManager to handle simulation settings and config 2014-09-26 11:06:05 -07:00
Stephen Birarda
2c8d8decb8 remove focus from advanced toggle when clicked 2014-09-26 09:46:55 -07:00
Stephen Birarda
507621ca3a add toggle for advanced settings 2014-09-26 09:27:33 -07:00
Stephen Birarda
7d14408adc badge the list-group-item when settings have changed 2014-09-26 09:15:48 -07:00
Stephen Birarda
13f2ea33ad symlink the web directory instead of direct copy for DS 2014-09-26 08:48:00 -07:00
Stephen Birarda
f47cc176b5 resolve conflicts on merge with upstream master 2014-09-26 08:33:34 -07:00
Stephen Birarda
ba929626c2 fix for undefined placeholder values 2014-09-25 18:25:16 -07:00
Stephen Birarda
697ae900dc handle basic vs advanced settings 2014-09-25 18:14:18 -07:00
Stephen Birarda
9a56e72079 fix for values grabbed from settings 2014-09-25 18:08:22 -07:00
Stephen Birarda
ecb14d261b distinguish advanced and standard settings, cleanup checkboxes 2014-09-25 18:04:25 -07:00
Stephen Birarda
606a25694d setup scrollspy for nav links on settings page 2014-09-25 17:18:10 -07:00
Stephen Birarda
623e9e625b update to jQuery 2.1.1 2014-09-25 16:42:39 -07:00
Stephen Birarda
e8f25db6d8 update underscore to 1.7.0 2014-09-25 16:41:14 -07:00
Stephen Birarda
1c899daa1c don't escape setting help to allow for html 2014-09-25 16:37:08 -07:00
Stephen Birarda
33a411b895 combine settings and setup into single tab 2014-09-25 16:32:09 -07:00
Stephen Birarda
2e176589b7 initial use of a json file to describe setup options 2014-09-25 15:12:37 -07:00
Stephen Birarda
769586ef30 remove extra panels in domain-server setup 2014-09-25 14:23:15 -07:00
Stephen Birarda
33462f7466 handle permanent sidebar in setup page 2014-09-25 14:22:32 -07:00
Stephen Birarda
4790f517d6 add a nav panel for setup and pin to left 2014-09-25 13:42:11 -07:00
Atlante45
94edf2c900 Defaulted penumbra filter to true 2014-09-24 15:45:43 -07:00
Stephen Birarda
0b83795a13 simplify the domain setup page to just handle domain ID 2014-09-24 14:43:28 -07:00
Stephen Birarda
62e0d98d6b add username and password to domain setup page 2014-09-24 14:39:10 -07:00
Stephen Birarda
4a040b3f5e add base of modal to choose from user domains 2014-09-24 14:36:08 -07:00