Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 05:16:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

1117 commits

Author SHA1 Message Date
Stephen Birarda
08581b4dac Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-19 12:50:32 -08:00
Clément Brisset
dbfbe35a49 Merge pull request #3986 from birarda/domain-connect 
fix domain connection with port, show current address in address bar
 2014-12-19 12:49:51 -08:00
Stephen Birarda
66b1886b44 don't add the unused assignment type to DS queue 2014-12-19 12:33:26 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Atlante45
e6123ec4a7 Typo 2014-12-18 16:31:19 -08:00
Atlante45
47d8b0b062 Replace Game Of Life with intructions 2014-12-18 16:24:26 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
Atlante45
990362b8ff Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-18 14:18:21 -08:00
Atlante45
aa0998dc7d Moved LimitedNodeList into DM 2014-12-18 10:32:34 -08:00
Stephen Birarda
b326ab9839 remove quotes from library links for debug/optimized 2014-12-18 09:38:48 -08:00
Stephen Birarda
d38c78f2c3 remove bubbling of linked libraries, cmake does it 2014-12-18 09:34:04 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Atlante45
fcb8bf6425 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2014-12-17 10:28:17 -08:00
Stephen Birarda
737741c13b Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 09:23:42 -08:00
Stephen Birarda
77bc00e410 a simple model for persistent scripts in domain-server 2014-12-16 18:34:39 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
Stephen Birarda
f58d21d6f0 have ShutdownEventListener handle WM_CLOSE or SIGTERM 2014-12-11 10:21:11 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Stephen Birarda
49a087018f fix for delayed heartbeats, late socket lookup 2014-12-03 08:22:50 -08:00
Stephen Birarda
8449575fa2 fix for ice-server heartbeat without an access token 2014-12-01 09:25:21 -08:00
Stephen Birarda
59432e8d29 complete sharing of local domain-server port to local AC 2014-11-30 17:54:10 -08:00
Stephen Birarda
fed7d789f6 have the domain-server write its local port into shared memory 2014-11-30 17:29:18 -08:00
Stephen Birarda
dff5695965 have domain server report its ID at /id 2014-11-21 16:20:44 -08:00
Stephen Birarda
8a69f0de61 test for android figuring out about audio-mixer 2014-11-18 17:36:53 -08:00
Philip Rosedale
2e6330e3c4 Merge pull request #3810 from Atlante45/new_reverb_settings_description 
New text for reverb settings
 2014-11-17 11:50:19 -08:00
Atlante45
18faa78aa3 New text for reverb settings 2014-11-17 11:22:32 -08:00
ZappoMan
bdfe02bbd0 Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	libraries/octree/src/OctreePersistThread.cpp
	libraries/octree/src/OctreePersistThread.h
 2014-11-17 11:22:00 -08:00
ZappoMan
f44513ebe7 added support for rolling version numbers in backups 2014-11-15 22:55:12 -08:00
ZappoMan
4adb4787cd added debugging of usecTimestampNow() in octree server to better understand flight times 2014-11-15 21:50:42 -08:00
ZappoMan
6ee4e611ac add persist settings to domain settings, make default backup interval 30 minutes 2014-11-14 11:31:06 -08:00
Philip Rosedale
17d0f247d6 Switch muting threshold to 0.003 to be a bit less aggressive 2014-11-11 14:10:44 -08:00
Philip Rosedale
12eb67c734 fix bug with audio mixer muting too often 2014-11-07 14:18:57 -08:00
Stephen Birarda
0f32346324 resolve conflicts on merge with upstream master 2014-11-07 09:10:12 -08:00
Stephen Birarda
996c76c723 repairs for node teardown on domain dissappear or node disconnect 2014-11-06 16:05:01 -08:00
Stephen Birarda
e92376cf64 distinguish between eachNode and eachNodeBreakable 2014-11-06 13:41:55 -08:00
Stephen Birarda
270823be43 update domain-server to leverage intel tbb hash 2014-11-06 13:39:15 -08:00
AndrewMeadows
843aaf4e95 Merge pull request #3747 from PhilipRosedale/master 
First pass audio mixer muting, improved tour guide, hair, injector loudness in JS
 2014-11-06 10:36:46 -08:00
