Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 07:36:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 25 branches 0 tags 1.1 GiB
Commit graph

2984 commits

Author SHA1 Message Date
Chris Collins
72bb52c7ed Merge pull request #11046 from rickdaniels/21448 
Address bug #21448 "Correctly Size Bounding Boxes for Polylines"
 2017-08-21 15:32:22 -07:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03:00
Artur Gomes
83cdd1739d Add hue, saturation and brightness dynamic brushes. 
Add continuous drawing mode.
Add new brushes.
Remove some brushes.
Fix animation play distance for when painting in Desktop mode.
Fix Hue animation not starting from the chosen color (would always start
from red).
Fix multiple color polyline.
 2017-08-16 18:35:15 +01:00
Artur Gomes
678dd5fbae Do not test! 
Add missing information to property.
 2017-08-16 18:33:43 +01:00
Artur Gomes
03b70ed492 Do not test! 
Add color qvector to polyline entity to allow for multiple colors
through the line.
Add some new icons to the tabs of the app.
 2017-08-16 18:32:17 +01:00
Delanir
ed5515a2d4 Add new Property to polyline to enable different uv modes. 2 2017-08-16 18:25:00 +01:00
SamGondelman
a641fb7a7f rename qvector findRayIntersection to avoid script conflicts 2017-08-15 18:03:52 -07:00
rick@ghostpunch.com
8d248f5ccd Remove the attempt to determine the maximum width of a PolyLineEntity's strokes 
using the _strokeWidths[] array, as the values don't seem to correspond with
reality. Use a flat 0.075M value for the maxium half of a stroke width instead.
 2017-08-14 15:59:21 -04:00
rick@ghostpunch.com
87139f5d82 Remove debug print 2017-08-09 04:46:42 -04:00
rick@ghostpunch.com
cc69853ff1 Make requested style changes to code. 2017-08-09 04:37:47 -04:00
rick@ghostpunch.com
a730da5299 Account for PloyLine stroke width when calculating the dimensions 
of the PolyLilne's bounding box.
 2017-08-09 04:23:39 -04:00
SamGondelman
3645bf04b6 possibly fix most annoying crash 2017-08-08 18:10:53 -07:00
Menithal
982d4a451f Updated Protocol to add allowTranslation 
There still is a bug for the value no actually updating
 2017-08-08 23:47:37 +03:00
rick@ghostpunch.com
c94d9b3810 Merge remote-tracking branch 'upstream/master' into 21448 2017-08-07 19:23:57 -04:00
Howard Stearns
71ce5a6494 Merge pull request #11016 from highfidelity/context-overlays 
Context Overlays
 2017-08-03 16:28:14 -07:00
Andrew Meadows
e465186511 Merge pull request #11048 from 1P-Cusack/21389 
WL21389 PR1:  Representation of collision shapes need updating (details below).
 2017-08-03 09:04:31 -07:00
David Kelly
6ae516c46a Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 15:45:34 -07:00
Dante Ruiz
c22e08f3e8 loacked script engine in EntityEditPacketSender 2017-08-01 19:58:23 +01:00
David Kelly
bd7c4b3b26 Merge remote-tracking branch 'upstream/master' into context-overlays 2017-07-31 13:14:53 -07:00
Brad Davis
861b33a845 Fix potential nullptr access in EntityTreeElement 2017-07-29 17:22:25 -07:00
LaShonda Hopper
cc4fbc97cd [WL21389] PR1 Update based on code review discussion & feedback (details below). 
* Removed some left overs from prior approach.
* Moved _collisionShapeType & getShapeType override from ShapeEntityItem to
  RenderableShapeEntityItem (see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r130154903)
* Switched _collisionShapeType default from SHAPE_TYPE_NONE to SHAPE_TYPE_ELLIPSOID
** see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r129982909

