Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 00:49:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36338 commits 25 branches 0 tags 1.1 GiB
Commit graph

1149 commits

Author SHA1 Message Date
Stephen Birarda
69fb6c73ac remove gui only feature in domain-server 2015-05-13 17:33:44 -07:00
Stephen Birarda
93973eecd1 resolve conflicts on merge with upstream/master 2015-05-13 17:13:33 -07:00
Stephen Birarda
225b41d163 don't do dumb things with memory 2015-05-13 14:18:48 -07:00
Stephen Birarda
8b2ded1b79 handle case where QVariant is not QVariantMap 2015-05-13 13:16:06 -07:00
Stephen Birarda
e88cfc913f make sure viewpoint is prepended with slash 2015-05-12 15:45:13 -07:00
Stephen Birarda
89cb3d66e4 make sure paths are prepended with a slash 2015-05-12 15:39:22 -07:00
Stephen Birarda
edadaea604 add help text for domain-server paths 2015-05-12 15:30:25 -07:00
Stephen Birarda
332601b91c final fixes for path query from DS 2015-05-12 14:34:14 -07:00
Stephen Birarda
7330e5255d handle path query response from DS in NL/AM 2015-05-12 13:48:41 -07:00
Stephen Birarda
993984134c add the path to DS response for path query 2015-05-12 12:48:01 -07:00
Stephen Birarda
0562fee82a Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths 2015-05-12 12:39:05 -07:00
Stephen Birarda
e0ccc986b1 add a method to DS to respond to path query 2015-05-12 12:29:09 -07:00
Stephen Birarda
c66bd9b1aa complete addition of paths to DS settings 2015-05-12 11:58:55 -07:00
Stephen Birarda
3daabd262b remove debugs from DSSettingsManager 2015-05-12 11:24:47 -07:00
Stephen Birarda
c49d73ea35 handle root key settings when updating 2015-05-12 10:25:11 -07:00
Stephen Birarda
f0aeaa1af8 handle sidebar badging for new root values 2015-05-11 18:07:33 -07:00
Stephen Birarda
542ce944ef add paths, handling for non-grouped values 2015-05-11 17:44:35 -07:00
Stephen Birarda
c390dcb4dd change button to disconnect if account connected 2015-05-11 14:10:44 -07:00
Stephen Birarda
55338a2b0f refuse to update a setting if it is gui only 2015-05-11 13:49:35 -07:00
Stephen Birarda
5afb0792dc don't return gui only values from DS settings json 2015-05-11 13:44:35 -07:00
Stephen Birarda
27f06e2d37 add button handling for describe settings 2015-05-11 13:32:09 -07:00
Stephen Birarda
e7433adc96 re-affix the DS settings sidebar 2015-05-11 11:29:32 -07:00
Stephen Birarda
979f33ade5 show an advanced toggle button in when xs 2015-05-11 11:26:45 -07:00
Stephen Birarda
e225443986 fix for table overflow in DS settings 2015-05-11 11:18:26 -07:00
Stephen Birarda
8c6715e4fc resolve conflicts on merge with upstream/master 2015-05-11 11:10:22 -07:00
Stephen Birarda
ddb52348bc don't force use of Settings to all QCoreApplication 2015-05-08 16:24:39 -07:00
Stephen Birarda
e3acf861ff fix for unverified datagram writes 2015-05-07 14:07:14 -07:00
Stephen Birarda
6b3cf1ba4a remove dependency of PacketHeaders on NodeList 2015-05-05 12:19:42 -07:00
Stephen Birarda
7b4522e950 nullify the current Highchart when modal closed 2015-05-01 16:21:05 -07:00
Stephen Birarda
99bddcc102 insert usernames to JSONBreakableMarshal interpolate map 2015-05-01 15:45:53 -07:00
Stephen Birarda
5936073425 get avatar-mixer settings from domain-server 2015-04-30 14:55:53 -07:00
Stephen Birarda
b50545f414 use symlink for DS resources, add AM bandwidth 2015-04-30 13:53:44 -07:00
Stephen Birarda
e8ee9e4b3a try performing copy in PRE_BUILD for VS 2015-04-30 13:42:30 -07:00
Stephen Birarda
42c40a7164 attempt add of resources to executable sources 2015-04-30 13:32:25 -07:00
Stephen Birarda
f9ac918ff0 add macro to copy directory beside target 2015-04-30 13:10:59 -07:00
Stephen Birarda
38ae3afc82 add a macro for directory copying 2015-04-30 13:06:00 -07:00
Stephen Birarda
73da4828b1 fix the shift and width of stat highchart 2015-04-30 08:33:08 -07:00
Stephen Birarda
17c5d1e32a complete highchart dynamic graph for numerical values 2015-04-29 20:07:00 -07:00
Stephen Birarda
781f45e488 pull the keypath for clicked value in stats javascript 2015-04-29 17:55:10 -07:00
Stephen Birarda
a39ee91233 add a keypath data attribute on stat values 2015-04-29 17:53:29 -07:00
Stephen Birarda
eda18318d8 add highcharts for graphing of numerical stat values 2015-04-29 17:35:03 -07:00
Stephen Birarda
40dfbada5d cleanup styling in json.human.css 2015-04-29 16:38:12 -07:00
Stephen Birarda
cca13d6c96 add back stale state for stats 2015-04-29 16:35:07 -07:00
Stephen Birarda
ab4a140806 re-enable dynamic stat updates, styling fix 2015-04-29 16:25:40 -07:00
Stephen Birarda
cb588debfe handle display of more complex json stats in domain-server 2015-04-29 16:21:35 -07:00
Stephen Birarda
b55889597d complete unmarshal of breakable json using QVariant 2015-04-29 15:03:49 -07:00
Stephen Birarda
24576574ae add breaking of marshaled buffer to QStringList 2015-04-29 11:20:07 -07:00
Seth Alves
e6da5ea711 formatting 2015-04-28 09:28:42 -07:00
Seth Alves
49783c1550 formatting 2015-04-28 09:28:17 -07:00
Seth Alves
7aa2013473 formatting 2015-04-28 09:26:39 -07:00
Seth Alves
436fe03d10 formatting 2015-04-28 09:26:20 -07:00
Seth Alves
30e78a37cd formatting 2015-04-28 09:26:03 -07:00
Seth Alves
8db46d859e formatting 2015-04-28 09:19:45 -07:00
Seth Alves
38ba0ab352 remove useless added code 2015-04-28 09:18:00 -07:00
Seth Alves
32f91a86e7 remove some unneeded code 2015-04-27 15:43:47 -07:00
Seth Alves
2f36cd0fb0 make it so assignment-clients runnings scripts can rez entities 2015-04-27 15:30:17 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Stephen Birarda
f94fcdab7b print if DS is using an access token from env 2015-04-17 10:44:18 -07:00
Stephen Birarda
1d5f1807f7 Merge pull request #4562 from sethalves/editors-are-rezzers 
add a bool value to Node which indicates if it is allowed to rez new ent...
 2015-03-31 18:53:29 -07:00