ZappoMan
bcec14b0f4 adjust the sentAt times in packets by the receiving side's clockskew so that it can calculate proper flight times 2014-11-05 19:37:08 -08:00
Philip Rosedale
688bd0f34f first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body' 2014-11-05 16:58:58 -08:00
Stephen Birarda
8a72cdd59d leverage new libcuckoo hash outside LimitedNodeList 2014-11-05 15:09:54 -08:00
ZappoMan
e9a332de4d make entity and voxel servers support domain based configuration 2014-11-05 12:12:17 -08:00
Stephen Birarda
d671dec61b fix for ice server sock addr in domain-server 2014-11-04 13:21:48 -08:00
Stephen Birarda
96dd1eaf76 report restricted access state from domain-server in heartbeat 2014-11-03 16:57:10 -08:00
Stephen Birarda
0348251cc1 allow case insensitivity for allowed users in domain-server 2014-11-03 15:32:45 -08:00
Stephen Birarda
2250cdfcc2 have the domain-server unverifiably heartbeat the number of connected users 2014-11-03 14:50:45 -08:00
Stephen Birarda
22f4e8ec70 cleanup heartbeat method names 2014-11-03 14:37:56 -08:00
Stephen Birarda
eb856095a9 fix the domain server heartbeat timer 2014-11-03 12:49:24 -08:00
Stephen Birarda
d50a8f6309 send a heartbeat to data server every 15s 2014-11-03 12:40:56 -08:00
Stephen Birarda
e53ad09b3f rename the automatic networking update method to heartbeat 2014-11-03 12:24:17 -08:00
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07:00
Stephen Birarda
9364c3b342 fix for delete of last row in array table 2014-10-23 11:54:30 -07:00
Atlante45
7c54da033c Changed reverb time label 2014-10-20 16:29:19 -07:00
Atlante45
86b87770c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 16:50:19 -07:00
Brad Hefta-Gaub
023d47918f Merge pull request #3620 from birarda/domain-tunnel 
repairs to domain change reset to correctly clear nodes
 2014-10-17 16:05:28 -07:00
Brad Hefta-Gaub
af9090cadf Merge pull request #3618 from birarda/master 
styling fixes for locked table settings in domain-server
 2014-10-17 16:05:04 -07:00
AndrewMeadows
415c7375cb Merge pull request #3614 from ZappoMan/removeParticles 
Remove particles
 2014-10-17 15:53:19 -07:00
Stephen Birarda
e72b86059e Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-17 14:48:43 -07:00
Atlante45
89cb464eaa Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 14:03:11 -07:00
Stephen Birarda
1e4eaed7fd don't show domain ID selection button if in master config 2014-10-17 12:25:23 -07:00
Stephen Birarda
0d99beb344 add styling to locked table 2014-10-17 11:33:29 -07:00
Stephen Birarda
796b519fe0 remove change buttons for a locked table 2014-10-17 11:24:51 -07:00
Stephen Birarda
7c24186baa don't allow the creation of new table rows if table locked 2014-10-17 11:23:39 -07:00
Stephen Birarda
5b0ccd7091 fix for for clickable labels and locked table 2014-10-17 11:22:42 -07:00
Stephen Birarda
c89daa30da fix another dumb conditional mistake in domain-server 2014-10-17 11:07:02 -07:00
Atlante45
c86f3965e8 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 11:01:42 -07:00
Stephen Birarda
9a842e2202 flip domain-server local connect conditional 2014-10-17 10:52:36 -07:00
Atlante45
9ee0138ccf Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 10:50:08 -07:00
Stephen Birarda
d00e11541e fix for pub key format returned to data-server 2014-10-17 09:39:04 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
Atlante45
ea7c2e2fa3 Added reverb settings to DS settings 2014-10-16 15:28:24 -07:00
Stephen Birarda
e856191bf3 Merge pull request #3605 from birarda/master 
fix for interest list pull when node requests domain list
 2014-10-16 12:05:25 -07:00
Stephen Birarda
7bbaaf6b78 cleanup some username signature debug, fix interest list pull 2014-10-16 11:54:55 -07:00
Atlante45
9019ae4f89 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
 2014-10-16 10:55:46 -07:00
AndrewMeadows
4fbc589606 Merge pull request #3598 from birarda/domain-tunnel 
initial pass at using keypairs for username verification for basic domain-server ACL
 2014-10-16 10:49:03 -07:00
