Seth Alves
bbad6a0eb7
mesh-append works, mesh-transform doesn't?
2017-03-16 17:26:07 -07: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
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
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
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
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
Stephen Birarda
823d74d2d4
don't auto-bid for sim ownership on entity creation in ESI
2017-02-01 16:53:37 -08:00
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
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
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
