SamGondelman
5bfb0baf09
const references
2017-10-13 14:38:46 -07:00
SamGondelman
cc8ecdc596
put back entity signals for scripts
2017-10-12 17:28:00 -07:00
SamGondelman
53fde83922
cleaning up pointerevents, wip
2017-10-12 11:21:50 -07:00
Howard Stearns
73c8da99dc
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-29 16:46:43 -07:00
Howard Stearns
58255abe12
animation url and computing certificateID
2017-09-29 16:32:25 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Seth Alves
d89f2b77da
rework ScriptEngine lifetimes using 'smart' pointers
2017-09-14 10:42:21 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
SamGondelman
a641fb7a7f
rename qvector findRayIntersection to avoid script conflicts
2017-08-15 18:03:52 -07:00
SamGondelman
3645bf04b6
possibly fix most annoying crash
2017-08-08 18:10:53 -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
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
8da91695df
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-27 20:15:54 -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
Brad Hefta-Gaub
ac309df3d1
Merge pull request #9946 from sethalves/model-scripting-1
...
Model scripting
2017-03-21 09:26:32 -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
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
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
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
ZappoMan
9e71801ae1
remove properties from RayToEntityIntersectionResult
2017-03-01 18:21:04 -08:00
Seth Alves
88c850afa2
voxel-paint paints with capsules rather than spheres
2017-02-26 12:56:17 -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
d85f27e992
Add Entities.getServerScriptStatus
2017-01-18 11:15:59 -08:00
Ryan Huffman
812aaee48c
Add Entities.reloadServerScripts
2017-01-17 14:47:57 -08:00
Seth Alves
dc996bee95
merge from upstream
2016-12-20 08:06:01 -08:00
David Rowe
be00730073
Add canWriteAssets method and signal to Entities API
2016-12-14 14:27:55 +13: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
c52f893273
isChildOfParent
2016-12-01 10:54:26 -08:00
Ryan Huffman
5fd1ae64b0
Begin adding entities jsdoc
2016-11-14 16:54:55 -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 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
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
Seth Alves
9bcda1bb45
merge from upstream
2016-08-20 15:25:04 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -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
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
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
f90b9ec65d
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 12:08:45 -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
Brad Hefta-Gaub
1c111e20bd
fix possible thread issue with Entities.callEntityMethod()
2016-04-18 11:20:26 -07:00
Ryan Huffman
7823882aa1
Add atp filename to entities added to world
2016-03-14 16:13:33 -07:00
Ryan Huffman
b42bec78dc
Add Entities.addModelEntity
2016-03-10 10:25:20 -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
Babiuch, Ryan Nicholas
142ec76600
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-04 08:18:47 -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
eff02d3e3a
Fix Agents bidding on simulation ownership
2016-02-02 10:47:51 -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
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
9304477233
split out calls for rotation and translation
2016-01-04 15:29:06 -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
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
84bcfb7d71
hook up a way for scripts to set model-entity joint state
2015-12-22 17:43:01 -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
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Andrew Meadows
ab6367ff4e
remove debug option for disabling physics updates
2015-12-01 11:13:01 -08:00
Atlante45
b15054c1fb
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:41:06 -08:00
James B. Pollack
e928c8278b
overload a single function and cleanup, add examples
2015-11-06 11:48:51 -08:00
James B. Pollack
3cee569bae
pass parameters to entities
2015-11-05 16:57:39 -08:00
James Pollack
b229b5289c
entity call params
2015-11-05 14:24:21 -08:00
Atlante45
55894f2eee
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 17:46:24 -08:00
Howard Stearns
ce1d0fe07c
Git rid of unused (un-emitted and intended to be removed long ago) script signal.
2015-10-30 11:25:54 -07:00
Stephen Birarda
4f6da68a1f
add getJointPosition and getJointRotation for entities
2015-10-22 16:25:28 -07:00
ericrius1
0373a481f8
Using EntityItemIDs instead of QUuids
2015-10-20 09:22:16 -07:00
ericrius1
f93b1d3325
Correctly whitelisting entities for ray picking
2015-10-12 17:05:34 -07:00
ericrius1
8d39f9c760
Syntax fixes
2015-10-12 15:02:03 -07:00
ericrius1
d01dda9c81
Adding in functionality to include only specified Ids in ray picking
2015-10-12 14:40:11 -07:00
Atlante45
bcd148cb87
Construct entity properties at definition
2015-10-09 12:23:19 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Andrew Meadows
269e3d7f23
Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance
...
Entities.getEntityProperty() performance improvements
2015-09-18 15:19:06 -07:00
Brad Hefta-Gaub
0d37511071
add support for scripts to call methods on entity scripts
2015-09-18 14:06:38 -07:00
Brad Hefta-Gaub
08babecb75
add support for mapping EntityPropertyFlags to QScriptValues and wire in desiredProps
2015-09-17 19:51:21 -07:00
Brad Hefta-Gaub
4e2cb00ec3
first cut at only returning type specific properties in getEntityProperties
2015-09-17 17:33:53 -07:00
Brad Hefta-Gaub
e1cb041576
first cut at adding desiredProperties to getProperties
2015-09-16 15:00:42 -07:00
Stephen Birarda
5df7ce7424
fix for missing jurisdiction listener in Agent
2015-09-16 11:43:54 -07:00
Seth Alves
9c4fdfd653
merge from upstream
2015-09-08 18:01:07 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Seth Alves
7369ca19e9
allow setting cuboid voxel spaces. clean up some locking
2015-08-31 18:01:15 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Stephen Birarda
0f77ab8611
resolve conflicts on merge with upstream/master
2015-08-18 11:45:55 -07:00
Seth Alves
b129c2a933
in edged mode, make sure border voxels are zeroed out. expose some more voxel matrix math to javascript
2015-08-16 09:36:54 -07:00
Seth Alves
5ecdbaa19d
have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoords
2015-08-15 15:18:25 -07:00
ericrius1
0f7c21ddd7
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
2015-08-10 11:55:47 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
Zander Otavka
be4e827281
Merge: master -> panel-attachable-improvements.
2015-08-06 16:29:38 -07:00
Zander Otavka
4a1fcbf160
Fix error in an unused method declaration.
2015-08-05 16:11:09 -07:00
Stephen Birarda
052978898e
resolve conflicts on merge with upstream master
2015-08-05 11:16:20 -07:00
ericrius1
9125b3a2a9
attempting to fix windows and linux builds again
2015-08-03 14:53:02 -07:00
ericrius1
47bc8f50ab
cleaning
2015-08-03 08:45:14 -07:00
Andrew Meadows
0a5ada3c09
remove legacy shapes
2015-07-29 09:02:24 -07:00
Stephen Birarda
9e7fb9ae16
shuffle Packet headers, use static enum for PacketType
2015-07-23 13:56:47 -07:00
ericrius1
0ce6737b34
merged and normals flipping
2015-07-13 09:43:15 -07:00
Stephen Birarda
ffa6edc904
fix spaces created by xcode find/replace
2015-07-07 15:01:19 -07:00
Stephen Birarda
b3c3e5a6c8
more PacketType to PacketType::Value replacements
2015-07-02 16:49:19 -07:00
ericrius1
ad54b4c0b0
changed quad entity to PolyLine
2015-07-01 17:18:36 -07:00
Seth Alves
0970f010a4
provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are
2015-06-27 13:31:00 -07:00
ericrius1
9dc6846eba
rendering wad entity
2015-06-22 15:12:35 -07:00
ericrius1
dbec1aad0c
line entity points are now local to entity position. Changed paint script to reflect this
2015-06-19 18:54:28 -07:00
ericrius1
2b4146125f
adding logic to check points of line are inside bounds
2015-06-18 16:27:06 -07:00
Seth Alves
aff582287d
use const references for arguments in action-related calls
2015-06-05 11:26:54 -07:00
Seth Alves
28c034698f
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-05 10:41:20 -07:00
Seth Alves
eb912892dc
code review
2015-06-05 09:56:34 -07:00
Seth Alves
3dbf28b7b4
use lambdas to remove some repeated code
2015-06-05 07:33:39 -07:00
Seth Alves
ba42b0dcc4
updateAction and deleteAction
2015-06-04 17:51:59 -07:00
Seth Alves
14026667f5
script interface for creating an action now takes an action-type name rather than having a different call for each action
2015-06-04 10:55:32 -07:00
Seth Alves
d634663bb1
simple action is working. destructor sequense is still suspicous
2015-06-03 17:33:55 -07:00
Seth Alves
c8ab22c517
hook up entity-scripting-interface to actions
2015-06-03 11:19:45 -07:00
Andrew Meadows
0e2028b820
merge
...
Conflicts:
libraries/entities/src/EntityItem.cpp
2015-06-02 15:08:36 -07:00
Andrew Meadows
fa491a5c4f
fix theoretical crash bug in editEntity()
2015-06-01 13:59:56 -07:00
Seth Alves
d1bb6473d9
more work on edge handling and resizing
2015-06-01 13:57:28 -07:00
Seth Alves
96a40bd673
basic collisions with cubic polyvoxes
2015-05-29 18:50:26 -07:00
Seth Alves
6fd38fabe4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 10:06:53 -07:00
Brad Hefta-Gaub
afb09e81a6
Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts
...
Entity events in normal scripts
2015-05-27 09:24:50 -07:00
Seth Alves
c80f2970fd
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 07:37:51 -07:00
Seth Alves
55028f6cb0
voxel data sent over wire and saved to json
2015-05-26 16:34:35 -07:00
Seth Alves
cdef502e2e
expose setVoxelSphere to js
2015-05-26 14:26:05 -07:00
Howard Stearns
bbdf9f1d9f
Remove changingEntityID.
2015-05-26 11:14:23 -07:00
Howard Stearns
4266a99d78
Put the javascript methods on Script, not Entities, and other minimum-diff cleanup.
2015-05-25 11:28:33 -07:00
Howard Stearns
b884d3cf90
Handle all the signals.
2015-05-24 09:57:12 -07:00