Atlante45
0ae4392d0a missing 's' 2014-10-15 17:11:24 -07:00
Atlante45
3f67f6fae7 hide panels if only advanced settings 2014-10-15 17:09:10 -07:00
Atlante45
ad48009ecd Switch buffers back to advanced 2014-10-15 17:08:45 -07:00
Atlante45
0cf4483c5a factor text-align and font-size 2014-10-15 15:52:59 -07:00
Atlante45
0688379b74 changed buttons class names 2014-10-15 15:15:19 -07:00
Stephen Birarda
cbbf11e28f add missing indentation for OpenSSL warnings 2014-10-15 13:31:44 -07:00
Stephen Birarda
9a3ba972e1 preload the public keys for allowed users to allow immediate connection 2014-10-15 10:21:11 -07:00
Stephen Birarda
1613b16a93 remove another extra space 2014-10-15 09:51:52 -07:00
Stephen Birarda
3800389eb4 fix a bad equality check on QJsonObject 2014-10-15 09:51:40 -07:00
Stephen Birarda
05728681a5 add a check to warn if OpenSSL is OS X system version 2014-10-15 09:49:03 -07:00
Stephen Birarda
4d8e44afd1 remove an extra space 2014-10-15 09:19:02 -07:00
Stephen Birarda
50f27d3e16 handle verification of username signature during connection 2014-10-14 18:02:22 -07:00
Stephen Birarda
e3ba8cddbb store returned public keys in domain-server 2014-10-14 16:35:07 -07:00
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Stephen Birarda
c4b0dc9dcc initial handling of username signature in domain-server 2014-10-14 16:03:35 -07:00
Atlante45
2edc2eed6d Changed arrows style 2014-10-14 12:31:17 -07:00
Atlante45
02b4b220b9 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-14 12:16:20 -07:00
Atlante45
edea8da18f Move array rows 2014-10-14 12:13:34 -07:00
Stephen Birarda
7e116346cb fix the security link in domain-server page 2014-10-14 11:53:07 -07:00
Stephen Birarda
cca8b68d2e update location and profile paths for new format 2014-10-14 10:40:58 -07:00
ZappoMan
c36bcf2d7e removing particles 2014-10-13 14:11:11 -07:00
Atlante45
6d03590c00 If no advanced settings, don't show button 2014-10-13 11:10:37 -07:00
Atlante45
8fab184ed1 Remove audio settings from advanced 2014-10-13 11:10:11 -07:00
Stephen Birarda
21114d5f56 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 14:30:43 -07:00
Atlante45
fb751aec7c Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
 2014-10-10 10:24:28 -07:00
Stephen Birarda
64b3d461fe fix for delete of object table row 2014-10-10 10:00:35 -07:00
Stephen Birarda
3aca910e17 remove some extra console logs 2014-10-10 09:27:15 -07:00
Stephen Birarda
d2c7bf4334 fix for delete of object table row 2014-10-10 09:26:41 -07:00
Stephen Birarda
f637f5a4a6 always allow connection from localhost user 2014-10-09 17:07:32 -07:00
Stephen Birarda
e40aff4864 remove a missed console log 2014-10-09 16:54:08 -07:00
Stephen Birarda
31df339565 pipe username signature requirement through to DomainHandler 2014-10-09 16:53:22 -07:00
Stephen Birarda
0d2b1e361c have domain-server reply back with username request is allowed_users is not empty 2014-10-09 16:29:52 -07:00
Stephen Birarda
c342e1b2e8 cleanup help text for allowed users for domain 2014-10-09 16:19:16 -07:00
Stephen Birarda
d70bf7fc50 add allowed users to describe, remove +/- from table header 2014-10-09 16:15:59 -07:00
Stephen Birarda
d741b860f8 fix for delete of object table row 2014-10-09 15:58:26 -07:00
Atlante45
fb520bf47f Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-09 15:34:24 -07:00
Atlante45
f2bbb88405 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/describe-settings.json
	domain-server/resources/web/js/settings.js
 2014-10-09 15:34:17 -07:00
