David Kelly
08d30608c7
remove debug logging
2017-02-14 14:28:20 -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
David Kelly
8a7a3926c5
rest of issues w/linux and mac
2017-02-10 15:57:27 -07:00
David Kelly
9891d7b7d2
build issue on linux/mac
2017-02-10 15:24:58 -07:00
David Kelly
2996298e79
First bit of cleanup
...
consolidate to one map, some minor other cleaning. More coming.
2017-02-10 14:57:09 -07:00
David Kelly
1c1b0d1332
oops, debugging left in
2017-02-10 13:16:52 -07:00
David Kelly
7ec27cab13
Use EntityItem.contains
...
Cuz it works - seemed like it was broken but nope. Also, trim off the
filters for zones that no longer are in the tree.
2017-02-10 12:47:48 -07:00
David Kelly
cf780b3b73
fixed persist issue, working much better
2017-02-10 11:42:56 -07:00
David Kelly
5ca80803c0
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-09 20:01:43 -07:00
David Kelly
415d71956f
minor logging crap
2017-02-09 19:59:55 -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
Atlante45
3a30de79aa
CR
2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
74f10a1e7f
Merge pull request #9603 from huffman/feat/trace-thread-script
...
Add thread names and scripts to chrome traces
2017-02-09 13:00:05 -08: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
David Kelly
c08adc9faa
and the new filter class
2017-02-08 10:51:28 -07:00
David Kelly
4821180dd3
Just add a pointer to the filter class
...
but do nothing with it
2017-02-08 10:48:26 -07:00
David Kelly
61e558e568
Entity Edit Filters for zones
...
Part 1 - just put them in the zones entities. Next I'll hook them
up and actually filter...
2017-02-08 09:53:25 -07:00
Chris Collins
194fd925cf
Merge pull request #9609 from sethalves/tablet-ui-fix-equipping
...
don't send AVATAR_SELF_ID over wire
2017-02-06 16:56:11 -08:00
Seth Alves
aaefc550f0
avoid bootstrapping self with something that has someone else as simulation owner
2017-02-06 14:16:47 -08:00
howard-stearns
12720cac32
Pass filter type as an int, with constants to compare against.
2017-02-06 13:36:45 -08:00
Seth Alves
2ea07390c8
when the parentID is changed by a network update, set physics flags
2017-02-06 12:10:26 -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
8b44e83d9e
Add new EntityPhysics packet type.
2017-02-06 11:11:18 -08:00
Seth Alves
81bf5ee655
another AVATAR_SELF_ID adjustment
2017-02-03 16:47:03 -08:00
Seth Alves
37de4aefa6
don't send AVATAR_SELF_ID over wire
2017-02-03 14:05:23 -08:00
Ryan Huffman
aba441ee14
Fix compilation issues
2017-02-03 10:11:51 -08:00
Ryan Huffman
1ddafa3cee
Merge pull request #9584 from birarda/bug/freeze-dont-move
...
don't auto-bid for sim ownership on entity creation in ESI
2017-02-03 10:08:48 -08:00
Ryan Huffman
55df6f8f76
Add tracing to ScriptEngine and EntitiesScriptingInterface
2017-02-03 09:45:33 -08:00
Anthony J. Thibault
6bef9e888b
Merge branch 'master' into bug-fix/tablet-ui-no-domain
2017-02-02 17:21:20 -08:00
howard-stearns
4499a92a82
filter gets isAdd argument
2017-02-02 13:07:08 -08:00
Stephen Birarda
823d74d2d4
don't auto-bid for sim ownership on entity creation in ESI
2017-02-01 16:53:37 -08:00
howard-stearns
6f4441028d
Merge branch 'master' of https://github.com/highfidelity/hifi into accept-forced-physics-values
2017-02-01 09:41: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
Brad Hefta-Gaub
0c7a181d33
Merge pull request #9573 from birarda/bug/whitelist-starts-with
...
drop empty parts when splitting script whitelist
2017-02-01 07:38:02 -08: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
Thijs Wenker
174a7ad5bd
Optimizations and style fixes from code review
2017-01-31 22:54:58 +01:00
Anthony J. Thibault
e2e19884bb
Tablet should work even when not connected to any domain.
...
handControllerGrab.js and WebTablet.js now parents objects to the
AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which
is unavailable when not connected to any domain.
I removed several early returns handControllerGrab.js that prevented
grabbing from working if MyAvatar.sessionUUID was invalid.
There were places in the EntityItem.cpp and EntityScriptingInterface.cpp
C++ that would log an error if parentID was set to AVATAR_SELF_ID.
This was to prevent AVATAR_SELF_ID from ever going over the network.
Instead, we now prevent this by replacing all outgoing references of
AVATAR_SELF_ID with the sessionID of the current node.
2017-01-31 13:52:12 -08:00
howard-stearns
18f8c2b866
comment
2017-01-31 13:31:33 -08:00
howard-stearns
8d8b338c66
dry up custom setters, per code review
2017-01-31 12:07:48 -08:00
Thijs Wenker
3608998877
use dedicated bool rather than unreliable dirtyFlags to determine if the entityItem had ever bid for simulation ownership
2017-01-31 21:01:03 +01:00
Thijs Wenker
e445af74aa
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-01-31 20:39:39 +01:00
howard-stearns
1ddc804e10
Merge branch 'master' of https://github.com/highfidelity/hifi into accept-forced-physics-values
2017-01-31 10:58:49 -08:00
Seth Alves
7c2957cfa7
merge from upstream
2017-01-31 08:57:36 -08:00
Brad Hefta-Gaub
5287c94786
Merge pull request #9555 from huffman/fix/entity-is-child-of-crash
...
Fix Entities.isChildOfParent crashing if given unknown ID
2017-01-31 08:42:45 -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
Seth Alves
39d195fce2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-31 05:02:07 -08:00
Thijs Wenker
c3f9663ab0
- Fix for simulation owned entities moving to 0,0,0 after cache reload
...
- Fix for simulation priority, use SCRIPT_GRAB_SIMULATION_PRIORITY in EntityItem::grabSimulationOwnership()
2017-01-31 01:25:59 +01:00
howard-stearns
fe8fe816f4
accept forced physics results from entity server (e.g., when filtered)
2017-01-30 16:14:40 -08:00
