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
Ryan Huffman
e58c9326a0
Fix Entities.isChildOfParent crashing if given unknown ID
...
If an entity was not in the local tree a null deref crash would occur.
This commit makes sure the entity pointer is checked for null before it is used.
2017-01-30 13:48:33 -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
Seth Alves
fa61bbe2a6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 18:21:39 -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
Seth Alves
c317ba8054
merge from upstream
2017-01-25 15:57:53 -08:00
Clément Brisset
3f34a9e832
Merge pull request #40 from birarda/entity-script-server
...
hack to accept possibly newer server scripts
2017-01-25 13:21:45 -08:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
Stephen Birarda
304618f51d
cleanup comment and scoping for server script URL changes
2017-01-25 12:39:41 -08:00
Stephen Birarda
f1b4f79ad9
a simple hack to accept newer server scripts
2017-01-25 12:39:41 -08:00
Stephen Birarda
586c3512a7
remove useless additional includeThisEntity sets
2017-01-24 17:35:45 -08:00
Stephen Birarda
67a3d97f81
cleanup includeThisEntity check
2017-01-24 16:41:20 -08:00
Stephen Birarda
543d0ce77e
add a comment about usesFrustum check in EntityTreeElement
2017-01-24 16:36:44 -08:00
Stephen Birarda
33378ede5c
force full scene send if json parameters changed
2017-01-24 16:34:57 -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
Stephen Birarda
5a3f99a504
Merge pull request #9479 from birarda/bug/whitelist-starts-with
...
use host check for entity script whitelist instead of startsWith
2017-01-24 15:21:25 -08:00
howard-stearns
c25072c1db
Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter
2017-01-24 12:15:39 -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
howard-stearns
ada685a376
cr changes
2017-01-23 15:31:55 -08:00
Stephen Birarda
a8118e83ff
cleanup debug for safe web entity URLs
2017-01-23 13:54:43 -08:00
howard-stearns
24a9cf1f23
Merge branch 'edit-entity-filter' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter
2017-01-23 13:52:39 -08:00
Seth Alves
c958314918
merge from upstream
2017-01-23 13:52:01 -08:00
Stephen Birarda
db398b7850
check URL host for script whitelist, not startsWith
2017-01-23 13:36:02 -08:00
howard-stearns
0a4634446d
typo
2017-01-23 13:09:28 -08:00
Stephen Birarda
f02832ca71
output the actual value set in WebEntityItem
2017-01-23 11:50:05 -08:00
Stephen Birarda
d7651e9838
move value sanitizing to WebEntityItem
2017-01-23 11:45:21 -08:00
howard-stearns
7b986dcac6
works, but removes an optimization we'd like to keep
2017-01-20 17:03:52 -08:00
Clément Brisset
95f07f3917
Merge pull request #32 from huffman/feat/entity-server-script-property
...
PR FIxes
2017-01-20 15:39:22 -08:00
Ryan Huffman
4e358f76fe
Remove trailing whitespace from EntityItemProperties.cpp
2017-01-20 14:36:45 -08:00
Ryan Huffman
ee8898568d
Remove const from getScript & getServerScripts
2017-01-20 14:36:01 -08:00
Stephen Birarda
ab8a0a7d39
Merge pull request #30 from Atlante45/ess-pr
...
Remove unnecessary const from `const bool`
2017-01-20 14:22:11 -08:00
Stephen Birarda
5ef0bd7573
remove weird extra whitespace
2017-01-20 14:10:42 -08:00
Stephen Birarda
1e25b5012f
use a static_cast to get EntityNodeData
2017-01-20 14:05:55 -08:00
Stephen Birarda
67951517b4
don't grab the JSON filters for each entity checked
2017-01-20 13:59:48 -08:00
Atlante45
8740481579
Remove unnecessary const from const bool
2017-01-20 13:54:49 -08:00
Stephen Birarda
c5140ac695
use ENTITY_ITEM_DEFAULT_SERVER_SCRIPTS in EntityItemProperties
2017-01-19 16:42:14 -08:00
Stephen Birarda
0cb14ab25c
whitespace fix in EntityTreeElement
2017-01-19 16:42:14 -08:00
Stephen Birarda
a40c25ddbf
fix repeated send of matching entities
2017-01-19 16:42:14 -08:00
Atlante45
20a82df9a0
Fix scripts not reloading in certain edge cases
2017-01-19 15:48:44 -08:00
Ryan Huffman
465f5c6789
Add getters to ScriptStatusRequest
2017-01-19 15:09:16 -08:00
Ryan Huffman
d45f5ade97
Update Entities.getServerScriptStatus to return more information
2017-01-19 13:27:44 -08:00
Clément Brisset
89d1242925
Merge pull request #10 from huffman/feat/entity-server-script-property
...
Entity script status + reload
2017-01-19 11:19:40 -08:00
Stephen Birarda
33cde412b1
make getJSONParameters thread-safe
2017-01-18 17:49:54 -08:00
Stephen Birarda
5fbdc94c66
pass usesFrustum down to EntityTreeElement
2017-01-18 17:49:54 -08:00
Stephen Birarda
ed41412d95
fix for unpack of OctreeQuery
2017-01-18 17:49:54 -08:00
Atlante45
cbc69fbf9e
Fix script preload functions
2017-01-18 16:42:25 -08:00
Atlante45
e94cccf08d
Fix server script preload funcitons
2017-01-18 16:12:41 -08:00
Stephen Birarda
112b119f17
send entities that just stopped matching filter
2017-01-18 14:58:36 -08:00
Stephen Birarda
5d1b53c600
move map population with properties back
2017-01-18 14:58:36 -08:00
Stephen Birarda
b08bfe93f4
change lastViewFrustumSent to lastQuerySent
2017-01-18 14:58:36 -08:00
Stephen Birarda
a1ad496772
handle match on non-default serverScripts property during entity send
2017-01-18 14:58:36 -08:00
Stephen Birarda
3556379034
leverage JSON filter changes to OctreeQuery in EntityServer
2017-01-18 14:58:36 -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
00e53c8ea6
more tractable copy semantics
2017-01-18 13:21:28 -08:00
Ryan Huffman
d85f27e992
Add Entities.getServerScriptStatus
2017-01-18 11:15:59 -08:00
Ryan Huffman
8137c59ef7
Add support for sending requests to entity script server
2017-01-18 11:15:29 -08:00
howard-stearns
60eb6dca9d
remove debug dump that was printing to screeen during << operator
2017-01-18 10:29:11 -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
Ryan Huffman
812aaee48c
Add Entities.reloadServerScripts
2017-01-17 14:47:57 -08:00
Ryan Huffman
b0c2a9d614
Add serverScripts entity property
2017-01-17 14:47:06 -08:00
howard-stearns
09a57efaf3
checkpoint
2017-01-16 12:47:26 -08:00
Seth Alves
3b4f5e3023
don't include overlays in results from EntityScriptingInterface::getChildrenIDsOfJoint
2017-01-15 11:27:29 -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
Seth Alves
a47aaea37a
don't bootstrap self with an avatar hold action
2017-01-12 10:12:45 -08:00
Seth Alves
4a29cce584
adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled
2017-01-10 06:17:40 -08:00
Seth Alves
35577f49d0
change the test for when MY_AVATAR collisions are short-circuited
2017-01-09 17:00:39 -08:00
Seth Alves
ad45bbf5ba
set DIRTY_COLLISION_GROUP flag when parentID changes
2017-01-09 16:45:54 -08:00
Seth Alves
45a26d599f
if something is a child of the local avatar, never let it collide with MY_AVATAR
2017-01-09 16:40:28 -08:00
Seth Alves
01ff3f14b6
re-evaluate an entities in-bullet status when parentID changes
2017-01-09 15:28:05 -08:00
Anthony J. Thibault
00980366d6
Merge branch 'master' into tablet-ui
2017-01-03 09:45:23 -08:00
Seth Alves
dc996bee95
merge from upstream
2016-12-20 08:06:01 -08:00
Brad Hefta-Gaub
c65471e880
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/script-engine/src/FileScriptingInterface.cpp
2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
David Rowe
9459b967be
Merge branch 'master' into 21089
2016-12-16 20:02:43 +13:00
Anthony J. Thibault
8b99fa90e8
Merge branch 'master' into tablet-ui
2016-12-15 13:28:23 -08:00
David Rowe
be00730073
Add canWriteAssets method and signal to Entities API
2016-12-14 14:27:55 +13:00
Seth Alves
d97be52542
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2016-12-12 16:24:17 -08:00
