Brad Davis
54200c03a7
Fixing deadlock
2017-04-04 13:53:49 -07:00
Brad Davis
fe84232ab4
More work on thread safety
2017-04-04 10:50:56 -07:00
Brad Davis
03c6275268
more thread safety
2017-04-04 10:50:54 -07:00
Brad Davis
172fab6789
Thread safety for property getter/setters on entities
2017-04-04 10:50:53 -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
348674a267
Merge pull request #10034 from davidkelly/dk/avatarEntityIssue
...
bad serialization of Avatar Entity parentID
2017-03-30 10:12:19 -07:00
humbletim
d02fd06305
mark joint translations dirty
2017-03-30 07:45:18 -04:00
David Kelly
4b40633104
oops damn space
2017-03-28 11:22:18 -07:00
David Kelly
e119c38748
bad serialization of parentID
2017-03-28 09:26:40 -07:00
Seth Alves
651d87dc2a
move Qt-related stuff out of model and into model-networking
2017-03-28 07:53:25 -07:00
Seth Alves
8da91695df
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-27 20:15:54 -07:00
Seth Alves
5ed0ff729b
cleanups
2017-03-27 07:25:40 -07:00
Stephen Birarda
53e6a77fcc
cleanup EncodeBitstreamParams to use nodeData when possible
2017-03-24 13:41:36 -07:00
ZappoMan
246f377a07
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-23 10:40:37 -07:00
Seth Alves
ce9bb439b3
change Model api in anticipation of more than just PolyVox being able to give meshes to javascript
2017-03-23 09:55:30 -07:00
Seth Alves
048da6e6cb
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-21 09:52:15 -07:00
Brad Hefta-Gaub
ac309df3d1
Merge pull request #9946 from sethalves/model-scripting-1
...
Model scripting
2017-03-21 09:26:32 -07:00
Atlante45
73dd2abdaf
Delete old sitting points code
2017-03-20 17:29:44 -07:00
Seth Alves
d5ea69d81d
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-20 14:06:00 -07:00
Brad Hefta-Gaub
bc5d7d8698
Merge pull request #9851 from AndrewMeadows/simulation-ownership-2
...
zero velocity of deactivated dynamic entities
2017-03-20 10:20:11 -07:00
Seth Alves
67507f1f05
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-20 09:37:53 -07:00
Seth Alves
98cae8d152
added EntityScriptingInterface::getEntityLocalTransform. try harder to make sure polyvox mesh is ready before giving it to javascript
2017-03-20 09:37:46 -07:00
Chris Collins
308c134119
Merge pull request #9686 from humbletim/21114-part3
...
CR 21114 -- Implement modules/require support into hifi
2017-03-20 06:22:35 -07:00
Seth Alves
b876d22e46
fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels
2017-03-18 22:36:24 -07:00
Seth Alves
b3603ce8b3
Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now
2017-03-17 16:52:56 -07:00
Seth Alves
bbad6a0eb7
mesh-append works, mesh-transform doesn't?
2017-03-16 17:26:07 -07:00
humbletim
52a571558c
* changes per CR feedback
...
* revert JSON content-type workaround
* add specific error check / advice for unanchored module ids
* update unit tests
2017-03-16 01:23:23 -04:00
Seth Alves
1eedce9825
unmangle merge
2017-03-13 18:18:26 -07:00
Seth Alves
e8a9ff867d
merge from upstream
2017-03-13 17:57:01 -07:00
humbletim
db73c80ba1
remove unused meta property adapter
2017-03-13 19:16:00 -04:00
Andrew Meadows
a16760278e
remove debug code
2017-03-09 17:58:53 -08:00
Andrew Meadows
8ddcae2a15
restore transform of deactivated entities
2017-03-09 17:26:53 -08:00
Andrew Meadows
d4abdcb6c8
comments, namechange, and temporary debug code
2017-03-09 17:26:53 -08:00
humbletim
5e5bba5aad
Separate EntityPropertyMetadataRequest for easier documentation and testing
2017-03-07 16:41:19 -05:00
humbletim
40ba8185a0
* Update per 21114-part2 changes.
...
* Add explicit thread safety guards.
* Add Entities.queryPropertyMetdata for unit testing Entity script module support.
* Cleanup / commenting pass.
2017-03-07 16:36:07 -05:00
Andrew Meadows
10b3e7fc67
sphere shapeType for models means 'sphere'
2017-03-06 15:14:51 -08:00
ZappoMan
9e71801ae1
remove properties from RayToEntityIntersectionResult
2017-03-01 18:21:04 -08:00
Seth Alves
3b669089e4
Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti
2017-02-27 20:56:16 -08:00
Seth Alves
88c850afa2
voxel-paint paints with capsules rather than spheres
2017-02-26 12:56:17 -08:00
Seth Alves
0c84ddc503
fix indentation
2017-02-25 11:33:10 -08:00
Seth Alves
eedc5c1647
don't allow tablet to get stuck to a hand when passing it back and forth between hands
2017-02-24 12:10:52 -08:00
Stephen Birarda
9d336a84ab
force a full scene send for new ancestors/descendants
2017-02-16 16:46:09 -08:00
Stephen Birarda
a3883a746c
add the basic structure for inclusion of ancestors/descendants in ESS queries
2017-02-16 16:46:09 -08:00
David Kelly
f0e87360c1
don't capture a temporary by reference. Ugh
2017-02-15 12:37:00 -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
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
Brad Hefta-Gaub
f433347362
Merge pull request #9652 from sethalves/avatar-as-child-fixes
...
some fixes for when an avatar is a child of something else
2017-02-14 09:07:47 -08:00
Seth Alves
4393bc3c2e
Merge pull request #9656 from humbletim/21114-part1
...
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
2017-02-14 06:49:05 -08:00
Seth Alves
ba025d44e0
Merge pull request #9642 from AndrewMeadows/beware-humbletim
...
fix performance problem for invalid "avatarEntityData"
2017-02-14 06:33:48 -08:00
Seth Alves
2e2a3c60d0
Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes
2017-02-14 06:26:20 -08:00
Seth Alves
2e245e9cba
Merge pull request #9667 from huffman/fix/entity-scripts-not-loading
...
Fix entity scripts not loading in certain cases
2017-02-14 06:20:29 -08:00
howard-stearns
487adc7f18
whitespace
2017-02-13 16:35:03 -08:00
Ryan Huffman
d0cddd01d7
Fix entity scripts not loading in certain cases
...
This fixes a bug where an entity script would be loaded but immediately
unloaded. This happens when the script property of the entity is changed shortly
after it is added.
Flow of events:
Entity added
=> Entity added event emitted
Entity edited
=> Script changing event emitted
<= Entity added event received
Script loaded
<= Script changing event received
Script stopped
Tries to load script again, but because the script hasn't changed
since it was last loaded, it is not loaded again.
The change here is to modify the behavior when receiving a script
changing event. Instead of always unloading and then conditionally
loading the script, it will either do both (unload + load) or neither.
2017-02-13 14:59:31 -08:00
howard-stearns
6241889e38
lastEditedBy is set by add/edit, but not by physics packets
2017-02-13 13:47:20 -08:00
Seth Alves
bc5f563f57
make _parentID and _parentJointIndex private to avoid accidental direct access
2017-02-12 11:37:29 -08:00
humbletim
831bf93500
* refactor ScriptCache per FIXMEs
...
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
2017-02-11 04:47:31 -05: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
Andrew Meadows
0e504e9ec6
make methods private: avoid sanity check logic
2017-02-10 13:14:20 -08: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
Seth Alves
9881dd261a
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-02-03 12:57:14 -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
Seth Alves
24510ee3fe
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-02-01 18:42:56 -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
Seth Alves
adaee0e62c
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-31 21:27:00 -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
5131d1edf2
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-31 09:22:16 -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
Seth Alves
1ea11572a7
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-30 19:54:56 -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
d158f6afd1
hook up a way to get mesh out of polyvox
2017-01-28 20:42:14 -08:00
Seth Alves
541692c5ca
start on scripting interface to allow saving polyvox meshes to obj files
2017-01-28 15:38:18 -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