Seth Alves
4e83301c65 add a bool value to Node which indicates if it is allowed to rez new entities 2015-03-31 18:27:46 -07:00
Stephen Birarda
61806935bb add a networking constants class with metaverse URL 2015-03-31 16:40:21 -07:00
Ryan Huffman
1c0e7e26a2 Merge pull request #4507 from birarda/friends-only-location 
make friends-only discoverability mode work as described
 2015-03-25 13:48:08 -07:00
Leonardo Murillo
d1d183e190 More .com changes 2015-03-25 13:05:10 -06:00
Stephen Birarda
4bf8e9f625 change AccountManager request API, leverage in networking and DS 2015-03-25 12:04:04 -07:00
Seth Alves
baa8e9c86f remove uneeded #includes 2015-03-19 13:05:30 -07:00
Seth Alves
817a6130ef return a reason as part of the domain server's connection-denied packet. Don't apply max-capacity check to users in the editors list 2015-03-19 13:01:57 -07:00
Seth Alves
4412ba916e don't lock out someone from localhost, even if the maximum number of users are connected 2015-03-18 15:17:25 -07:00
Seth Alves
610607e8e6 optionally limit number of avatars that can connect 2015-03-18 14:08:53 -07:00
Seth Alves
405eceeda6 Merge branch 'master' of github.com:highfidelity/hifi into maximum-capacity 2015-03-18 13:26:46 -07:00
Seth Alves
4bae19015c add (thus far unused) domain-server setting for maximum user capacity 2015-03-17 15:52:23 -07:00
Seth Alves
6c4b808813 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-15 07:10:56 -07:00
Stephen Birarda
7bfc747748 Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"" 
This reverts commit 9269b2a0b2.
 2015-03-12 12:13:32 -07:00
Stephen Birarda
9269b2a0b2 Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList" 2015-03-12 11:28:07 -07:00
Seth Alves
b431ce289c missed a comma 2015-03-12 10:11:46 -07:00
Seth Alves
3bc85c2531 instead of a json checkbox, a dropdown to chose the file type 2015-03-12 09:34:01 -07:00
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
Stephen Birarda
9f754e40d0 move all silent node timers into LimitedNodeList 2015-03-11 16:59:06 -07:00
ZappoMan
05640290da don't add old metavoxels assignment to default assignments 2015-03-04 14:41:28 -08:00
samcake
6b1f42df83 Merge pull request #4366 from ZappoMan/removeMetavoxels 
remove metavoxels
 2015-03-03 15:50:53 -08:00
Stephen Birarda
eb8e8e9a62 Merge pull request #4356 from sethalves/domain-server-http-port-in-shmem 
pass more localhost ports via shared memory
 2015-03-03 10:05:24 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Seth Alves
