Anthony J. Thibault
21bf931559
eventBridge for web entities.
2016-09-01 16:32:06 -07:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
James B. Pollack
98f0290565
Merge pull request #8436 from huffman/feat/more-user-activity-data
...
Add more user activity data
2016-08-19 10:48:28 -07:00
Ryan Huffman
d46af500c1
Fix wrong property name in entity activity tracking
2016-08-17 17:00:56 -07:00
Ryan Huffman
25b9d756ca
Update entity edit tracking to track count rather than bool
2016-08-17 16:54:04 -07:00
Anthony J. Thibault
7b248b440a
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-17 13:55:12 -07:00
Seth Alves
7bc1235c54
local velocity and angular velocity in scripts is now handled the way local position and rotation are
2016-08-16 16:47:13 -07:00
Anthony J. Thibault
36d87ddd7c
Added EntityItem::wantsHandControllerPointerEvents method
2016-08-16 16:23:45 -07:00
Anthony J. Thibault
c407818d63
send pointer events from handControllerGrab.js to webEntities
2016-08-16 15:26:14 -07:00
Anthony J. Thibault
1be434342b
Work In Progress snapshot
...
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
2016-08-12 17:11:59 -07:00
Ryan Huffman
211da3c428
Add more user activity tracking data
2016-08-11 16:49:29 -07:00
Anthony J. Thibault
1ddbd7022a
Moved keyboardFocus, mouse/touch event methods from Reticle to Entities
2016-08-11 11:52:04 -07:00
Zander Otavka
c25b87c33f
Use custom dialog for asset server add to world
2016-07-22 17:14:45 -07:00
Ryan Huffman
c0c060ef40
Add FIXME comment to change to allow uknown enity edits
2016-07-09 02:51:51 -07:00
Ryan Huffman
2f7e346f6a
Update entity scripting interface to allow modifications to unknown entities
2016-10-04 20:12:19 -07:00
Zander Otavka
a4da63c1ff
Fix bug with Entities.addEntity returning bad id
...
If addEntity failed for whatever reason (eg. lack of permission), it
would return a non-null UUID.
Fixes [FogBugz case #365 ](https://highfidelity.fogbugz.com/f/cases/356/Entities-addEntity-can-return-a-UUID-even-when-unsuccessful ).
2016-06-24 16:39:57 -07:00
Seth Alves
2fd38c1585
when adding or editing an entity from a script, make the _lastEdited in the transmitted properties be the same as the one in the Entity in the local tree
2016-06-23 13:10:15 -07:00
Seth Alves
b2f63a2132
hook up can-rez-tmp and can-write-to-asset-server
2016-06-07 16:17:58 -07:00
David Rowe
44fe7c1144
Add Entities.getChildrenIDs() method
2016-06-02 21:26:33 +12:00
Seth Alves
ac506dc4b7
where needed, copy clientOnly into properties before calling queueEditEntityMessage
2016-05-11 12:46:16 -07:00
Seth Alves
872f1b0c64
clear avatarEntity data for entities that are deleted
2016-05-10 17:48:55 -07:00
Seth Alves
de12680ff1
don't put actions on other people's avatarEntities
2016-05-10 16:43:27 -07:00
Seth Alves
144715f00c
don't make changes to other avatar's avatarEntities
2016-05-10 16:05:40 -07:00
Seth Alves
f90b9ec65d
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 12:08:45 -07:00
Seth Alves
473010f634
addEntity has a clientOnly flag now
2016-05-07 16:45:09 -07:00
Seth Alves
0e6d9a1eec
avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them.
2016-05-07 14:48:31 -07:00
Seth Alves
a0771f8ee5
use smart pointers for entity simulations
2016-05-07 09:14:33 -07:00
Brad Hefta-Gaub
2c9608489f
fix recursive mutex in Entites.callEntityMethod()
2016-05-04 10:01:20 -07:00
Seth Alves
ae8f502808
keep track of actions we are editing and ignore updates from server for these actions
2016-05-02 14:23:36 -07:00
Brad Hefta-Gaub
374ba10524
more CR feedback
2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
1c111e20bd
fix possible thread issue with Entities.callEntityMethod()
2016-04-18 11:20:26 -07:00
Brad Hefta-Gaub
7f164a7959
CR feedback
2016-04-07 08:42:40 -07:00
Brad Hefta-Gaub
8c15116190
fix auto-hide logic in depthReticle
2016-04-06 11:00:43 -07:00
Clément Brisset
17e5b441cf
Merge pull request #111 from huffman/atp-manager-name
...
Add atp filename to entities added to world
2016-03-15 10:19:53 -07:00
Stephen Birarda
72c64532f5
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-15 09:12:49 -07:00
Ryan Huffman
7823882aa1
Add atp filename to entities added to world
2016-03-14 16:13:33 -07:00
Seth Alves
f611d8f747
if needed, set querryAACube when dimensions are updated
2016-03-11 12:41:18 -08:00
Stephen Birarda
5ad4645b47
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-10 13:28:59 -08:00
Ryan Huffman
b42bec78dc
Add Entities.addModelEntity
2016-03-10 10:25:20 -08:00
Andrew Meadows
99a1310711
change properties at 127 priority, grab at 128
2016-03-08 22:17:44 -08:00
Seth Alves
5bf8670bc2
fix SpatiallyNestable::getChildren
2016-02-28 12:16:41 -08:00
Seth Alves
6c9cf386a6
when trigger is squeezed, check for things stuck to hand and unhook them
2016-02-26 10:14:09 -08:00
Seth Alves
af1640ac4e
adjust avatar-energy code to avoid editing local tree and then not telling the entity-server about it
2016-02-17 14:36:18 -08:00
Seth Alves
ffce38769f
properties hold local velocities, not world-frame ones
2016-02-10 19:16:08 -08:00
Seth Alves
d5f3447fbc
when updating queryAACubes for children, use the lastEdited from the parent's properties
2016-02-08 16:22:41 -08:00
Seth Alves
e2098038f1
only setLastEdited on properties to be sent
2016-02-08 15:16:15 -08:00
Seth Alves
44ddfb8039
set last-edited when updating a child's queryAACube
2016-02-08 15:08:58 -08:00
Babiuch, Ryan Nicholas
0069849da3
Consider existing velocity in calculating energy costs when editing entities.
2016-02-04 08:55:23 -06:00
Babiuch, Ryan Nicholas
dca7ff967c
Conform to coding standard.
2016-02-04 08:26:56 -06:00
Babiuch, Ryan Nicholas
142ec76600
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-04 08:18:47 -06:00
Andrew Meadows
63df34541d
Merge pull request #6802 from huffman/agent-simulation
...
Fix Agents bidding on simulation ownership
2016-02-03 13:45:12 -08:00
Babiuch, Ryan Nicholas
786400eb53
Merge branch 'WorkingEnergy'
2016-02-03 14:53:28 -06:00
Babiuch, Ryan Nicholas
3d727d76c2
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-03 13:39:13 -06:00
Babiuch, Ryan Nicholas
3cb2f9c4b7
Exposed energy cost multiplier to scripting.
...
- field: costMultiplier
2016-02-03 13:29:42 -06:00
Babiuch, Ryan Nicholas
7dd5bca17f
Bug fixes and debt reductions on energy calculations.
...
- removed superfluous code interfacing with scripts
- favor floats over doubles in cost calculations
- default avatar energy is maximum float value for cases where energy script is not loaded in order to still manipulate entities.
2016-02-03 10:46:28 -06:00
Ryan Huffman
25632b63b7
Adjust Entities.addEntity to not bid on simulation from AC Script
2016-02-02 13:00:35 -08:00
Ryan Huffman
eff02d3e3a
Fix Agents bidding on simulation ownership
2016-02-02 10:47:51 -08:00
Stephen Birarda
095f0b9349
rename canAdjustLocks to isAllowedEditor for multi-purpose
2016-02-01 16:46:11 -08:00
Babiuch, Ryan Nicholas
47f7d55e2c
Working energy usage for entity manipulation.
...
- Working example in examples/example/ui/MyEnergyBar.js
2016-02-01 08:32:52 -06:00
Brad Hefta-Gaub
1ef01d670d
Revert "Make entity properties be undefined after entity is unloaded"
2016-01-25 18:07:14 -08:00
David Rowe
d020114e59
Make entity properties return undefined value after entity is deleted
2016-01-24 08:39:49 +13:00
Seth Alves
28d673cb97
try again to make this thread safe
2016-01-19 16:00:02 -08:00
Seth Alves
edea0320e6
try again to make this thread safe
2016-01-19 15:44:22 -08:00
Seth Alves
f265656e74
expose getJointNames for entities to js
2016-01-19 12:55:17 -08:00
Seth Alves
d6e3b85237
fix javascript access via localPosition and localRotation
2016-01-18 11:15:32 -08:00
Seth Alves
942e77166e
merge from upstream
2016-01-05 11:11:19 -08:00
Seth Alves
96f506a98d
code review
2016-01-05 07:27:27 -08:00
Seth Alves
3026415f03
add some missing property handling boilerplate
2016-01-04 16:17:00 -08:00
Seth Alves
202a6ae294
debugging
2016-01-04 15:56:08 -08:00
Seth Alves
ccf29e3772
debugging
2016-01-04 15:52:58 -08:00
Seth Alves
9304477233
split out calls for rotation and translation
2016-01-04 15:29:06 -08:00
Seth Alves
5beba58e5f
debugging
2016-01-04 15:05:08 -08:00
Seth Alves
bd35532c5d
debugging
2016-01-04 15:02:45 -08:00
Seth Alves
ef8673610f
debugging
2016-01-04 14:58:13 -08:00
Seth Alves
cd92a9fa1a
adjust timestamps
2016-01-04 14:51:43 -08:00
Seth Alves
9a708f2e74
try splitting edit into 2 packets
2016-01-04 14:48:49 -08:00
Seth Alves
6c8eb90ee0
debugging
2016-01-04 14:42:37 -08:00
Seth Alves
7f2e0cd103
expose a way to set translation and rotation of all model joints at once
2016-01-04 14:13:08 -08:00
Seth Alves
2147b0d78e
fix locking
2016-01-04 12:31:58 -08:00
Seth Alves
768934ae11
update entity timestamps when sending joint information
2016-01-04 11:29:15 -08:00
Seth Alves
bfa8cc1969
merge from upstream
2016-01-03 06:47:25 -08:00
Seth Alves
fe0a656d54
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2015-12-30 12:45:32 -08:00
ericrius1
390dce4613
Adding blacklist
2015-12-24 11:48:40 -08:00
Seth Alves
175506bbf1
when a script sets joint-data on a model-entity, send an edit packet
2015-12-23 16:06:04 -08:00
Seth Alves
84bcfb7d71
hook up a way for scripts to set model-entity joint state
2015-12-22 17:43:01 -08:00
Seth Alves
c84fa5f821
cleanups
2015-12-21 14:45:18 -08:00
Seth Alves
701f99d28e
only send a queryAACube for entities to entity-server
2015-12-18 16:28:11 -08:00
Seth Alves
688448fe41
more queryAABox experimenting
2015-12-17 16:18:41 -08:00
Seth Alves
473212e5b7
try to be more coherent about queryAABox meaning
2015-12-17 14:29:41 -08:00
Seth Alves
b83579e6e5
include queryAABox in physics-induced sends
2015-12-16 17:25:49 -08:00
Seth Alves
951db42146
only send queryAABox if something about the location changed
2015-12-15 16:17:49 -08:00
Seth Alves
0013d58365
include queryAACube when scripts make changes
2015-12-15 14:25:02 -08:00
Seth Alves
c74f8bca49
location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent
2015-12-14 09:13:36 -08:00
Seth Alves
ec9f1e0754
possible fix for crash when grabbing bubblewand
2015-12-08 09:44:43 -08:00
Seth Alves
0bf276efa5
adjust method names to fit convention
2015-12-07 14:37:35 -08:00
Seth Alves
982e986f1a
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-07 14:31:18 -08:00
Seth Alves
96e9580473
change some more parameters back to being pass-by-reference, where it's safe
2015-12-07 05:30:19 -08:00
Seth Alves
f0fb9966ad
expose parent-joint-index to edit.js
2015-12-06 12:34:41 -08:00
Seth Alves
d518a4573e
if script sets parent or jointIndex, don't pop entity off to someplace
2015-12-05 15:15:33 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
