Commit graph

304 commits

Author SHA1 Message Date
Seth Alves
6c99b5e9ca code review 2016-12-09 06:50:10 -08:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
Dante Ruiz
348c0c95e5 conforming to coding standard and better variable naming 2016-12-01 22:22:17 +00:00
Dante Ruiz
0c9cd5803a added descendant checking 2016-12-01 10:54:26 -08:00
Dante Ruiz
c52f893273 isChildOfParent 2016-12-01 10:54:26 -08:00
Seth Alves
339d6a55cf getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation 2016-11-03 10:06:07 -07:00
Seth Alves
844cc03dcb fix names of model-entity joint setters 2016-11-02 10:24:01 -07:00
Ryan Downe Karpf
ed2571704f Merge pull request #8735 from huffman/feat/teleport-improvements
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to  certain surfaces
2016-10-07 09:56:30 -07:00
Chris Collins
583332d502 Merge pull request #8734 from huffman/feat/allow-editing-unknown-entities
Update entity scripting interface to allow modifications to unknown e…
2016-10-06 09:51:35 -07:00
Ryan Huffman
ee50469213 Add collidableOnly arg to findRayIntersection 2016-10-04 20:19:54 -07:00
Ryan Huffman
17c63eb722 Add the ability to ignore invisible entities in findRayIntersection 2016-10-04 20:19:32 -07:00
Ryan Huffman
5e8c8f84b5 Handle edge cases of AVATAR_SELF_ID being used with entities 2016-09-13 16:34:05 -07:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
David Rowe
38c2efa22f Implement Entities.findInFrustum() method 2016-09-09 18:57:48 +12:00
David Rowe
28cfca993f Add and wire up "search in view" JavaScript API stub 2016-09-08 14:58:48 +12:00
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