bb7b132b78 Add a way to indicate that a specific message of a certain form should only be printed once. Different messages that match the same form will each be printed once. 2015-03-02 14:18:26 -08:00
Seth Alves
f54f41fcf0 fix typo 2015-02-27 11:36:45 -08:00
Seth Alves
01cac7445a add suppressions for log-spam caused by idle assignment-client 2015-02-27 10:58:04 -08:00
Seth Alves
f157c5c60d Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem 2015-02-26 09:13:49 -08:00
Seth Alves
128a38100f Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x 2015-02-25 14:13:55 -08:00
Seth Alves
1a4808857e put local domain server's http port into shared memeory 2015-02-25 11:30:54 -08:00
Seth Alves
89ebb45c03 Revert "Merge pull request #4332 from birarda/master" 
This reverts commit 3230857b0d, reversing
changes made to 1b669af79d.
 2015-02-24 17:09:05 -08:00
Stephen Birarda
09ffcbb2e8 Revert "Merge pull request #4324 from sethalves/assignment-client-keep-a-spare" 
This reverts commit 087e2babde, reversing
changes made to 5202d2136a.
 2015-02-24 12:30:40 -08:00
Seth Alves
4bba4fc387 cleanups 2015-02-20 13:44:37 -08:00
Seth Alves
4b3183d820 AssignmentClients accept an id on the command-line. 
AssignmentClientMonitor now has a NodeList.  It stores its local port
in shared memory, like the DomainServer does.  As it spawns children,
it addes Nodes to the NodeList for each one.  The children send status
updates to the Monitor.  The Monitor will notice if there are no
spares and fork another child.
 2015-02-19 17:44:06 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
c110fcbfad merge with upstream/master 2015-02-17 17:34:48 -08:00
Stephen Birarda
68c19866c4 call dll copy after project deps are setup 2015-02-17 17:17:30 -08:00
ZappoMan
bc5a1477e6 added logging of edit commands in the server 2015-02-13 14:59:57 -08:00
Stephen Birarda
fe79d8902e replace data with metaverse for highfidelity urls 2015-02-10 10:05:38 -08:00
Brad Hefta-Gaub
390d2be48f Merge pull request #4189 from birarda/android 
add the gvr-interface target for GearVR
 2015-02-06 14:07:28 -08:00
Seth Alves
9539292c22 clarify settings explaination, coding standard 2015-02-06 10:44:35 -08:00
Seth Alves
60a4f48985 rather than a list of allowed editors, a list of allowed lockers/unlockers 2015-02-06 09:14:40 -08:00
Seth Alves
d19ab4c36f formatting 2015-02-05 15:46:40 -08:00
Seth Alves
ccc8662732 formatting 2015-02-05 15:46:23 -08:00
Seth Alves
6bad141004 formatting 2015-02-05 15:42:42 -08:00
Seth Alves
810e7549d1 formatting 2015-02-05 15:41:04 -08:00
Seth Alves
485785be7f Allowed Editors setting in DomainServer; domain-list wire protocol includes "you can edit" boolean after uuid; entity server checks canEdit flag of node who sends edit requests; interface does not attempt to do edits if DomainServer sent false for "you can edit" 2015-02-05 15:37:14 -08:00
Seth Alves
afea5f3534 added allowed_editors to settings json 2015-02-04 16:31:36 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Atlante45
cc58cb0f03 Update domain-server and Application setting handles 2015-02-02 20:06:13 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-01-28 13:13:32 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
Atlante45
cdb0c22207 interface/ui uses new settings 2015-01-19 22:49:27 -08:00
Atlante45
c1e195d17b Remove load/saveSettings from Menu/Application 
Tweaked scanMenuBar too
 2015-01-19 16:24:58 -08:00
Stephen Birarda
10be0ee984 resolve conflicts on merge with upstream master 2015-01-19 10:26:56 -08:00
Atlante45
967028e5cf Removed more QSettings references 2015-01-18 19:29:27 -08:00
Stephen Birarda
2c1d4c8a64 fix settings url to check domains 2015-01-15 17:44:15 -08:00
Stephen Birarda
891cb42eff use new place names in domain-server settings 2015-01-15 17:41:59 -08:00
Atlante45
1399de52a5 Only use limited nodelist in DS 2015-01-14 14:24:54 -08:00
Atlante45
48f1cbe644 Fixed QSharedPointer in connect() 2015-01-13 20:54:15 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
ZappoMan
6eb35bf98c tweaks to descriptions 2015-01-13 16:13:18 -08:00
ZappoMan
60aec8ac00 add support for multiple backup rules 2015-01-13 13:41:32 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -08:00
Philip Rosedale
285e588266 Merge pull request #4072 from Atlante45/network_replies_cleanup 
Windows crash fix
 2015-01-09 07:42:36 -08:00
Stephen Birarda
2103e0150f fix for row removal in domain array settings 2015-01-06 15:42:01 -08:00
Stephen Birarda
51c175d160 put input default back after row add 2015-01-06 15:30:38 -08:00
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -08:00
ZappoMan
5cef7d0e9d more voxelEctomy 2014-12-30 20:24:27 -08:00
ZappoMan
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
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