Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:32:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27846 commits 75 branches 59 tags 1.2 GiB
Commit graph

997 commits

Author SHA1 Message Date
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