Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 00:52:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
53755 commits 67 branches 56 tags 1.2 GiB
Commit graph

1571 commits

Author SHA1 Message Date
Stephen Birarda
cd023e0384 force domain-server to use new ID if node requests connect 2017-04-25 13:10:54 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Brad Davis
4367e3d036 PR comments 2017-03-15 18:13:10 -07:00
Brad Davis
2837ae9183 More VS 2017/2015 fixes 2017-03-15 16:13:15 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
kunalgosar
a4e0d970bf Fix security section of domain server 2017-02-24 19:03:30 -08:00
Brad Hefta-Gaub
305e1ae1d2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-17 10:18:53 -08:00
David Kelly
a8831e89ff Ban only by machine fingerprint, when possible 2017-02-16 09:50:56 -07:00
Brad Hefta-Gaub
5d90b7b1b7 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-15 16:15:57 -08:00
Howard Stearns
34a4770ffa Merge pull request #9669 from davidkelly/dk/2656 
inform gatekeeper immediately when kicking someone
 2017-02-15 15:13:10 -08:00
Brad Hefta-Gaub
00086fcc06 wire up thread count to settings, tweak stats 2017-02-15 13:00:30 -08:00
Stephen Birarda
27412080dd return an empty descriptors map when empty 2017-02-14 15:39:59 -08:00
David Kelly
3b344ca01a inform gatekeeper immediately when kicking someone 2017-02-13 18:25:00 -07:00
David Kelly
45cb11f38a Don't allow a ban of any node on same machine as domain-server 2017-02-13 14:38:21 -07:00
Ryan Huffman
026c68c7de Merge pull request #9625 from huffman/fix/server-script-entity-updates 
Fix Server Entity Script w/ high update rate causing issues
 2017-02-09 10:07:32 -08:00
Ryan Huffman
f75eceda65 Add entity PPS per script configuration 2017-02-08 13:11:18 -08:00
Stephen Birarda
5c46cecf6a handle empty initial groups when comparing 2017-02-06 14:32:02 -08:00
Stephen Birarda
3311df5e1f fix default value in new row 2017-02-06 14:23:37 -08:00
Stephen Birarda
4bbd823a5a remove open hours from domain settings 2017-02-06 10:50:59 -08:00
Stephen Birarda
5bd8e46510 only check if keys are empty, not all fields 2017-02-01 10:33:29 -08:00
Stephen Birarda
f03d2988c1 fix for checkbox name setting 2017-01-31 17:30:45 -08:00
Stephen Birarda
79cb0ba074 fix keyboard behaviour for category tables 2017-01-31 11:05:57 -08:00
Stephen Birarda
1474f22fd7 don't validate category inputs for empty 2017-01-31 10:55:42 -08:00
Stephen Birarda
015aafe0fb make table additions in DS settings clearer 2017-01-31 10:36:16 -08:00
David Kelly
eaf033107c Require password verification in domain-server settings 
If you modify the security settings to use a username/password for
access to the domain server settings, we now have a second password
field which must match the first one you entered.
 2017-01-30 17:13:13 -07:00
Howard Stearns
866f9debcd Merge pull request #9526 from highfidelity/edit-entity-filter 
Edit entity filter (from branch)
 2017-01-26 16:00:48 -08:00
Brad Hefta-Gaub
0582aca598 Merge pull request #9511 from kunalgosar/master 
change server to default to not auto-muting
 2017-01-26 10:59:50 -08:00
howard-stearns
1c30da42af change placeholder text in settings 2017-01-25 17:01:07 -08:00
howard-stearns
9cbc4fd1b9 Merge branch 'master' of https://github.com/highfidelity/hifi into entity-filter-resource 2017-01-25 16:23:52 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
kunalgosar
7b896f961b change server to default to not auto-muting 2017-01-25 13:00:57 -08:00
Ryan Downe Karpf
b053fb55aa Merge pull request #9478 from birarda/bug/too-many-casts 
some reinterpret/dynamic cast cleanup in domain-server
 2017-01-25 12:47:27 -08:00
Stephen Birarda
9b8cbba53f add isInInterestSet to DomainServer for extra checks 2017-01-24 18:32:33 -08:00
Stephen Birarda
e511b6e84c cleanup connect check in DomainServer 2017-01-24 17:14:05 -08:00
Stephen Birarda
fc42c1bc94 don't tell ESS about script Agents that won't talk to it 2017-01-24 17:10:05 -08:00
Stephen Birarda
7362bf16c1 use isParentOf to check script whitelist, clarify description in settings 2017-01-23 16:44:28 -08:00
Stephen Birarda
1802e1520d change some dynamic_cast to static_cast for DomainServerNodeData 2017-01-23 13:15:48 -08:00
Stephen Birarda
fb8d2e34fb fix needless reinterpret_cast for DomainServerNodeData 2017-01-23 13:14:53 -08:00
howard-stearns
3358d58d01 Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-23 12:21:32 -08:00
Stephen Birarda
ab7ce19211 use html_id for settings anchor if no name 2017-01-23 09:49:46 -08:00
Ryan Huffman
b6893a0100 Keep Agents and EntityScriptServers from connecting if lacking permissions 2017-01-19 14:35:27 -08:00
Zach Fox
44eaa64a1d It was writeString() all along! 2017-01-19 11:25:17 -08:00
Zach Fox
534fcd9399 Potential fix 2017-01-19 10:20:36 -08:00
Zach Fox
1175752e1d Cleanup after rebase 2017-01-18 12:55:24 -08:00
Zach Fox
346cfbfe02 First checkpoint 2017-01-18 12:55:24 -08:00
howard-stearns
d9182cd38d Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-18 10:02:27 -08:00
Atlante45
529286b2ea More EntityScriptServer work 2017-01-17 13:47:45 -08:00
Atlante45
163d65d784 Setup basic EntityScriptServer 2017-01-17 13:47:45 -08:00
ZappoMan
5e49e8025a improve comment in domain settings 2017-01-16 21:06:38 -06:00