Stephen Birarda
b6a58925ed Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-09 15:29:54 -07:00
Stephen Birarda
95bca3f33e fix an error in describe json 2014-10-09 15:29:15 -07:00
Stephen Birarda
90a79fc6f5 remove allowed users from describe until ready for primetime 2014-10-09 15:27:51 -07:00
Stephen Birarda
7eae64a26b constantize the delete row button classes 2014-10-09 15:24:12 -07:00
Stephen Birarda
c748ecb967 constantize the new row class 2014-10-09 15:22:20 -07:00
Stephen Birarda
e80cf6fc76 highlight new rows by making them green 2014-10-09 15:21:38 -07:00
Stephen Birarda
4d13718d87 constantize the trigger change class for input changes 2014-10-09 15:19:56 -07:00
Stephen Birarda
712a81c950 more constantization and removal of extra line 2014-10-09 15:17:45 -07:00
Stephen Birarda
ee36b6b91a jump to input for next row after enter on previous row 2014-10-09 15:12:42 -07:00
Stephen Birarda
a6c5f4308a handle the enter button in domain server forms 2014-10-09 15:10:17 -07:00
Stephen Birarda
ad48592a69 start to constantize some classes in settings.js 2014-10-09 15:02:14 -07:00
Atlante45
b19956b0ca Changed panel names 2014-10-09 14:46:13 -07:00
Stephen Birarda
9dc0bf52b8 constantize the advanced settings class 2014-10-09 14:44:24 -07:00
Stephen Birarda
2472dc0c11 handle transition from input to row for array of objects 2014-10-09 14:42:21 -07:00
Stephen Birarda
323eaa0ac9 remove an extra space 2014-10-09 14:36:33 -07:00
Stephen Birarda
98925e4adb handle removal of last row and removal of hidden input for empty array 2014-10-09 14:34:05 -07:00
Stephen Birarda
e1b64275c9 fix population of multi-column array from values in settings 2014-10-09 14:26:39 -07:00
Atlante45
06007863d2 Fixed placeholder 2014-10-09 12:39:00 -07:00
Atlante45
72e4785db2 Reorganized settings 2014-10-09 12:38:46 -07:00
Atlante45
e7ecf1cd6f Optional labels 2014-10-09 12:38:07 -07:00
Stephen Birarda
6d01724568 rename in changedInput in badge sidebar in settings.js 2014-10-09 11:57:11 -07:00
Stephen Birarda
84fa1c7f5f remove an extra space 2014-10-09 11:54:53 -07:00
Stephen Birarda
806e73d321 don't set data-changed when a row is added and deleted in same session 2014-10-09 11:54:37 -07:00
Stephen Birarda
5bb0c4e8fb remove an extra debug of posted settings in DSSM 2014-10-09 11:32:09 -07:00
Stephen Birarda
bfaf96dbf5 remove the allowed_users setting that isn't ready for primetime 2014-10-09 11:31:30 -07:00
Stephen Birarda
68dffabd5e handle data-changed setting for all array values 2014-10-09 11:31:00 -07:00
Stephen Birarda
51d908008c handle array posting in domain server settings manager 2014-10-09 11:00:58 -07:00
Stephen Birarda
a175c22724 handle addition and removal on same page session 2014-10-09 10:56:54 -07:00
Stephen Birarda
f39120519d fix removal icons, handle row removal for hash 2014-10-09 10:50:05 -07:00
Stephen Birarda
a416f67751 handle add and delete for badged sidebar 2014-10-09 10:33:20 -07:00
Stephen Birarda
90c73dc9e1 post an empty array to remove an array from settings 2014-10-09 09:47:53 -07:00
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
Stephen Birarda
25150b9285 update to newer bootstrap, add stub of setup form 2014-09-24 13:56:15 -07:00
Craig Hansen-Sturm
8e6d5da8fd disable positional filter by default 2014-09-18 16:05:15 -07:00
Stephen Birarda
cc79254a41 have domain server make sure access token is present before IP update 2014-09-17 09:40:48 -07:00
Stephen Birarda
f1458dec3f fix presentation of checkboxes who default to true 2014-09-17 08:46:08 -07:00
Stephen Birarda
885030a10c handle receipt of new public socket and propogation to data-server 2014-09-16 12:37:22 -07:00
Stephen Birarda
47137c72a5 groundwork for repeated dynamic IP address updating in domain-server 2014-09-16 12:09:24 -07:00
Craig Hansen-Sturm
ea6f89c9f4 head penumbra filter tuning / head penumbra filter now turned on by default 2014-09-15 18:46:10 -07:00
Stephen Birarda
c98b69f24f don't comment value return, rename domain settings file 2014-09-14 09:52:10 -07:00
Stephen Birarda
d6dca84694 add back commenting out of blind values return 2014-09-14 09:46:01 -07:00
Stephen Birarda
4d80417e3c don't rename the config file to settings so existing nodes work 2014-09-14 09:45:02 -07:00
Stephen Birarda
cb7a6a7af5 don't blindly return all values if a type is not passed 2014-09-14 09:43:55 -07:00
Stephen Birarda
ee6a90dd54 allow domain to pass down its ID from config 2014-09-10 15:13:02 -07:00
Ryan Huffman
38a14c3864 Reapply "Update assignment client to close on WM_CLOSE message on Windows" 
This reverts commit a603453cf2.
 2014-09-05 11:19:36 -07:00
