616 commits

Author	SHA1	Message	Date
HifiExperiments	b6744588f4	loading fix	2020-11-16 21:25:25 -08:00
HifiExperiments	81940214bb	Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine""	2020-11-16 21:20:25 -08:00
kasenvr	21f8eac936	Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine"	2020-11-16 22:35:46 -05:00
HifiExperiments	3b2c219e53	possibly more robust fix?	2020-11-10 21:39:15 -08:00
HifiExperiments	b3e9c1e8f8	Merge remote-tracking branch 'upstream/master' into scriptEngine	2020-11-09 22:00:11 -08:00
HifiExperiments	2e4a6ee1b5	fix build errors	2020-08-28 11:22:08 -07:00
HifiExperiments	2a1857e9ec	split entity script engines into two	2020-08-27 16:50:32 -07:00
HifiExperiments	e78ece7fc5	CR	2020-08-17 14:16:41 -07:00
HifiExperiments	56d359f2ba	Merge remote-tracking branch 'upstream/master' into parenting	2020-06-14 17:30:26 -07:00
Kasen IO	94c230b78b	Add null check to entity render clearing to fix crash. ... Co-Authored-By: null <HifiExperiments@users.noreply.github.com>	2020-06-01 22:13:52 -04:00
HifiExperiments	ebc9dae78d	Merge branch 'master' into parenting	2020-05-07 13:35:32 -07:00
HifiExperiments	eb26d9b4e3	working on parenting fixes	2020-04-06 13:41:01 -07:00
Andrew Meadows	dbeea4038d	remove unused argument	2019-11-14 09:59:43 -08:00
Andrew Meadows	9d92546a8b	revert the revert of PR-16307	2019-11-14 09:59:43 -08:00
Brad Hefta-Gaub	51669e1ac3	Revert "DEV-1811: apply deletion rules to linked entities"	2019-10-11 11:06:10 -07:00
Maia Hansen	07b916f0b7	Merge pull request #16307 from AndrewMeadows/colossal-cave ... DEV-1811: apply deletion rules to linked entities	2019-10-10 13:24:43 -07:00
RebeccaStankus	458d3bfb48	Renamed variable and made it private	2019-10-08 13:47:06 -07:00
RebeccaStankus	092424569d	Added flag to ensure mouse event signals are not connected twice	2019-10-08 12:01:47 -07:00
Andrew Meadows	8ab70225d9	apply delete rules down linked hierarchy	2019-10-07 14:38:36 -07:00
Andrew Meadows	470a45c012	EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities	2019-10-07 14:38:36 -07:00
Zach Fox	5f1c389d1c	DEV-611: Ensure that entities with the property set can be clicked in Desktop and VR modes	2019-10-03 09:45:23 -07:00
milad	e56d0066a3	Merge branch 'master' of github.com:highfidelity/hifi into BUGZ-1452/entity-link-property-right-button-disable	2019-09-11 17:08:39 -07:00
milad	12b980d99d	about to test if this new right click disable is working	2019-09-11 17:08:35 -07:00
humbletim	271fac4bca	Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge	2019-09-05 09:46:21 -04:00
Simon Walton	9aacd136b8	Add blocking to script unload for client entity-scripts	2019-08-14 13:51:40 -07:00
Zach Fox	b45e670d21	Fix BUGZ-1197 (and others): Ensure enterEntity is emitted when avatar is inside entity and script is reloaded	2019-08-07 13:55:16 -04:00
kasenvr	e9e9607a3b	modkit core changes initial commit ... whitespace corrections + warnings updated cmake plugin rework with focus on JS API integration example cleanup edit_filter scope separate-out edit_filter wantsScope stuff -plugin metadata split scriptengines out separately cleanup __url/__filename sets additional cleanup fix typo; consolidate ScriptInitializerMixin inits add more example API protoypes cleanup pass; fix entity_server / agent init fix whitespace remove technically unnessary plugin filtering +EDIT_FILTER_SCRIPT; cleanup reorder public/slot/private use std::count_if formatting better debug output; cleanup fix msvc compiler warning cleanup eradicate QtScript references from API Example updated header comments Updated KasenAPIExample	2019-07-14 21:35:13 -04:00
SamGondelman	c605c2917f	trying to fix entity tree renderer performance	2019-06-24 14:32:56 -07:00
Andrew Meadows	1ea0dba083	use weak_ptr for fade-out-finished lambda	2019-06-20 09:29:48 -07:00
Andrew Meadows	87d7a0a72f	recover the Good Parts from first attempt to fix bugz-512	2019-06-20 09:29:48 -07:00
Andrew Meadows	db3c7b9194	rollback fixes for bugz512	2019-06-13 13:57:18 -07:00
Andrew Meadows	eee52deefe	destroy WebSurfaces on shutdown	2019-06-12 16:07:15 -07:00
sabrina-shanman	833946ceb3	Clean up transition naming	2019-06-06 13:25:06 -07:00
SamGondelman	dfdace8cdc	fix zones for real this time	2019-05-10 15:24:02 -07:00
Shannon Romano	930032bcc6	Merge pull request #15511 from AndrewMeadows/build-shapes-off-mainloop ... case 22166: Build complex shapes in ThreadPool instead of MainLoop	2019-05-09 17:14:50 -07:00
SamGondelman	04198c6bfc	use weak ptrs, add comment about SelectSortItems performance	2019-05-08 13:13:05 -07:00
SamGondelman	da092cc5f0	fix zone issues	2019-05-08 11:04:54 -07:00
Andrew Meadows	915cbb69df	split work out of EntityTree::update(), call it preUpdate()	2019-05-06 17:37:35 -07:00
SamGondelman	703a4a5700	call leaveEntity when script stops	2019-04-19 15:18:05 -07:00
danteruiz	8115ef6d36	addressing more requested changes	2019-04-01 16:46:15 -07:00
danteruiz	fcb838a71f	addressing review requests	2019-04-01 15:43:04 -07:00
danteruiz	db17f094da	adding entities to fade out list;	2019-03-29 15:23:16 -07:00
danteruiz	b9d04c6ebb	adding entity to a faded list	2019-03-28 16:42:29 -07:00
SamGondelman	609c4ab52e	try to fix audio injector threading issues	2019-03-12 18:41:43 -07:00
Shannon Romano	4f3d593d90	Merge pull request #15072 from SamGondelman/clear ... Case 11775: Don't clear my avatar entities on domain switch	2019-03-05 15:42:51 -08:00
SamGondelman	f2c248c0a2	disable href and entity script events when in edit mode	2019-03-04 17:10:20 -08:00
SamGondelman	12f5a735d9	simplifying mouse events and fix mouse on create	2019-03-04 14:50:09 -08:00
SamGondelman	3e6061e435	try to not clear my avatar entities on domain switch	2019-03-01 13:45:00 -08:00
Andrew Meadows	ed9ebf84c9	remove unuseful log entry	2019-02-28 14:21:14 -08:00
Andrew Meadows	be2d4272da	remove the other unnecessary _space->clear()	2019-02-21 18:11:16 -08:00