Seth Alves
adaee0e62c
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-31 21:27:00 -08:00
Thijs Wenker
174a7ad5bd
Optimizations and style fixes from code review
2017-01-31 22:54:58 +01: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
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
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
c317ba8054
merge from upstream
2017-01-25 15:57:53 -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
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
Ryan Huffman
812aaee48c
Add Entities.reloadServerScripts
2017-01-17 14:47:57 -08:00
Seth Alves
3b4f5e3023
don't include overlays in results from EntityScriptingInterface::getChildrenIDsOfJoint
2017-01-15 11:27:29 -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
be00730073
Add canWriteAssets method and signal to Entities API
2016-12-14 14:27:55 +13:00
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