Leonardo Murillo
a603453cf2 Revert "Update assignment client to close on WM_CLOSE message on Windows" 2014-09-05 11:36:56 -06:00
AndrewMeadows
9036954d38 Merge pull request #3311 from huffman/fix-wm-close 
Update assignment client to close on WM_CLOSE message on Windows
 2014-09-03 16:43:12 -07:00
Ryan Huffman
f3efbb35f4 Remove nativeEventFilter from DomainServer 2014-09-03 07:08:51 -07:00
Ryan Huffman
76bede04aa Move stdout/err disabling to a library class 2014-09-03 07:06:08 -07:00
Ryan Huffman
c27bee2c06 Move wm_close handling to a shared library 2014-09-03 07:05:24 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
Ryan Huffman
444a974bd6 Merge branch 'master' of github.com:highfidelity/hifi into fix-wm-close 
Conflicts:
	assignment-client/src/AssignmentClient.cpp
 2014-08-28 06:52:16 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Craig Hansen-Sturm
4cd1f4afef add support for head-shadow/penumbra filter for positional audio streams 2014-08-24 22:17:07 -07:00
Ryan Huffman
4c485a26ed Merge branch 'fix-wm-close' of github.com:huffman/hifi into fix-wm-close 2014-08-22 15:10:23 -07:00
Ryan Huffman
fa7b2a87bf Add WM_CLOSE support to domain server 2014-08-22 15:09:55 -07:00
Ryan Huffman
b75c3a4976 Disable stdout/err buffering on Windows for assignment client and domain server 2014-08-22 15:08:57 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
 2014-08-18 15:16:35 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
446c888242 AudioMixer print added; untested 2014-08-12 12:22:32 -07:00
wangyix
e276d15ed4 repetition-with-fade implemented; testing interface crash 2014-08-11 16:25:43 -07:00
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -07:00
Stephen Birarda
2fda95ae8f repair build of various tools 2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
e4d01d269c use shared dependency linking macro in hifi projects 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
1f0a722d0d remove antequated windows libraries that have been replaced by Qt usage 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 2014-08-08 13:17:53 -07:00
Stephen Birarda
107cbc3f87 more simplification of hifi macros to find libraries 2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
0378fb3049 break glm helpers out of SharedUtil 2014-08-08 13:17:53 -07:00
Stephen Birarda
fa26957b23 more CMakeLists cleanup for sub-dependencies 2014-08-08 13:17:52 -07:00
wangyix
fd3425dfd1 knobs confirmed working 2014-08-07 17:05:23 -07:00
wangyix
1153a76ab1 new option knobs added, no new behavior yet 2014-08-07 16:37:36 -07:00
Stephen Birarda
4f0218090c have the domain-server brand in navbar link back to home 2014-08-04 16:23:28 -07:00
Stephen Birarda
4407ea4480 make assignment selector a dropdown 2014-08-04 16:02:13 -07:00
Stephen Birarda
6febca3533 add missing domain-server javascript file 2014-08-04 15:37:06 -07:00
Stephen Birarda
c786ee5c26 dynamically change active link in domain-server navbar 2014-08-04 15:27:34 -07:00
Stephen Birarda
10c94023f1 handle basic authentication for domain-server admin 2014-08-04 15:25:14 -07:00
Stephen Birarda
2c1277ef37 remove voxel settings from domain-server settings until ready to go 2014-08-04 14:47:17 -07:00
Stephen Birarda
40375b8c81 add a navbar to domain-server web page 2014-08-04 14:46:33 -07:00
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
 2014-08-04 12:01:23 -07:00
Stephen Birarda
e846fd24f7 fix an order mistake in DS handling HTTP requests 2014-07-31 15:23:15 -07:00
Stephen Birarda
f0e7bf0462 allow assignments to pull script without session cookie 2014-07-31 15:13:33 -07:00
ZappoMan
77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
 2014-07-31 10:34:23 -07:00
Stephen Birarda
453c37f4b9 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-31 10:05:40 -07:00
Brad Hefta-Gaub
d4d4069f11 Merge pull request #3225 from birarda/master 
cmake file cleanup to suppress warnings on cmake 3.0
 2014-07-30 19:20:18 -07:00
Stephen Birarda
04effabe48 Merge branch 'master' into domain-server-auth 2014-07-30 17:14:03 -07:00