Commit graph

415 commits

Author SHA1 Message Date
Seth Alves
d25db099b9 be more effecient about ignoring edits to unknown entities 2017-05-04 18:49:46 -07:00
Seth Alves
74c0a70cb0 rename base action classes to dynamics, start on constraints 2017-04-11 20:39:13 -07:00
Ryan Huffman
b9fffc10f8 Fix entity "unlock" edits not being propagated to clients
The lastEditedBy property was not being updated when changing the locked
property of entities from true to false.
2017-04-03 15:51:19 -07:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
David Kelly
e6969321ca fix for not properly filtering entity adds 2017-02-15 09:15:35 -07:00
David Kelly
17acd8fa4f I should just build on linux exclusively 2017-02-14 13:30:43 -07:00
David Kelly
342584b2a8 Filter failure mode updated
The decision here is that all failed filters (syntax errors, 404s,
bad urls etc...) lock out all edits for those without lock rights.
If it is the domain-wide one, then that applies to entire domain.
If a zone filter, then that applies to all edits in that zone.

Also - zone filters don't apply to the zone itself.  Other zone filters
whose zones lie within that zone _do_ apply, in addition to the global
one.
2017-02-14 13:05:12 -07:00
howard-stearns
487adc7f18 whitespace 2017-02-13 16:35:03 -08:00
howard-stearns
6241889e38 lastEditedBy is set by add/edit, but not by physics packets 2017-02-13 13:47:20 -08:00
David Kelly
8a7a3926c5 rest of issues w/linux and mac 2017-02-10 15:57:27 -07:00
David Kelly
cf780b3b73 fixed persist issue, working much better 2017-02-10 11:42:56 -07:00
David Kelly
8d666854c7 working it seems
But, AABox for zones isn't very helpful (box is _small).  Time to use
the shape of the zone.
2017-02-09 15:39:38 -07:00
David Kelly
ff7c9d3546 Working like before
Single entity script running properly.  Now, need to add the zone
filters and execute them.
2017-02-08 15:36:16 -07:00
howard-stearns
12720cac32 Pass filter type as an int, with constants to compare against. 2017-02-06 13:36:45 -08:00
howard-stearns
dacaa3df1d Send new entity physics packet from physics simulation, accept in server,
and make it go through filter (when supplied) regardless of lock rights.
2017-02-06 11:12:18 -08:00
howard-stearns
4499a92a82 filter gets isAdd argument 2017-02-02 13:07:08 -08:00
David Kelly
f25bbc9649 Merge pull request #9574 from howard-stearns/delete-failed-entity-adds
cleanly log failed entity adds, and tell the client to delete his copy
2017-02-01 10:12:17 -07:00
howard-stearns
e42853a96c cleanly log failed entity adds, and tell the client to delete his copy 2017-01-31 16:05:38 -08:00
Stephen Birarda
d4a161041e drop empty parts when splitting script whitelist 2017-01-31 15:32:47 -08:00
Brad Hefta-Gaub
619bcdeed8 Merge pull request #9553 from huffman/fix/polyvox-import
Fix importing of PolyVox entities
2017-01-31 08:42:28 -08:00
Ryan Huffman
f553656e36 Fix importing of PolyVox entities
PolyVox entities reference neighboring PolyVox entities in their entity
properties so that they can be stitched together. When importing, a new ID is
generated for each entity. When importing PolyVox entities, the
neighboring entity IDs were not updated to reflect the newly generated
IDs. This commit fixes that.
2017-01-30 13:33:42 -08:00
howard-stearns
93414d802d fetch entity filter script asynchronously (but reject edits while waiting) 2017-01-30 11:06:36 -08:00
Howard Stearns
f36b968860 Merge branch 'edit-entity-filter' into entity-filter-resource 2017-01-25 19:39:12 -08:00
Howard Stearns
a1afbe7d5e Merge branch 'master' of https://github.com/highfidelity/hifi into edit-entity-filter 2017-01-25 19:16:29 -08:00
howard-stearns
4437063a3a remove logging, now that we have error logging 2017-01-25 17:04:09 -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
howard-stearns
b62f3e550a error check/log on execution, too 2017-01-25 16:23:07 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
howard-stearns
8eff3b1e83 restructure initialization so that server can do server-like things to get
the filter program from file
2017-01-24 16:14:41 -08:00
howard-stearns
da914f0a4f bypass entity-server edit filter if you have lock/unlock rights 2017-01-24 11:59:31 -08:00
Stephen Birarda
9229a07f6a avoid failing scheme check 2017-01-23 16:46:59 -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
db398b7850 check URL host for script whitelist, not startsWith 2017-01-23 13:36:02 -08:00
howard-stearns
7b986dcac6 works, but removes an optimization we'd like to keep 2017-01-20 17:03:52 -08:00
Atlante45
8740481579 Remove unnecessary const from const bool 2017-01-20 13:54:49 -08:00
howard-stearns
90c9c5b137 logging change 2017-01-18 14:32:05 -08:00
howard-stearns
957b1d9ae4 pass just what is given to filter, more or less 2017-01-18 13:22:54 -08:00
howard-stearns
2e9b26057e refactor bumpTimestamp, and fix implementation of wasChanged 2017-01-18 10:27:32 -08:00
Atlante45
20b7bb0c54 EntityScriptServer tracks server scripts 2017-01-17 16:41:56 -08:00
howard-stearns
09a57efaf3 checkpoint 2017-01-16 12:47:26 -08:00
howard-stearns
121d79ef36 getting there, but not yet complete 2017-01-13 16:59:51 -08:00
howard-stearns
f6446c6806 minimum entity edit filter 2017-01-13 13:18:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Seth Alves
6fe35ac0da use smart pointers to avoid leaking EntityTreeElementExtraEncodeData 2016-12-12 16:04:41 -08:00
Dante Ruiz
66ff81f450 Another function name change 2016-11-16 22:32:15 +00:00
Dante Ruiz
9c4ae9df5a function name change 2016-11-16 22:09:22 +00:00
Dante Ruiz
ff7c11d48c Fixed avatar parent delete issue 2016-11-16 13:03:34 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Brad Hefta-Gaub
8758e4a9ba add support for whitelist entity scripts 2016-11-09 19:17:24 -08:00
Seth Alves
fe09a1a57c make sure interface accepts server adjustment to lifetime, even for imported entities 2016-10-13 16:45:37 -07:00