Note(s):
* Retested and the cylinder behaves as expected along with the Box & Sphere shapes
  save from the previously mentioned caveats in the PR notes (https://github.com/highfidelity/hifi/pull/11048)
* Confirmed that currently unsupported shapes (hedrons, polygons, & cone) fallback to
  ellipsoid behavior given default change.

Changes Committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/shared/src/ShapeInfo.cpp
 2017-07-28 15:59:17 -04:00
Brad Hefta-Gaub
d572510770 Merge pull request #11009 from AndrewMeadows/fix-QueryAACube 
update EntityItem bounding cube when on changed dimensions
 2017-07-27 18:21:06 -07:00
rick@ghostpunch.com
3e2dbe58ec Style guide corrections 2017-07-27 16:39:49 -04:00
Zach Fox
bd5f7b85d8 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_renderMOde 2017-07-26 14:11:28 -07:00
Zach Fox
1e80736718 Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-26 14:11:03 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
rick@ghostpunch.com
0c03b4ec53 Use fabsf() instead of abs() so Clang doesn't default to int abs() 2017-07-25 16:37:40 -04:00
LaShonda Hopper
ef1e426273 [WL21389] Some code and todo cleanup in prep for PR1. 
Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/shared/src/ShapeInfo.cpp
 2017-07-25 15:27:02 -04:00
Leander Hasty
d155c02640 [WL21389] wip and modifications based on comments 
https://github.com/highfidelity/hifi/pull/11024#pullrequestreview-51611518

Cleans up tabs, moves new functionality out of ShapeFactory directly to
RenderableShapeEntityItem's computeShapeInfo override, begins to break down
where we will need pointlists.

Still need to determine how rotation is handled for pointlists, and check
for axis alignment on cylinders before deciding on a shape.

Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/physics/src/ShapeFactory.h
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/entitySpawner.js
 2017-07-25 15:20:35 -04:00
rick@ghostpunch.com
3189cb90e4 Address bug #21448 "Correctly Size Bounding Boxes for Polylines" 
Changed PloyLineEntity code to calculate the scale vector
(which PolyLineEntity uses as the bouding box) and the registration point
(the offset of the bounding box from the first point in the Polyline) based
on the points in the PolyLineEntity so the bounding box is just big enough
to contain all the points in the line.
 2017-07-25 15:20:11 -04:00
LaShonda Hopper
75403124b6 [WL21389] Addresses physics library dependency and has some other fixes (details below). 
* Addresses physics library dependency by moving computeShapeInfo override from
ShapeEntityItem (which is within Entities Library) to RenderableShapeEntityItem
(which is in Entities-Renderer Library).
** Entities-Renderer library already links against the physic library.
** Per discussion with Andrew Meadows: In order to ShapeEntityItem to be
utilized the library dependency between the Entity and Physics library
would need to be resolved to avoid the cyclical reliance which isn't in
the scope of this ticket.
* Updates shapeSpawner test script from the default clone of basicEntityTest\entitySpawner.js
** Objects now have a finite lifetime
** Script now cleans up the objects created when the script ends
** Also moved some adjustable properties out into var aliases at the top of the
file for easier/less error prone tweaking. Should probably add one for the shapeType.
* Fixes some issues with validateShapeType helper function
* Removed naive attempt at including physics library within entities library.
* Transferred some todos from notes
* Fixed some formatting

NOTE(s):
  This compiles and runs.  Cylinder is spawned and treated as CYLINDER_Y.

TODO(s):
* Add tweakable var for shapeType within shapeSpawner.js
* Vet and verify other shapes.
* Add in edge case handling.
* Add in support for other shapes to ShapeInfo infrastructure.

Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/shapeSpawner.js
 2017-07-25 14:43:39 -04:00
LaShonda Hopper
5bc38bd7f0 [WL21389] Collision Shapes need to be updated (details below). 
Revised approach involves creating a helper function within ShapeFactory to aid
in devising the ShapeType to be used by an ShapeEntityItem for collision.  The
ShapeFactory is currently doing this for creating the actual Bullet Library
collision shapes.

ShapeEntityItem overrides its virtually inherited computeShapeInfo which
in turn calls the new ShapeFactory helper function.

ShapeEntityItem has a new memvar _collisionShapeType to cache its actual
ShapeType used by the physics system.  This memvar is returned via the getShapeType
accessor which is expected to return an object's ShapeType.

Note(s):
    This is similar to the original approach save translation between entity::Shape and ShapeType
    isn't tied to the EntityItemProperties shapeTypeNames or shapeType. This approach more
    directly solves the issue of getting the actual ShapeType used by the time it's needed
    to determine the bullet collision object type created when initializing the physic information.

    Translation of the ShapeEntityItem's entity::Shape to its ShapeType is handled by
    ShapeFactory which handles creating the bullet collision objects when setting up
    physics on the ShapeEntityItems.

Known Issue(s):
    This doesn't compile.  It appears that the Entity Library needs to know about
    the Physics Library.  The naive attempt at providing that link failed to resolve
    all compilation issues.

    Current Error:
    C1083: Cannot open include file: btBulletDynamicsCommon.h:
    No such file or directory (C:\projects\cusack\libraries\entities\src\ShapeEntityItem.cpp)
       C:\projects\cusack\libraries\physics\src\ShapeFactory.h	15	1	entities

	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/physics/src/ShapeFactory.h
	modified:   libraries/physics/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/entitySpawner.js
	new file:   scripts/developer/tests/basicEntityTest/shapeSpawner.js
 2017-07-25 14:43:07 -04:00
Ryan Huffman
6817cf9db4 Fix entity properties sometimes being resent 
When writing entity properties to a packet, we start off with a list of
requested properties (`requestedProperties`) and keep track of which properties
didn't fit (`propertiesDidntFit`) the packet, which is intialized to
requestedProperties. As we pack the properties, we remove them from
propertiesDidntFit if they didn't need to be written or were able to be
packed. At the end we store propertiesDidntFit, and use it in the future
as our requestedProperties when we try to pack more data into a packet.

The bug: because of the order in which propertiesDidntFit is
initialized, it ended up always being the list of all properties for
that entity. This typically wasn't an issue because we usually go
through and try to append all of the properties, and if we don't need to
append them (because they aren't in requestedProperties)
we remove them from our propertiesDidntFit list. When we
don't have enough remaining space in the current packet for even the
entity header, which is fairly small, we don't bother trying to append
any of the properties. When this happens, propertiesDidntFit contains
the full list of properties, which we save for the next pass through the
entity, and use as our requestedProperties, causing us to resend entity
data again. In the worst case we never end up sending all of the
entity's data.
 2017-07-25 10:59:03 -07:00
Zach Fox
40038ce54b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-25 09:33:07 -07:00
Andrew Meadows
d86ae98211 always update bounding box on script edit 2017-07-21 10:57:09 -07:00
Andrew Meadows
17323ba42a always update the bounding box 2017-07-21 10:25:03 -07:00
Andrew Meadows
e1eb223616 cleanup bad indentation, cruft, and constants 2017-07-20 16:12:33 -07:00
Andrew Meadows
a8dac0cb79 don't send constant updates for grabbed objects 2017-07-20 15:45:50 -07:00
Andrew Meadows
fcd3126b85 undo accidental name change 2017-07-20 08:32:48 -07:00
Andrew Meadows
54426a5b81 update queryAACube on server when it probably changed 2017-07-20 08:21:10 -07:00
Andrew Meadows
d88d7dda2b changed dimensions flag entity for new queryAACube 2017-07-20 08:19:59 -07:00
Seth Alves
be48268be8 getMeshes handles registration point 2017-07-19 15:02:40 -07:00
Seth Alves
750b7192af trying to get the resulting model to line up with the originals 2017-07-19 13:58:03 -07:00
Andrew Meadows
9ca3ec4313 faster computation of entity bounding cube 2017-07-19 13:35:34 -07:00
Andrew Meadows
d9c6126000 more descriptive names for methods that do stuff 
also: changes to dimensions will trigger update to QueryAACube
 2017-07-19 13:33:32 -07:00
Zach Fox
1d26a268c1 Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay 2017-07-19 09:53:51 -07:00
Dante Ruiz
7fe47e4e2f Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity 2017-07-18 16:51:41 +01:00
Dante Ruiz
d504000604 made requested changes 2017-07-18 16:51:21 +01:00
Brad Hefta-Gaub
d94365cc44 Merge pull request #10979 from zfox23/hoverOverlay_lasers 
Create/Destroy Hover Overlays using hand controller lasers
 2017-07-18 08:44:48 -07:00
Andrew Meadows
5f4df0da2b Merge pull request #10847 from AndrewMeadows/entitymap 
faster EntityItem lookup by EntityItemID
 2017-07-18 08:04:37 -07:00
Zach Fox
96f52a9812 First pass at getting overlays to show up on hover 2017-07-17 17:05:16 -07:00
Dante Ruiz
21d760a533 make sure to lock data 2017-07-17 22:11:05 +01:00
Dante Ruiz
282b364fad Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity 2017-07-17 21:28:17 +01:00
Dante Ruiz
f6208a394c delete avatar entity when switching domains 2017-07-17 21:27:55 +01:00
Zach Fox
974dff36b0 Make hover overlays work for hand controller lasers 2017-07-17 13:16:53 -07:00
Zach Fox
19b42b0180 CR feedback 2017-07-17 13:15:23 -07:00
Zach Fox
4b9797c179 Comment explaining category debugs 2017-07-17 11:35:27 -07:00
Zach Fox
0a4ab23356 Remove unnecessary include 2017-07-17 11:32:47 -07:00
Zach Fox
147474e19a Logging category and filter 2017-07-17 11:17:59 -07:00
Zach Fox
19d5b8750a Cleanup logging 2017-07-17 09:51:00 -07:00
Zach Fox
e602d3610e Initial commit for HoverOverlayInterface 2017-07-14 17:26:53 -07:00
Andrew Meadows
c7ec82f98a use local copy of _element for thread safety 2017-07-13 13:30:57 -07:00
Andrew Meadows
8fc4d1f43e make UNEXPECTED logs warnings 2017-07-13 13:30:57 -07:00
Andrew Meadows
02bc9b9610 minimize the lock context 2017-07-13 13:30:57 -07:00
Andrew Meadows
f71ef554b7 use copy of _entityMap for debug logging 2017-07-13 13:30:57 -07:00
Andrew Meadows
fe79514b08 lock when changing EntityTree elements 2017-07-13 13:30:57 -07:00
Andrew Meadows
a0c6c49360 bump some "debug" messages to "warning" status 2017-07-13 13:30:57 -07:00
Andrew Meadows
39e5259e03 remove unused variable 2017-07-13 13:30:57 -07:00
Andrew Meadows
7ea1e7285f map EntityItemID to EntityItemPointer 2017-07-13 13:30:57 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Brad Davis
8130a91b8c Cleanup entity dependencies 2017-06-27 19:15:49 -07:00
Seth Alves
428dc81083 Merge pull request #10696 from AndrewMeadows/avoid-ownership-bid-race 
ignore remote update younger than recent ownership bid
 2017-06-20 10:42:54 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Andrew Meadows
8d19395b0a ignore remote update younger than recent bid 2017-06-14 16:04:52 -07:00
Andrew Meadows
29a05d7eb4 bid immediately when creating new entity 
also clear EntityMotionState::_numInactiveUpdates on new ownership
 2017-06-01 17:39:21 -07:00
Andrew Meadows
c56a6c44f8 minor formatting fix 2017-06-01 17:39:21 -07:00
samcake
6dbbd6c8d0 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-25 11:25:46 -07:00
Brad Hefta-Gaub
5af95c8fdf Merge pull request #10476 from sethalves/fix-imported-children-querybox 
fix up queryAACubes before sending imported entities to server
 2017-05-25 08:29:23 -07:00
samcake
e7b808cbc1 Merging with upstream 2017-05-23 12:12:31 -07:00
Stephen Birarda
cecbf43129 make server entity scripts respect script whitelist 2017-05-22 16:17:01 -07:00
Seth Alves
381de7a1e2 tabs 2017-05-21 08:42:53 -07:00
Seth Alves
c68efc2ed0 treat locked like other properties that affect simulation 2017-05-21 08:29:35 -07:00
Seth Alves
2512b39848 don't dirty motion-type if lock value isn't actually changing 2017-05-20 14:14:33 -07:00
Seth Alves
8f38ea8c6a force locked entities to be static in bullet 2017-05-20 11:54:42 -07:00
Seth Alves
a442181859 remove some redundancy 2017-05-20 08:51:44 -07:00
Seth Alves
5c94147f40 children collision hulls appear to be in the right place, now 2017-05-19 17:09:42 -07:00
Seth Alves
67f222cb3f be more careful about fixing up entities which arrived before their parents 2017-05-19 15:19:16 -07:00
Seth Alves
386c76545c be more careful about fixing up entities which arrived before their parents 2017-05-19 14:21:05 -07:00
Seth Alves
54dafa0f83 be more careful about fixing up entities which arrived before their parents 2017-05-19 14:14:00 -07:00
Seth Alves
5c93dbd20d be more careful about fixing up entities which arrived before their parents 2017-05-19 13:48:29 -07:00
Seth Alves
936d0e2d50 be more careful about fixing up entities which arrived before their parents 2017-05-19 12:13:43 -07:00
Seth Alves
735e4b7d05 trying to get child collision hulls to be in the right place after import 2017-05-19 10:59:59 -07:00
Seth Alves
7220fe0ad8 set more physics flags dirty when an entity parent is found 2017-05-19 10:40:24 -07:00
Seth Alves
77ce8a19cf call entityChanged after settings flags 2017-05-19 10:11:02 -07:00
Seth Alves
0c12baa258 call entityChanged after settings flags 2017-05-19 09:57:42 -07:00
Seth Alves
4007133423 collision hulls are still not always in the right place 2017-05-18 14:59:26 -07:00
Seth Alves
1b0eeb9c2c try harder to put things in place when their parent entities are discovered 2017-05-18 14:35:39 -07:00
Seth Alves
ef556fae9b when an entity's parent wasn't known and then becomes known, patch up the rigid-body and the render-item bounds 2017-05-18 14:13:33 -07:00
Seth Alves
ec02887ae6 attempt to get imported entities into the correct octree-element 2017-05-18 13:20:44 -07:00
Sam Gateau
d9ad45bf4a Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-18 09:37:04 -07:00
Seth Alves
b8567e0550 Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox 2017-05-18 09:10:58 -07:00
Seth Alves
b05cb4af3b fix nan 2017-05-17 20:51:34 -07:00
Seth Alves
0dc355cf86 Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox 2017-05-17 16:43:50 -07:00
Brad Hefta-Gaub
0d3f7058ec Merge pull request #10483 from AndrewMeadows/cap-velocities 
cap scripted linear and angular velocity inputs
 2017-05-17 16:15:42 -07:00
Seth Alves
8a88b30da7 Merge pull request #10468 from AndrewMeadows/cleanup-actions 
cleanup Actions and Constraints part-1
 2017-05-17 11:33:53 -07:00
Andrew Meadows
97ed719506 cap scripted linear and angular velocity inputs 2017-05-17 10:40:45 -07:00
Sam Gateau
0f250e693d Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-17 09:49:20 -07:00
Seth Alves
8ab676e627 Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox 2017-05-17 09:09:04 -07:00
Thijs Wenker
278bc610d4 Merge pull request #10466 from misslivirose/feat-find-entities-by-type 
Add function findEntitiesByType EntityScriptingInterface
 2017-05-17 15:06:04 +02:00
Seth Alves
d90843428d when importing entities, make a queryAACube that takes children into account 2017-05-16 16:54:16 -07:00
Seth Alves
1e4e2cc1b4 when a parent entity is deleted, delete its children in the local tree, rather than waiting for the server to tell us about it 2017-05-16 16:22:40 -07:00
Seth Alves
b9005a9e76 fix up queryAACubes before sending imported entities to server 2017-05-16 14:32:55 -07:00
Andrew Meadows
e6accb61b0 more purging of legacy 'Spring' action 2017-05-16 08:09:20 -07:00
Andrew Meadows
9e08dadaf4 Remove ObjectActionSpring 2017-05-15 22:11:42 -07:00
Liv Erickson
32fd905918 style pass 2017-05-15 20:49:30 -07:00
Liv Erickson
ae458dcbcf changing models to more generally reference entities in comment 2017-05-15 20:33:22 -07:00
Liv Erickson
a606f8a8d4 Fixing code style 2017-05-15 20:28:48 -07:00
Liv
08eb6442b5 Add function findEntitiesByType EntityScriptingInterface 
Updated EntityScriptingInterface.cpp and .h to create a new function for
the Entities API that can be called to filter out entities found by a
specific entity type.
 2017-05-15 18:36:36 -07:00
samcake
2df6d0df48 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-15 13:40:56 -07:00
Seth Alves
630d95a812 fix constraint import some more 2017-05-12 13:03:51 -07:00
Seth Alves
bc6fb182eb pull out motor action, fix import of slider and cone-twist constraints 2017-05-12 10:32:28 -07:00
Seth Alves
80e6edda0c code review 2017-05-11 10:13:15 -07:00
samcake
c36035d3eb Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-09 10:46:38 -07:00
Seth Alves
4f24a7618a cleanups 2017-05-09 10:23:04 -07:00
Seth Alves
4816e4f826 what does VS mean when it uses words? 2017-05-08 21:39:41 -07:00
Seth Alves
de589a32f3 clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring 2017-05-08 16:36:51 -07:00
Seth Alves
1346ce22b9 don't crash if imported entities make a reference to an unknown entity 2017-05-08 15:51:25 -07:00
Seth Alves
94dfbc81f3 entity export/import involving constraints now works 2017-05-08 15:44:31 -07:00
Seth Alves
fd238f5438 working on fixing action/constraint export/import 2017-05-08 11:02:35 -07:00
Seth Alves
7a1a9d6496 start on code to remap constraint IDs during import 2017-05-07 19:42:04 -07:00
Seth Alves
5d539bcc17 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-06 07:49:02 -07:00
Sam Cake
db3d634840 Adding the change notifications 2017-05-05 00:11:22 -07:00
Seth Alves
7f4399b0a3 fix name in entity-edit-an-overlay warning 2017-05-04 19:16:15 -07:00
Seth Alves
92966377fb Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 19:05:57 -07:00
Seth Alves
a7c684e007 entity scripting call to get the nestable-type of an object, by id 2017-05-04 19:05:29 -07:00
Seth Alves
d25db099b9 be more effecient about ignoring edits to unknown entities 2017-05-04 18:49:46 -07:00
samcake
df2c5b8c23 adding the notification for keyLight changes modifying the KeyLIghtPayoad 2017-05-04 18:28:12 -07:00
Seth Alves
74a82f92df return null uuid for failure 2017-05-04 10:05:17 -07:00
Seth Alves
9171995ed3 add a comment 2017-05-03 21:41:00 -07:00
Seth Alves
69944cc76d add a way to get a SpatiallyNestable's name without knowing what its type is 2017-05-03 21:32:49 -07:00
Seth Alves
03f416ff4d Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-03 20:32:08 -07:00
Seth Alves
0fff7678bf code review 2017-05-03 19:07:46 -07:00
Seth Alves
e96c3e84b4 if a script attempts to edit a non-entity, don't send the edit packet over the wire 2017-05-03 13:58:49 -07:00
Seth Alves
7f69bdecb2 first try at angular-velocity setting action 2017-05-01 07:06:21 -07:00
Seth Alves
4c4e0dffcc bullet cone-twist constraint 2017-04-29 12:30:12 -07:00
Seth Alves
6623028d71 ball-and-socket constraint 2017-04-29 08:35:55 -07:00
Seth Alves
e2e9371e96 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4 2017-04-29 08:04:31 -07:00
1st-BrainStormer
953a3f7a6f Update EntityDynamicInterface.cpp 
Grammar correction.
 2017-04-28 20:14:01 -07:00
Seth Alves
b196dd082b expose bullet slider constraint to javascript 2017-04-27 07:56:35 -07:00
Seth Alves
f7378abb08 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-20 02:40:10 -07:00
Chris Collins
889b054085 Merge pull request #10067 from humbletim/fix-Entities-setLocalJointTranslations 
Fix Entities.setLocalJointTranslations
 2017-04-19 09:32:28 -07:00
Seth Alves
21ca767b7c remove setPosition and setRotation for actions because they were never finished and never used. 2017-04-18 11:59:16 -07:00
Andrew Meadows
31bfc98b87 use const reference for ScenePointer when possible 2017-04-18 11:52:22 -07:00
Seth Alves
b1dc5be316 make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar 2017-04-14 11:48:06 -07:00
Seth Alves
2dab3069da fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called. 2017-04-14 11:06:40 -07:00
Seth Alves
afa8fc161b allow hinge constraint between two entities 2017-04-13 15:37:28 -07:00
Seth Alves
9b12956909 formatting 2017-04-12 16:34:34 -07:00
Seth Alves
507f658a5f update comment 2017-04-12 07:37:41 -07:00
Seth Alves
74c0a70cb0 rename base action classes to dynamics, start on constraints 2017-04-11 20:39:13 -07:00
Stephen Birarda
602d65a71a Merge pull request #10001 from birarda/cleanup-ebp 
cleanup EncodeBitstreamParams to use nodeData when possible
 2017-04-10 15:54:30 -07:00
Brad Hefta-Gaub
0d4649ded8 Merge pull request #10079 from jherico/entity_thread_safety 
Thread safety for property getter/setters on entities
 2017-04-07 19:01:07 -07:00
Andrew Meadows
b9c7d6351f Merge pull request #10135 from samcake/ambient 
Rename render::PendingChanges to render::Transaction
 2017-04-07 09:54:10 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Brad Davis
15f7e895aa More thread safety 2017-04-04 15:09:21 -07:00
Brad Davis
cd7c1643a3 More thread safety 2017-04-04 14:03:30 -07:00
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