SamGondelman
90091d11e4
parabola picks, started implementing math
2018-07-03 09:47:31 -07:00
Wayne Chen
9e3626cca3
returning false if there is no entity to connect to
2018-06-29 14:42:33 -07:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix
2018-06-21 17:32:24 -07:00
SamGondelman
8f411ad6c8
CR
2018-06-20 16:13:10 -07:00
Andrew Meadows
4329ea5240
Merge master' into 'workload'
2018-06-04 16:11:25 -07:00
John Conklin II
ec3f9549f1
Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934
...
Fix EntityScriptingInterface::getChildrenIDs function
2018-05-31 14:27:25 -07:00
Andrew Meadows
d50da2babc
Merge 'master' into 'workload'
2018-05-23 14:51:05 -07:00
Liv Erickson
56493346c1
fix permissions check
2018-05-22 15:41:48 -07:00
Thijs Wenker
7f4e9a0089
style
2018-05-21 06:17:08 +02:00
Thijs Wenker
f4df75d016
CR feedback
2018-05-21 06:04:05 +02:00
Livi Erickson
70bbac5c83
update with lastEditedCheck
2018-05-20 18:49:41 -07:00
Liv Erickson
29b11b9101
some fixes to server cloneables
2018-05-18 17:12:41 -07:00
Andrew Meadows
00e360aff0
reduce sim ownership priority when releasing grab
2018-05-17 17:25:07 -07:00
David Back
4e14eb37e3
update comment
2018-05-17 16:34:19 -07:00
David Back
30855f94eb
set last edited to 0 to ensure server update
2018-05-17 16:02:58 -07:00
David Back
f74e219029
rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete
2018-05-15 17:24:14 -07:00
Wayne Chen
f82e597ac7
Updating documentation for getChildrenIDs + fixing issue #1934
2018-05-15 09:34:07 -07:00
Wayne Chen
bd6905b3d2
Adding possible solution to issue#1934.
2018-05-14 18:25:39 -07:00
David Back
a57c280813
convertToCloneProperties
2018-05-11 17:54:08 -07:00
David Back
dea588ae4a
remove prints
2018-05-09 18:12:04 -07:00
David Back
3241c18271
first pass cloneables WIP
2018-05-09 18:10:40 -07:00
John Conklin II
cb7b03652b
Merge pull request #12796 from MiladNazeri/feature/add-findByName
...
added Entities.findbyName
2018-04-25 14:00:10 -07:00
milad
988dca437d
added case-sensitive search
2018-04-16 18:30:00 -07:00
Zach Fox
071bf35683
Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018
2018-04-16 10:11:44 -07:00
John Conklin II
1834325970
Merge pull request #12788 from sethalves/fix-immediate-last-edited-by
...
set lastEditedBy in local tree whenever a script adds or edits an entity
2018-04-12 13:02:05 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership
...
entity-server will expire stale simulation ownership
2018-04-12 12:04:52 -07:00
John Conklin II
88a151481d
Merge pull request #12763 from sethalves/ess-can-edit-localX
...
allow ESS to make relative-to-parent edits when entity is not in ESS's octree
2018-04-11 12:08:35 -07:00
Andrew Meadows
a0f3e3a031
add simulation ownership expiry
2018-04-11 09:40:32 -07:00
Zach Fox
a9b9a1cb10
Commerce: Gifts
2018-04-10 15:54:19 -07:00
milad
4adc8928f0
added Entities.findbyName
2018-04-05 09:58:54 -07:00
Seth Alves
2545e67b14
set lastEditedBy in local tree whenever a script adds or edits an entity
2018-04-04 12:27:41 -07:00
Seth Alves
71d6dbf9bf
allow ESS to edit local version of properties even if the entity isn't in the ESS's local octree
2018-04-02 15:52:28 -07:00
David Rowe
7027ccb6d8
Remove unused code
2018-03-30 09:35:25 +13:00
David Rowe
3b90078097
Remove Entities.currentAvatarEnergy and related from the API
2018-03-30 08:36:18 +13:00
Seth Alves
b39c7eadd2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-13 09:24:18 -07:00
David Rowe
a62b6b7150
Merge branch 'master' into 21709
2018-03-07 17:34:53 +13:00
Seth Alves
2d374583b4
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-01 11:07:50 -08:00
David Rowe
a782b6779a
Merge branch 'master' into 21709
...
# Conflicts:
# interface/src/ui/overlays/Overlays.h
# interface/src/ui/overlays/Shape3DOverlay.cpp
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/EntityScriptingInterface.h
2018-02-28 12:42:05 +13:00
Elisa Lupin-Jimenez
17ddf21028
fixed line length
2018-02-27 15:05:51 -08:00
Dante Ruiz
be52b66874
be able to delete entities in serverless domain
2018-02-26 15:41:35 -08:00
Dante Ruiz
c83a8e9a25
minimize diff
2018-02-26 14:51:36 -08:00
Dante Ruiz
5031d94c6d
small changes
2018-02-26 14:50:34 -08:00
Elisa Lupin-Jimenez
b56c78d36c
image has correct orientation and is collisionless
2018-02-26 14:44:46 -08:00
Dante Ruiz
a23c425f5e
actions and serverless status fixes
2018-02-26 14:24:51 -08:00
Dante Ruiz
07b0431215
fix merge conflict
2018-02-23 14:00:36 -08:00
David Rowe
26404a6ce8
Entities functions JSDoc bulk
2018-02-23 19:27:13 +13:00
Zach Fox
90f05f4db7
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-22 09:23:49 -08:00
David Rowe
9e37230aa1
Miscellaneous code tidying
2018-02-19 12:21:56 +13:00
ZappoMan
e71811bef2
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-14 09:03:32 -08:00
Zach Fox
ae8a8a48eb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-13 13:55:32 -08:00
Zach Fox
95e9eb8e4a
Lots of progress
2018-02-12 17:06:57 -08:00
Elisa Lupin-Jimenez
9f8e2017ce
can add image directly from asset server
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
576d683d3b
initial changes to incorporate snap model
2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
fc0e87d5ea
more infrastructure links
2018-02-02 10:08:39 -08:00
ZappoMan
cd4b3b1a54
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-01-30 12:52:41 -08:00
ZappoMan
aa82ad8855
adjust client to only delete entities on server echo
2018-01-26 14:57:36 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
Seth Alves
897b96d092
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 07:36:26 -08:00
humbletim
a146b778f7
support additional .extraInfo for ray intersections
2017-12-21 12:35:13 -05:00
Zach Fox
7113a72f2e
Bugfixes
2017-12-12 18:04:20 -08:00
Zach Fox
f5df83667f
Add getStaticCertificateJSON() to Entity Scripting Interface
2017-12-12 15:50:04 -08:00
Seth Alves
b590cd5b89
avatar-entities which are children of an avatar will scale with the avatar
2017-12-02 09:31:43 -08:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
ZappoMan
b5199220ab
cleanup SpatiallyNestable Velocity to match WorldVelocity naming
2017-11-02 17:07:53 -07:00
ZappoMan
afaad5fcd7
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-02 13:39:51 -07:00
Zach Fox
19420a0ff2
Move static cert verify to properties
2017-10-30 17:01:55 -07:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
...
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
Sam Gondelman
863a2041a6
Merge branch 'master' into pointerEvents
2017-10-25 17:22:19 -07:00
Zach Fox
91333cdf7b
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-25 10:26:50 -07:00
Brad Hefta-Gaub
18a74cea91
Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
...
2017-10-23: Merge RC57 into Master
2017-10-24 21:19:01 -07:00
ZappoMan
a1885926b5
some cleanup
2017-10-24 11:46:42 -07:00
ZappoMan
1128a98e88
implement callEntityClientMethod
2017-10-24 11:15:57 -07:00
Zach Fox
1f6d989044
Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023
2017-10-23 17:37:43 -07:00
Zach Fox
cda43ec1ea
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-23 11:52:59 -07:00
ZappoMan
934c9479af
implement support for Entities.callEntityServerMethod()
2017-10-21 20:27:35 -07:00
Zach Fox
74180bc4cd
Implement static cert verification correctly
2017-10-19 16:39:13 -07:00
Seth Alves
f2cb5d4aff
clean-up concept of puffed queryAACube
2017-10-19 13:19:13 -07:00
SamGondelman
c6b636901a
fewer undesirable couplings
2017-10-16 13:46:23 -07:00
SamGondelman
5bfb0baf09
const references
2017-10-13 14:38:46 -07:00
SamGondelman
1a047613bf
fix pointerevents on entities from scripts
2017-10-12 12:31:36 -07:00
SamGondelman
53fde83922
cleaning up pointerevents, wip
2017-10-12 11:21:50 -07:00
Howard Stearns
9b0ebf0e07
doh! string not boolean
2017-10-02 16:18:28 -07:00
Howard Stearns
0b7af66016
more linux warnings
2017-10-02 15:38:59 -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
Brad Hefta-Gaub
d572510770
Merge pull request #11009 from AndrewMeadows/fix-QueryAACube
...
update EntityItem bounding cube when on changed dimensions
2017-07-27 18:21:06 -07:00
Andrew Meadows
d86ae98211
always update bounding box on script edit
2017-07-21 10:57:09 -07:00
Andrew Meadows
a8dac0cb79
don't send constant updates for grabbed objects
2017-07-20 15:45:50 -07:00
Andrew Meadows
54426a5b81
update queryAACube on server when it probably changed
2017-07-20 08:21:10 -07:00
Seth Alves
be48268be8
getMeshes handles registration point
2017-07-19 15:02:40 -07:00
Seth Alves
750b7192af
trying to get the resulting model to line up with the originals
2017-07-19 13:58:03 -07:00
Andrew Meadows
d9c6126000
more descriptive names for methods that do stuff
...
also: changes to dimensions will trigger update to QueryAACube
2017-07-19 13:33:32 -07:00
