overte-JulianGro

mirror of https://github.com/JulianGro/overte.git synced 2025-08-29 00:06:21 +02:00

Author	SHA1	Message	Date
Nissim Hadar	adb02d69f9	WIP -adding canCastShadow flag.	2018-02-14 21:45:56 -08:00
Nissim Hadar	054b2bf3e2	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork # Conflicts: # libraries/networking/src/udt/PacketHeaders.cpp # scripts/system/html/js/entityProperties.js	2018-02-14 17:10:07 -08:00
SamGondelman	324eefc914	remove fresnel, add unlit, fix overlays, cleanup	2018-02-14 17:02:07 -08:00
Nissim Hadar	a92765a83a	Adding can cast shadow property.	2018-02-14 12:01:30 -08:00
ZappoMan	e71811bef2	Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters	2018-02-14 09:03:32 -08:00
Nissim Hadar	1632ab9782	Changed flag to "cast shadow" instead of "don't cast shadow".	2018-02-13 18:27:36 -08:00
Nissim Hadar	23a29b8d4b	Added don't castr shadow flag to entity and shape classes.	2018-02-13 16:16:04 -08:00
SamGondelman	4500ed17e7	merge from master	2018-02-13 13:58:39 -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
SamGondelman	38290064c1	replace materials by name, hide material mode for now	2018-02-13 13:24:08 -08:00
Andrew Meadows	b111e82763	Merge pull request #12365 from AndrewMeadows/workload-001 moving Job/Task framework out of 'render' library and into its own 'task' library	2018-02-13 12:26:32 -08:00
Elisa Lupin-Jimenez	a61021f46c	Merge pull request #12272 from elisa-lj11/2d-images 2d images (JPG and PNG) are now supported as (quasi) entities	2018-02-13 11:44:02 -08:00
Andrew Meadows	38bc312004	faster and const EntityTree::findByID()	2018-02-13 11:25:34 -08:00
Zach Fox	95e9eb8e4a	Lots of progress	2018-02-12 17:06:57 -08:00
SamGondelman	9e8aa1898c	warnings, load material from URL, shapeID -> parentMaterialID	2018-02-12 12:50:09 -08:00
SamGondelman	84cd0e1529	wip live material swapping on model entities, model overlays, avatars, and albedo swap on shape entities	2018-02-09 12:00:08 -08:00
NissimHadar	950a62f3f8	Global graphics flag default to on. Added cast shadows flag to zone/keylight. Exit the RenderShadowMap job if current keylight doesn't cast shadows.	2018-02-08 15:52:20 -08:00
ZappoMan	71a8e96d5a	fix several CR requests	2018-02-02 18:14:12 -08:00
SamGondelman	4d4294dd6a	Merge remote-tracking branch 'upstream/master' into decals	2018-02-02 16:50:01 -08:00
SamGondelman	d7f4b033e8	wip finish adding material entity	2018-02-02 16:49:33 -08:00
ZappoMan	8a9153a461	Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters	2018-02-02 16:08:05 -08:00
Andrew Meadows	a5e968867e	Merge pull request #12302 from druiz17/fix-another-bootstrapping Fix another bootstrapping and rename entityItem _dirtyFlags	2018-02-02 15:14:38 -08:00
Elisa Lupin-Jimenez	9f8e2017ce	can add image directly from asset server	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	d390e20139	removed extraneous commenting and image class	2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez	42151b8fd4	creating new image entity opens image property options	2018-02-02 10:14:27 -08:00
Elisa Lupin-Jimenez	ceb621a521	reverted protocol change for images	2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez	576d683d3b	initial changes to incorporate snap model	2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez	dc5f29aa58	entity item properties hooked up for image	2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez	c9c55af661	setting up properties page (not complete)	2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez	6f76650789	updated with master	2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez	72d8f90ec1	not sure why entities don't render with these changes	2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez	fc0e87d5ea	more infrastructure links	2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez	fdca8ab93e	added image button to edit.js, working on connecting to cpp	2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez	3a7290c3ed	starting 2d image entity type	2018-02-02 10:08:39 -08:00
ZappoMan	8751ef506e	Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters	2018-02-01 14:29:12 -08:00
Seth Alves	bdf6736a54	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-02-01 12:04:56 -08:00
Dante Ruiz	ab20643ada	fix mistakes	2018-02-01 08:13:43 -08:00
Triplelexx	a8d2be045c	fix typos	2018-02-01 07:09:24 +00:00
Dante Ruiz	bd5fc65bfb	fix getDirtyFlags & getSpecialFlags function	2018-01-31 16:19:14 -08:00
Dante Ruiz	f6029ed9dc	made requested changes	2018-01-31 15:21:22 -08:00
Seth Alves	64a46bf5df	merge from upstream	2018-01-31 10:43:41 -08:00
Dante Ruiz	01f8227fa2	remove stray prints	2018-01-31 10:41:08 -08:00
Bradley Austin Davis	b97c938544	Merge pull request #12216 from thoys/feat/js-script-console-auto-complete JS scripting console auto-complete	2018-01-31 10:39:51 -08:00
Dante Ruiz	9ff6e079ee	fix functions	2018-01-31 10:09:23 -08:00
Dante Ruiz	4429be23c0	add comment	2018-01-31 09:13:11 -08:00
Dante Ruiz	9c81909be5	restructures _dirtyFlags name and bits	2018-01-30 16:42:08 -08:00
ZappoMan	cd4b3b1a54	Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters	2018-01-30 12:52:41 -08:00
Dante Ruiz	4c0a173287	trying another solution	2018-01-30 10:23:19 -08:00
Dante Ruiz	bed2ea052d	better solution	2018-01-30 09:44:49 -08:00
Dante Ruiz	eef2f656be	Merge branch 'master' of github.com:highfidelity/hifi into fix-parenting-crash	2018-01-30 08:43:35 -08:00
Dante Ruiz	68fd9eafa8	fix entity parenting crash	2018-01-29 10:23:24 -08:00
ZappoMan	efc63a41e9	make sure true results for delete actually work, add more examples	2018-01-26 18:49:55 -08:00
ZappoMan	b883d006c8	add flags to support asking for specific messages, update examples	2018-01-26 18:26:48 -08:00
ZappoMan	a3d86a0242	cleanup	2018-01-26 17:37:24 -08:00
ZappoMan	aa82ad8855	adjust client to only delete entities on server echo	2018-01-26 14:57:36 -08:00
ZappoMan	aea16fe071	add delete filter support	2018-01-25 15:01:29 -08:00
Thijs Wenker	ce50380698	fix JSAPI typo	2018-01-25 22:47:35 +01:00
ZappoMan	c96e395a46	fix warning	2018-01-25 12:13:32 -08:00
ZappoMan	4497302a2b	Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters	2018-01-25 11:39:56 -08:00
Seth Alves	1cbc2e31cf	merge from upstream	2018-01-23 15:21:03 -08:00
humbletim	9fb20bee80	remove extra space	2018-01-23 15:13:53 -05:00
humbletim	65455e7b50	Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes	2018-01-23 14:57:33 -05:00
John Conklin II	4697c5f92c	Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar Fix for avatars with crooked spine/head when exiting HMD mode	2018-01-22 11:50:44 -08:00
Anthony J. Thibault	cd4d9255bd	Added defaultPoseFlags to avatar protocol Change rotationSet to rotationIsDefaultPose for JointData Also for translation. Fixed all code to flip boolean value. Created EntityJointData so that the ModelEntity stuff doesn't need to change.	2018-01-19 15:34:27 -08:00
Seth Alves	9be2c67f00	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-01-19 11:46:34 -08:00
Seth Alves	bce9b5f459	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-01-19 09:53:54 -08:00
Andrew Meadows	75b5635d2f	less word salad	2018-01-18 17:43:22 -08:00
Andrew Meadows	3d3bfcf7a3	check dirty flags when harvesting physics results	2018-01-18 17:43:22 -08:00
ZappoMan	8364f64d4d	Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters	2018-01-18 15:08:27 -08:00
ZappoMan	25f5eb6b4f	named property example	2018-01-18 15:08:13 -08:00
Elisa Lupin-Jimenez	42b8c293d6	Merge pull request #12201 from elisa-lj11/qscriptvalue_macro_name Fixed typo in macro name	2018-01-18 14:44:43 -08:00
Seth Alves	31c007d167	more backwards logic, added withViewVisibilityMask call in ItemKey	2018-01-18 14:15:30 -08:00
Dante Ruiz	3e3b3a0a9e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dynamic-entities-not-colliding	2018-01-18 08:56:01 -08:00
Dante Ruiz	93594fb0bb	make dynamic entities collide with avatar when removing grab action	2018-01-18 08:55:51 -08:00
Seth Alves	76ef3d7c7d	pull from upstream	2018-01-18 07:01:50 -08:00
Elisa Lupin-Jimenez	49e72346a4	fixed typo in macro name	2018-01-17 18:08:05 -08:00
SamGondelman	134a026d8a	merge from master	2018-01-17 13:36:07 -08:00
Seth Alves	69a33428c0	Merge pull request #12078 from druiz17/soft-entities Soft Entities	2018-01-17 08:02:37 -08:00
Sam Gateau	d4571bd86a	Merge pull request #12181 from humbletim/rename-model-graphics Rename libraries/model -> libraries/graphics	2018-01-16 18:12:25 -08:00
NissimHadar	9a382ebb86	Merge pull request #12177 from NissimHadar/defaultAmbientFix Set ambient mode to inherit if no URLs have been entered.	2018-01-16 14:40:08 -08:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Nissim Hadar	a1415e28ff	If there is neither a skybox URL nor an ambient light uRL, then set the ambient mode to inherit.	2018-01-15 15:11:10 -08:00
SamGondelman	f1253e3c6c	fix crash on last frame = first frame, make last frame inclusive	2018-01-15 15:01:17 -08:00
Dante Ruiz	645f608814	fixing merge conflict	2018-01-15 10:45:51 -08:00
SamGondelman	241849139f	wip	2018-01-15 10:21:16 -08:00
Dante Ruiz	5b82c7bc41	fix merge conflict	2018-01-12 11:00:19 -08:00
Nissim Hadar	50a030b68b	Corrected copy of ambient URL.	2018-01-12 00:22:06 -08:00
Nissim Hadar	a1f25bf49c	Moved variable setting to outside of loop. Added copy of ambient URL.	2018-01-11 19:35:13 -08:00
Seth Alves	e7a3d98ae5	don't draw head-descendent entities when in 1st-person camera mode	2018-01-11 19:34:54 -08:00
Nissim Hadar	86cfeac95c	Moved variable setting to outside of loop.	2018-01-11 16:39:44 -08:00
Nissim Hadar	311e95e0d0	Corrected default values - for reading legacy content.	2018-01-11 14:57:22 -08:00
Nissim Hadar	4bd09fd9af	Corrected default values - for reading legacy content.	2018-01-11 14:53:58 -08:00
ZappoMan	612f9621b4	adding filter properties to allow optimization	2018-01-11 12:48:39 -08:00
Nissim Hadar	d225f803d0	Corrected default values.	2018-01-11 12:28:44 -08:00
Dante Ruiz	d0bff29471	fixing merge conflict	2018-01-10 10:11:53 -08:00
ZappoMan	3936dda099	Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters	2018-01-10 09:31:43 -08:00
Nissim Hadar	9f25b01b10	Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval	2018-01-10 09:30:05 -08:00
Sam Gateau	6d6aad4aa8	Merge pull request #12060 from SamGondelman/burp5 Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity	2018-01-10 09:08:54 -08:00
Dante Ruiz	c4253f3b3b	Merge branch 'master' of github.com:highfidelity/hifi into soft-entities	2018-01-09 15:31:38 -08:00
ZappoMan	734ba3a8c5	Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters	2018-01-09 15:29:20 -08:00
Nissim Hadar	4ecb056210	Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval	2018-01-09 13:44:13 -08:00
Nissim Hadar	c841ec6c8c	Copy Skybox URL to Ambient URL if background mode is Skybox and Ambient URL is blank.	2018-01-08 18:15:20 -08:00
Nissim Hadar	7811ddb904	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-08 15:39:09 -08:00
Nissim Hadar	b2b1807490	Changes per code review.	2018-01-08 15:37:06 -08:00
Nissim Hadar	46b494c802	Removed the Stage functionality - it is now implemented as a script.	2018-01-08 14:34:46 -08:00
SamGondelman	7c17603f3e	Merge remote-tracking branch 'upstream/master' into burp5	2018-01-08 14:27:31 -08:00
Melissa Brown	2fddace71e	Merge pull request #12019 from Delanir/C10594 Case 10594 - Fix entity property href not being able to reset (empty) ...	2018-01-08 14:22:28 -08:00
Nissim Hadar	0a21e5de04	Removed _backgroundPropertiesChanged	2018-01-08 12:07:21 -08:00
Nissim Hadar	d0c0d6a388	Set skybox mode as per legacy background mode if needed.	2018-01-08 11:50:28 -08:00
Nissim Hadar	93fffb4bbe	Removed PROP_BACKGROUND_MODE.	2018-01-07 14:21:22 -08:00
Nissim Hadar	8e793e790a	Deleted unused include file.	2018-01-07 14:11:26 -08:00
Nissim Hadar	8206ae6ffb	Removed BackgroundMode packet type.	2018-01-07 13:50:42 -08:00
Nissim Hadar	bc98cbd58f	Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance	2018-01-06 23:26:28 -08:00
nissim.hadar	1acf7bae20	Removed reference to BackgroundMode.	2018-01-06 23:24:28 -08:00
Nissim Hadar	d5be9365fe	Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance	2018-01-06 10:02:12 -08:00
nissim.hadar	33cc17a52f	Removing unused Background mode.	2018-01-06 02:27:49 -08:00
nissim.hadar	d2ac27f1b8	Code clean-up	2018-01-06 01:48:58 -08:00
nissim.hadar	579aec7118	Only check for zone fields.	2018-01-06 01:37:23 -08:00
Nissim Hadar	9e5eba4d3a	Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance	2018-01-05 23:11:40 -08:00
Nissim Hadar	d645163294	Fixed gcc warning.	2018-01-05 13:16:02 -08:00
Nissim Hadar	635fd2d0cf	Use older C++ version for Ubuntu	2018-01-05 12:48:21 -08:00
Nissim Hadar	3963c0a5a1	Code review improvements.	2018-01-05 12:22:20 -08:00
Nissim Hadar	cf7d6a2eab	Added correct use of legacy background combo.	2018-01-04 20:30:10 -08:00
Nissim Hadar	c10d2a5461	Added correct use of legacy background combo.	2018-01-04 19:48:25 -08:00
Nissim Hadar	adbc4d0c39	Removed background mode from code (still in the protocol).	2018-01-04 18:23:25 -08:00
Nissim Hadar	e797a77262	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance # Conflicts: # interface/resources/qml/js/Utils.jsc	2018-01-04 15:58:08 -08:00
Andrew Meadows	a51d83c6e4	rollback automatic priority promotion to RECRUIT	2018-01-04 15:53:03 -08:00
Andrew Meadows	7e01f97f8f	more correct volunteer ownership priority promotion	2018-01-04 15:53:03 -08:00
Andrew Meadows	fbe2dd8a41	remove unnecessary 'virtual' keyword	2018-01-04 14:46:16 -08:00
Andrew Meadows	13538006ec	fix bug preventing sim owenrship on local domain	2018-01-04 14:46:16 -08:00
Nissim Hadar	8bd2985f1f	Simplified code.	2018-01-04 13:06:28 -08:00
Nissim Hadar	e8770ec204	TEMPORARY fix for older content not containing these fields (keylight, skybox, ambient light).	2018-01-04 11:30:02 -08:00
Nissim Hadar	5b7ef9a3d3	Minor cleanup.	2018-01-04 09:13:58 -08:00
Dante Ruiz	674e8e1ac2	Merge branch 'master' of github.com:highfidelity/hifi into soft-entities	2018-01-03 08:47:40 -08:00
humbletim	513a69cdcd	changes per CR feedback	2018-01-03 04:08:43 -05:00
ZappoMan	f639e950e9	Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters	2018-01-02 15:47:36 -08:00
Dante Ruiz	6fa3446c57	joints are being relayed to children	2018-01-02 13:54:13 -08:00
Clément Brisset	d6bc41db60	Merge pull request #12075 from highfidelity/stable Stable merge back into master	2018-01-02 13:24:03 -08:00
Dante Ruiz	be9bf31843	Merge branch 'master' of github.com:highfidelity/hifi into soft-entities	2018-01-02 08:04:26 -08:00
nissim.hadar	b56c7535d2	Added legacy functionality (for zones that used Background "skybox")	2017-12-30 12:25:58 -08:00
druiz17	0ebbb76b49	fixed property over written issue and start relaying joints	2017-12-29 16:12:40 -08:00
Nissim Hadar	7260b4ff7b	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance # Conflicts: # libraries/entities/src/EntityPropertyFlags.h	2017-12-29 15:16:14 -08:00
Dante Ruiz	30bbe6e41b	added relayParentJoints property	2017-12-28 15:43:59 -08:00
Nissim Hadar	64644fc980	WIP - skybox inheritance	2017-12-28 14:31:59 -08:00
Nissim Hadar	4ffd896ced	WIP - adding AmbientLightPropertyGroup	2017-12-26 11:15:33 -08:00
Nissim Hadar	1fa8f7c55b	WIP - adding AmbientLightPropertyGroup	2017-12-26 09:15:45 -08:00
Nissim Hadar	0b73e7db3f	WIP - adding AmbientLightPropertyGroup	2017-12-26 09:15:13 -08:00
Nissim Hadar	3f82e9147b	Change keylight/ambient mode default from "enabled" to "inherit"	2017-12-22 16:30:19 -08:00
Nissim Hadar	8ee5f642a9	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance # Conflicts: # libraries/networking/src/udt/PacketHeaders.cpp # libraries/networking/src/udt/PacketHeaders.h	2017-12-22 15:41:59 -08:00
Seth Alves	96197e66bb	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 15:13:02 -08:00
Dante Ruiz	86be684d7a	delete code	2017-12-22 14:58:32 -08:00
Dante Ruiz	e316f71b31	fix grabbing	2017-12-22 14:53:48 -08:00
SamGondelman	5018edcfe0	reduce calls to getVisible	2017-12-22 12:59:06 -08:00
Seth Alves	533aa3d918	code review	2017-12-22 09:07:16 -08: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
Zach Fox	07a1cf434a	IT'S WORKING!!!	2017-12-21 16:33:47 -08:00
Zach Fox	373ef6c6ce	Progress?	2017-12-21 16:32:20 -08:00
Zach Fox	a2f2c23337	Change three lines of code. Fix one thing. Break another.	2017-12-21 16:32:15 -08:00
Zach Fox	73eb258e79	IT'S WORKING!!!	2017-12-21 15:17:52 -08:00
Zach Fox	e963673409	Progress?	2017-12-21 14:08:18 -08:00
humbletim	a146b778f7	support additional .extraInfo for ray intersections	2017-12-21 12:35:13 -05:00
Nissim Hadar	58c6f8e9c4	Radio buttons now work correctly.	2017-12-20 19:17:18 -08:00
Zach Fox	b30d3fcc12	Change three lines of code. Fix one thing. Break another.	2017-12-20 15:40:10 -08:00
Nissim Hadar	d4b34b71ad	First version with packet update.	2017-12-20 13:12:07 -08:00
ZappoMan	45f07718d3	Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters	2017-12-19 12:59:17 -08:00
Andrew Meadows	bad2c1df76	proper modulus of animation frame	2017-12-19 10:40:17 -08:00
Seth Alves	63ac426bf2	fix logic that resets own-avatar collisions after a parenting grab is released	2017-12-19 08:13:44 -08:00
Seth Alves	ca45c4e8da	fix logic that resets own-avatar collisions after a parenting grab is released	2017-12-18 17:30:56 -08:00
Zach Fox	a2fe2797ff	Merge pull request #11982 from zfox23/commerce_staticCertVersioning Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()	2017-12-18 15:20:23 -08:00
Daniela Fontes	7ca4a21a91	Fix entity property href not being able to reset (empty) once it was set with the correct input for the first time.	2017-12-18 21:00:29 +00:00
Andrew Meadows	cfd2097f36	Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js Cleanup names of debug stats and trace contexts.	2017-12-18 10:02:42 -08:00
Brad Hefta-Gaub	5087893097	Merge pull request #11804 from amantley/character_entity_fixes Fixed Entity Animation Property not applying to FBXs	2017-12-15 15:31:11 -08:00
ZappoMan	17288386ae	implement support for zone properties in filters	2017-12-15 10:42:29 -08:00
ZappoMan	5a843b1342	adding support for filters to get old properties	2017-12-14 11:14:09 -08:00
amantley	5bc113c818	deleted some debug print statements in ModelEntityItemcpp and deleted else statement that was superfluous	2017-12-13 19:07:23 -08:00
Zach Fox	4980c769c0	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning	2017-12-13 17:30:19 -08:00
Zach Fox	d388ca5ac9	Missed a spot. That was the problem the whole time.	2017-12-13 11:22:31 -08:00
Zach Fox	7113a72f2e	Bugfixes	2017-12-12 18:04:20 -08:00
Stephen Birarda	139976d8bb	allow staging METAVERSE_SERVER_URL to be toggled by env	2017-12-12 16:22:08 -08:00
Zach Fox	bced55801d	ABC ORDER!	2017-12-12 15:52:35 -08:00
Zach Fox	f5df83667f	Add getStaticCertificateJSON() to Entity Scripting Interface	2017-12-12 15:50:04 -08:00
Zach Fox	1bd12857ef	Add static certificate JSON versioning; add serverScripts to cert JSON	2017-12-12 12:07:08 -08:00
amantley	079d9639e4	Got rid of the while loop in updateFrameCount in ModelEntityItem_cpp	2017-12-12 09:12:11 -08:00
amantley	29538851b6	Made the changes from the latest code review, except getting rid of the while loop.	2017-12-12 09:06:43 -08:00
Andrew Meadows	406bf7898d	cleanup prof stats and trace context names	2017-12-11 11:31:00 -08:00
amantley	65bb896450	Merge remote-tracking branch 'origin/master' into character_entity_fixes	2017-12-11 10:55:54 -08:00
Seth Alves	c4b2422f53	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-07 19:40:52 -08:00
David Kelly	42b509639b	Fix certificate hash	2017-12-07 17:22:00 -08:00
Seth Alves	40412b80c6	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-07 17:03:04 -08:00
Dante Ruiz	0f3a70553c	fix dynamic entities that are parented to your avatar	2017-12-06 11:18:15 -08:00
Dante Ruiz	8af1d8d8d0	dont run code if not nesscassry	2017-12-05 15:48:09 -08:00
Dante Ruiz	c58286d371	dont do work if not needed	2017-12-05 09:31:35 -08:00
Dante Ruiz	486cdf14d2	make sure that NO_BOOTSTRAPPING is disbaled correctly if parent is changed	2017-12-04 15:34:53 -08:00
Dante Ruiz	a1bf54ff00	fix issue of no_bootstrapping not being set correctly	2017-12-04 11:16:41 -08:00
Dante Ruiz	03934549cc	Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children	2017-12-04 09:08:11 -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
Dante Ruiz	1e6b5c0c75	make requested changes	2017-12-01 17:09:00 -08:00
Dante Ruiz	a1d90b5dd9	added extra bit	2017-12-01 15:41:13 -08:00
ZappoMan	750d505f9b	fix issues in model import sizing caused by recent refactor	2017-11-30 17:51:59 -08:00
Bradley Austin Davis	59aea9c401	Merge pull request #11862 from jherico/android_nov Make buildable APK from Gradle	2017-11-30 11:23:29 -08:00
howard-stearns	57ec73bb13	spacing	2017-11-29 14:37:20 -08:00
amantley	233d693d76	removed debug print statements and fixed negative FPS handling	2017-11-29 10:51:04 -08:00
amantley	778d98f56b	made some changes to fix coding standard problems in the code, also added the update for the EntityItem base class to the update function	2017-11-28 18:42:03 -08:00
howard-stearns	281b4cfd88	Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA	2017-11-28 16:59:44 -08:00
Bradley Austin Davis	e4220aa44e	Fixing warnings in android build	2017-11-28 14:32:30 -08:00
amantley	101e67498a	cleaned up the code to remove _currentFrame updating in RenderModelEntityItem also removed the unnessary currently playing frame property	2017-11-28 14:11:56 -08:00
amantley	1eacf7cbda	Merge remote-tracking branch 'origin/master' into character_entity_fixes This is to update the branch with the master branch	2017-11-28 11:41:29 -08:00
amantley	d607ca0914	initialize the _lastAnimated time when the modelEntityRenderer is instantiated, this fixes the sync between interface and the server	2017-11-28 11:04:48 -08:00
howard-stearns	1575119327	PR feedback	2017-11-27 10:46:57 -08:00
amantley	522dc3dfb1	Merge remote-tracking branch 'origin/master' into character_entity_fixes updating Character entity fixes branch with the changes in the origin master	2017-11-22 17:55:39 -08:00
amantley	2e75016021	changes to modelEntity.cpp	2017-11-22 17:53:21 -08:00
amantley	fdf5139a74	everything now works with an atomic start time property. but now I will get rid of this and use current frame instead	2017-11-22 17:52:13 -08:00
howard-stearns	a6b437a79f	get rid of "error" warning because the key wasn't broken into 64 char lines	2017-11-22 16:55:57 -08:00
Seth Alves	9ccc416e80	avoid a crash during domain change	2017-11-22 16:34:56 -08:00
howard-stearns	abf41300dd	refactor	2017-11-22 16:29:56 -08:00
howard-stearns	899999a4c6	fix up dynamic ownership challenge	2017-11-22 15:58:30 -08:00
amantley	1e5d099b06	changed the currentlyplayingframe property so that it is updated in RenderableModelEntity.cpp now. Remains to remove everything but initializing currentlyPlayingFrame in ModelEntityRender.cpp	2017-11-21 17:36:01 -08:00
howard-stearns	ca80c9b764	Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet	2017-11-21 16:28:08 -08:00
ZappoMan	3a967ca895	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-21 10:53:29 -08:00
Thijs Wenker	627fee80ec	added support for exporting parentJointName	2017-11-21 01:49:56 +01:00
Thijs Wenker	c3754d6369	smart pointer	2017-11-20 23:24:03 +01:00
amantley	5a1d04ee06	Merge remote-tracking branch 'origin/master' into character_entity_fixes updating the branch with the current master	2017-11-20 10:22:46 -08:00
Thijs Wenker	e94199acad	Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName	2017-11-20 18:29:54 +01:00
Thijs Wenker	84ec9890ca	reverted special property case, parentJointName is now only parsed from the JSON import	2017-11-20 18:29:33 +01:00
amantley	befa0f8ab5	now the update frame is only happening in the assignment client code. added setCurrentlyPlayingFrame to ModelEntityItem.cpp	2017-11-20 09:11:15 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub	ebac2556e4	Merge pull request #11841 from ZappoMan/makeAddEntityAtomic Make add entity atomic	2017-11-18 14:27:12 -08:00
amantley	013d16cee9	this is the change to add a property for the currentframeplaying	2017-11-17 18:37:54 -08:00
ZappoMan	71a46a3374	cleanup	2017-11-17 13:03:04 -08:00
Stephen Birarda	239b116874	Merge pull request #11835 from birarda/bug/octree-connection-id Reset EntityTreeSendThread known state if client disconnects from Entity Server	2017-11-17 12:56:25 -08:00
Thijs Wenker	3c37bf8acd	parentJointName property experiment	2017-11-17 20:33:06 +01:00
Andrew Meadows	98001b64d9	Merge pull request #11788 from ctrlaltdavid/21579-a Particles emitter fixes	2017-11-17 11:31:12 -08:00
H Q	28eedd1a94	Small style mod	2017-11-17 11:30:21 -08:00
Stephen Birarda	dd27e3db31	add diff traversal reset when resetting state	2017-11-17 09:44:35 -08:00
ZappoMan	cd0fa989e1	debugging	2017-11-17 08:55:55 -08:00
H Q	21a28827c9	Remaining coding style changes, other small fixes	2017-11-17 07:59:52 -08:00
amantley	20fd893b47	Starting to implement the update function to ModelEntityItem_cpp Also put access to the currently playing frame in RenderableModelEntityItem_cpp	2017-11-16 18:38:28 -08:00
amantley	ded81fcab0	Merge remote-tracking branch 'origin/master' into character_entity_fixes Updating the branch to the latest code	2017-11-16 13:53:17 -08:00
amantley	881b22ab15	added update function to modelEntityItem.cpp	2017-11-16 12:41:56 -08:00
H Q	14890495a2	Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet Syncing	2017-11-16 12:38:45 -08:00
H Q	27350ddbfc	Coding style corrections	2017-11-16 12:35:00 -08:00
Andrew Meadows	d538a9aaa8	fix typo making cylinders collide as sphere	2017-11-15 09:04:04 -08:00
H Q	0db9e876d6	Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet	2017-11-14 15:40:44 -08:00
H Q	44f2c92d30	Final ECSDA and nonce modifications for this dev cycle	2017-11-14 15:40:29 -08:00
David Rowe	2c542b73a0	Fix particles emitter rendering not updating when edit textures URL	2017-11-10 10:22:35 +13:00
amantley	3ce65ece87	Merge remote-tracking branch 'upstream/master' into character_entity_fixes this is just to synch this branch with the upstream master	2017-11-09 10:38:34 -08:00
amantley	af0304fd6b	preliminary changes for the property fixes	2017-11-09 10:04:12 -08:00
Clément Brisset	85efe5265d	Merge pull request #11724 from ctrlaltdavid/21580 Fix serverScripts not being able to see entities in parent/child tree	2017-11-07 10:36:20 -08:00
David Rowe	05275afb4f	Resending full scene is not necessary after all	2017-11-05 15:48:02 +13:00
David Rowe	2d27a6cf4c	Merge branch 'master' into 21580	2017-11-05 13:59:43 +13:00
ZappoMan	d4b4d188ed	allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU	2017-11-04 13:40:41 -07:00
ZappoMan	74ceab1e68	fix mac and unic build	2017-11-02 19:30:39 -07:00
ZappoMan	baff900839	cleanup some writeLocks	2017-11-02 17:46:15 -07:00
ZappoMan	b5199220ab	cleanup SpatiallyNestable Velocity to match WorldVelocity naming	2017-11-02 17:07:53 -07:00
ZappoMan	53c6eeb58b	updatePosition now setPosition	2017-11-02 15:58:50 -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	bb1ffbc06f	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests	2017-11-01 12:38:34 -07:00
Zach Fox	b335ba9a75	Timeout timer	2017-11-01 11:34:29 -07:00
Zach Fox	8a6a744099	It's working	2017-11-01 10:46:13 -07:00
David Rowe	328fc29bc5	Fix serverScripts not being able to see entities in parent/child tree	2017-11-01 17:01:19 +13:00
Zach Fox	93308dfcd3	Why did I think this would work before?	2017-10-31 16:21:10 -07:00
Nissim Hadar	03d2ca19b9	Moving consts into mode::Haze namespace.	2017-10-31 13:46:58 -07:00
Zach Fox	e9c144892a	Fixes	2017-10-31 13:11:32 -07:00
Zach Fox	f5ada4fe62	Will it compile?	2017-10-31 12:33:28 -07:00
Zach Fox	6f96e0c7bd	More progress	2017-10-31 12:14:12 -07:00
Zach Fox	90e9251176	It's a start	2017-10-31 11:28:19 -07:00
Nissim Hadar	f3147fc24f	Merge branch 'master' into hazeZone	2017-10-30 21:41:23 -07:00
Nissim Hadar	3ddf970be3	Removed haze init variables from the model namespace.	2017-10-30 21:40:14 -07:00
Nissim Hadar	636f7858a3	Removed _degs and _m suffixes.	2017-10-30 19:45:08 -07:00
Brad Hefta-Gaub	c1a808e726	Merge pull request #11703 from AndrewMeadows/circles-and-quads fix Circles and quads	2017-10-30 18:03:32 -07:00
Zach Fox	19420a0ff2	Move static cert verify to properties	2017-10-30 17:01:55 -07:00
Nissim Hadar	5fc68cae0d	Converted Haze initialization values to static.	2017-10-30 11:51:19 -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
Nissim Hadar	fb6c5b98d6	Merge branch 'master' into hazeZone	2017-10-27 15:40:03 -07:00
Nissim Hadar	a5a135c2ba	Fixes for 8672-8674.	2017-10-27 15:39:14 -07:00
ZappoMan	1000318dff	tweak min dimension to match current behavior	2017-10-27 14:26:02 -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
Andrew Meadows	2c4d4373dc	support asymmetrical cross section Cylinder	2017-10-27 10:41:16 -07:00
Nissim Hadar	420b0f321c	Merge branch 'master' into hazeZone	2017-10-27 09:14:53 -07:00
Nissim Hadar	66c31caf4b	Refactoring of the haze	2017-10-27 09:08:58 -07:00
Andrew Meadows	474609dabf	enforce dimensions of Circles and Quads	2017-10-26 22:58:24 -07:00
Andrew Meadows	901e145712	remove redundant dimensionsChanged()	2017-10-26 22:57:33 -07:00
ZappoMan	431ee58577	more cleanup	2017-10-26 21:30:59 -07:00
ZappoMan	e5becba4e9	migrate away from updateXXX standardize on setXXX	2017-10-26 20:38:07 -07:00
Sam Gondelman	863a2041a6	Merge branch 'master' into pointerEvents	2017-10-25 17:22:19 -07:00
Andrew Meadows	2d0b94817c	Merge pull request #11336 from 1P-Cusack/21389_PR2 WL21389 PR2: Representation of collision shapes need updating (details below).	2017-10-25 10:41:21 -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	5901d1a311	clean up VERSION_ENTITIES stuff	2017-10-24 13:48:27 -07:00
ZappoMan	a1885926b5	some cleanup	2017-10-24 11:46:42 -07:00
LaShonda Hopper	dbd1a80046	[WL21389] Set Simulation::DIRTY_SHAPE flag when entity::Shape changes (details below). * Fixes an issue where ShapeEntityItem's collisionShapeType wasn't updated when its entity::Shape type was changed. * Adds getNameForShapeType static method to ShapeInfo. ** Moves shapeTypeNames[] from EntityItemProperties.cpp to ShapeInfo.cpp * Adds collisionShapeType to ShapeEntityItem::debugDump * Tested creating shapes within the Creation Menu: Create Menu -> (Box/Sphere) * Observe Properties tab auto-focus ** From Properties tab elect alternate shape type from the Shape Dropdown list. NOTE: While this fixes an issue with the collision shape, it doesn't completely resolve the issues seen with the polyhedra or polygonal shapes noticed on RELEASE-7130 rebase. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: libraries/entities/src/EntityItemProperties.cpp modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/shared/src/ShapeInfo.cpp modified: libraries/shared/src/ShapeInfo.h	2017-10-24 14:16:24 -04:00
LaShonda Hopper	789b850846	[WL21389] Addresses feedback from PR #11336 . * Removes todos from ShapeEntityItem::shapeCalculator stub commit. * Removes defined out debugging, as requested, from GeometryCache::computeSimpleHullPointListForShape. * Moves cone handling to its own section for better contextual flow. Changes Committed: modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/render-utils/src/GeometryCache.cpp	2017-10-24 14:16:23 -04:00
LaShonda Hopper	5b50b362f1	[WL21389] WL21389 PR2: Representation of collision shapes need updating (details below). This commit adds support for the polyhedrons and polygons sans Torus and Quad which aren't currently supported within GeometryCache. * Moves GeometryCache::_shapes from public to private scope * Nothing aside from the class should be directly altering this, only querying * Updated instances of direct referencing which looks to have been limited to prior testing of instancing and shapes. * Adds an accessor function for ShapeData to GeometryCache * Consolidates point list generation to helper function * GeometryCache::computeSimpleHullPointListForShape * Moves GeometryCache::Shape to entity::Shape mapping to GeometryCache from RenderableShapeEntityItem * Adds conversion accessor to GeometryCache, GeometryCache::Shape getShapeForEntityShape * Sets ShapeEntityItem::ShapeInfoCalculator callback committed earlier. * This helps circumvent the issue with library inclusion. entity-render knows about entity; however, entity doesn't know about entity-renderer; however, GeometryCache data is needed within entity::ShapeEntityItem to compose the ShapeInfo point list data. * This callback is set up within Application::init of the Interface as it knows about both halves of the equation, and the callback needs to be setup prior to any entities collision data getting generated. * Removes _type reset within ShapeInfo::setPointCollection * This should avoid any issues due to subversively setting the type or incorrectly setting the type as a tangential operation. * Audited instances of ShapeInfo::setPointCollection and all seemed to be calling the function immediately after having set the type via ShapeInfo::setParams * Adds new ShapeType: SHAPE_TYPE_CIRCLE * This type is reserved for the circle which is now treated as a special type of Cylinder_Y with regard to collision as opposed to a simple hull. * Fixes the issue where jumping on a circle, at times, would result in the avatar sliding off towards an edge as if atop a squished cone. * Also updates ShapeInfo::getType() to return ShapeType as opposed to int * Auditing calls showed that majority of places were comparing against ShapeType * ShapeType::_type is a ShapeType so returning the type explicitly is more consistent. * ShapeInfo file houses ShapeType enum so any file aware of ShapeInfo is aware of ShapeType enumeration. * entity::Quad defaults to SHAPE_TYPE_ELLIPSOID * Like entity::Shape::Torus, entity::Shape::Quad is currently unsupported within GeometryCache::buildShapes. * Also it appears that a Quad shape can't be created within world via the creation menu. * There's no explicit option at present to create one. * Trying subvert the Cube/Box creation option to generate one results in an enforced stubby box as opposed to a quad. * Given the aforementioned points, entity::Shape::Quad will default to SHAPE_TYPE_ELLIPSOID as opposed to SHAPE_TYPE_BOX. * Added Todo regarding the shape being unsupported along with a notation to create a special ShapeType, SHAPE_TYPE_QUAD, for it should it be added in the future. * Adds some comments and has some minor clean up. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: interface/src/Application.cpp modified: interface/src/Util.cpp modified: interface/src/Util.h modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/render-utils/src/GeometryCache.cpp modified: libraries/render-utils/src/GeometryCache.h modified: libraries/shared/src/ShapeInfo.cpp modified: libraries/shared/src/ShapeInfo.h modified: tests/gpu-test/src/TestInstancedShapes.cpp	2017-10-24 14:16:17 -04:00
ZappoMan	1128a98e88	implement callEntityClientMethod	2017-10-24 11:15:57 -07:00
Andrew Meadows	9981a44b71	add hook for ShapeInfo calculator	2017-10-24 14:15:08 -04: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	3e139283ba	Remove unnecessary newlines	2017-10-23 17:31:21 -07:00
Zach Fox	97d44e62c8	Fix bugs	2017-10-23 16:52:32 -07:00
Zach Fox	53081b51a6	Clean up as much as possible	2017-10-23 16:00:39 -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	a7e21d7e76	add remotelyCallable and remoteCallerID to provide additional security to Entities.callEntityServerMethod()	2017-10-22 14:30:58 -07:00
ZappoMan	934c9479af	implement support for Entities.callEntityServerMethod()	2017-10-21 20:27:35 -07:00
Sam Gateau	7754061505	Merge pull request #11634 from highfidelity/hazeZone Fogbugz 8477: Crash on loading older domains that have zones without the haze component.	2017-10-20 16:01:13 -07:00
Seth Alves	2b0285adc2	fix action (grab) deadlock	2017-10-20 15:05:21 -07:00
Nissim	5d0deaf946	Code review fixes.	2017-10-20 14:27:27 -07:00
Nissim	00c99d3d02	Corrected wrong else format.	2017-10-20 13:53:53 -07:00
Brad Hefta-Gaub	d6ad389dab	Merge pull request #11611 from AndrewMeadows/faster-update-renderables Faster renderables update	2017-10-20 13:43:08 -07:00
Nissim	b0ca1353e4	Implemented Haze mode default.	2017-10-20 13:32:27 -07:00
Zach Fox	9e68e805a0	Get marketplace public key from backend	2017-10-20 10:38:59 -07:00
Zach Fox	c99e803ab7	Error handling	2017-10-19 17:19:37 -07:00
Zach Fox	74180bc4cd	Implement static cert verification correctly	2017-10-19 16:39:13 -07:00
Zach Fox	0dc6211a7d	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 14:43:33 -07:00
Nissim	d01ecb71df	Fixed gcc warning.	2017-10-19 14:41:02 -07:00
Nissim	e314ee432e	Fixed gcc warning.	2017-10-19 14:20:47 -07:00
Nissim	9af87d46f2	Removed optimize pragma.	2017-10-19 13:51:33 -07:00
Nissim	61fc45c6bf	Merge branch 'master' into hazeZone	2017-10-19 13:39:18 -07:00
Nissim	edd256c600	Fixed crash on invalid HazeMode.	2017-10-19 13:36:32 -07:00
Seth Alves	2c8c5e214c	puff querybox if entity is in motion	2017-10-19 13:19:41 -07:00
Seth Alves	e8ca455547	cleanups + call updateQueryAACube when parent changes or action is deleted	2017-10-19 13:19:35 -07:00
Seth Alves	c1e8d5144c	remove code which is no longer needed because of custom physics setters	2017-10-19 13:19:25 -07:00
Seth Alves	f2cb5d4aff	clean-up concept of puffed queryAACube	2017-10-19 13:19:13 -07:00
Seth Alves	ae70f091c3	don't accept updates to queryAACube if this interface is simulation owner	2017-10-19 13:18:45 -07:00
Seth Alves	f75e59c0a6	keep grabbed and worn entities from spamming entity-server	2017-10-19 13:18:37 -07:00
Daniela	832e30ad1c	Edited Packet headers.	2017-10-19 19:53:47 +01:00
Zach Fox	9537e19ad4	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 10:58:55 -07:00
Nissim	a641d6de66	Variable rename.	2017-10-17 09:18:29 -07:00
Zach Fox	e1b0e5a2dd	Move some include files around	2017-10-16 16:00:32 -07:00
Zach Fox	a4b8bf0be6	Bugfixes and CR	2017-10-16 15:33:10 -07:00
SamGondelman	c6b636901a	fewer undesirable couplings	2017-10-16 13:46:23 -07:00
Zach Fox	3c572b0f7a	Fix deadlock	2017-10-16 13:41:39 -07:00
Zach Fox	960f1fbfe4	Still broken, but safer	2017-10-16 13:28:14 -07:00
SamGondelman	d274d99411	merge from master	2017-10-16 12:17:37 -07:00
Andrew Meadows	23bb8608b1	minor optimizations in updateModelBounds()	2017-10-16 11:52:30 -07:00
Andrew Meadows	e109101acc	update profiling timers	2017-10-16 11:52:30 -07:00
Zach Fox	febc725520	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57	2017-10-16 09:53:15 -07:00
SamGondelman	5bfb0baf09	const references	2017-10-13 14:38:46 -07:00
Nissim Hadar	afb8b2d8e7	Merge branch 'master' into hazeZone	2017-10-13 13:40:06 -07:00
Nissim Hadar	9c9dfc7211	Replace light blend with glare.	2017-10-13 13:36:46 -07:00
Nissim Hadar	c76229934c	Changed blend-in colour and blend-out colour to colour and glare colour	2017-10-13 12:21:00 -07:00
Nissim Hadar	5bfbaf4860	Renamed HazeMode to ComponentMode.	2017-10-13 11:24:56 -07:00
Bradley Austin Davis	4dcce6ef45	Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.	2017-10-12 17:37:05 -07:00
SamGondelman	cc8ecdc596	put back entity signals for scripts	2017-10-12 17:28:00 -07:00
Nissim Hadar	b1174ce40c	Merge branch 'master' into hazeZone	2017-10-12 17:04:42 -07:00
Zach Fox	1400c66506	Be a bit more thorough	2017-10-12 16:58:48 -07:00
Zach Fox	b56a38ca15	Re-add references to recentlyDeletedEntityItemIDs	2017-10-12 16:32:09 -07:00
Zach Fox	d75c0a00bb	Closer than ever	2017-10-12 16:29:05 -07:00
Zach Fox	6a47884fcf	Cleanup and fix	2017-10-12 13:41:19 -07:00
Brad Hefta-Gaub	1bba5ff812	Merge pull request #11554 from sethalves/import-av-entities Import av entities	2017-10-12 13:30:53 -07:00
SamGondelman	1a047613bf	fix pointerevents on entities from scripts	2017-10-12 12:31:36 -07:00
Zach Fox	50446619f5	Remove unnecessary (?) references to _recentlyDeletedEntityItemIDs	2017-10-12 11:59:46 -07:00
Zach Fox	abe1cd1b51	Minor cleanup	2017-10-12 11:53:47 -07:00
Zach Fox	0e96fc5cab	It's working!	2017-10-12 11:37:26 -07:00
SamGondelman	53fde83922	cleaning up pointerevents, wip	2017-10-12 11:21:50 -07:00
Nissim Hadar	dc45c7af75	Implemented radio-buttons.	2017-10-12 11:18:18 -07:00
Zach Fox	5efa920712	Getting closer	2017-10-12 11:13:23 -07:00
Nissim Hadar	a21995db24	Added checkbox for altitude effect.	2017-10-11 22:10:58 -07:00
Nissim Hadar	96fd3123e8	Changed haze altitude to ceiling.	2017-10-11 20:36:24 -07:00
Nissim Hadar	832f9fb6e3	Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.	2017-10-11 19:10:51 -07:00
Nissim Hadar	ea6b9ed28e	Removed ...ALTITUDE_MODE from combo.	2017-10-11 18:58:59 -07:00
Anthony J. Thibault	0a943fbe7b	Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread. When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke the destructor of Entities and Overlays, which is very NOT thread safe. The fix is to use a pattern already in use in several places in our codebase. Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place. This allows any thread to use shared_ptrs of SpatiallyNestables without fear.	2017-10-11 17:32:34 -07:00
Zach Fox	c3e66c9581	Fixes	2017-10-11 16:56:47 -07:00
Zach Fox	5a3a3c4937	What is going on	2017-10-11 15:05:45 -07:00
Zach Fox	fa1bfe0d19	Maybe fixes?	2017-10-11 14:10:33 -07:00
Zach Fox	d8b84e6875	Minor cleanup	2017-10-11 13:26:32 -07:00
Zach Fox	9e570fdba3	First pass at encryption/decryption. Exciting!	2017-10-11 13:08:04 -07:00
Zach Fox	f05c709693	Remove static certificate verification for now	2017-10-11 12:06:11 -07:00
Zach Fox	1f8b68c952	Updates now that endpoint exists; add pending timer	2017-10-11 11:46:35 -07:00
Zach Fox	0ae69b6ad9	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-10 12:38:14 -07:00
Daniela	a46ef56af9	Merge with hifi:master. Packet Headers version were increased.	2017-10-10 17:26:33 +01:00
Nissim Hadar	c9be5ea100	Merge branch 'master' of https://github.com/highfidelity/hifi into hazeZone	2017-10-09 18:01:48 -07:00
Nissim Hadar	7d5a887f43	Refactoring.	2017-10-09 17:25:19 -07:00
Seth Alves	23f41457be	Revert "Revert "fix importing of avatar entities"" This reverts commit `28a8b18060`.	2017-10-09 11:52:43 -07:00
Zach Fox	a7d43c63b6	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-09 11:38:13 -07:00
Andrew Meadows	0bcecdbe66	be picky when finding nearby entities at login	2017-10-09 10:27:46 -07:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub	62fc193bff	Merge pull request #11532 from sethalves/import-av-entities fix importing of avatar entities	2017-10-06 17:59:54 -07:00
Zach Fox	c70ee6055f	Don't clear cert ID if static properties change; updates to DDV	2017-10-06 17:12:40 -07:00
Zach Fox	59a6726af6	Checkpoint; lotsa changes...	2017-10-06 16:55:05 -07:00
Nissim Hadar	e34fb1c874	Merge branch 'master' into hazeZone	2017-10-06 13:20:12 -07:00
Zach Fox	1fa9bd8fc6	Better implementation of location change and bugfixes	2017-10-06 12:22:29 -07:00
Seth Alves	9064114ce5	fix mistaken logic-flip in recent PR	2017-10-06 11:03:48 -07:00
Seth Alves	f4dedf05bb	move variables into block that needs them	2017-10-06 11:02:26 -07:00
Nissim Hadar	320c888ce4	Added checkbox to allow separate control of keylight attenuation.	2017-10-05 20:31:45 -07:00
Nissim Hadar	cbaae2c79b	WIP - haze colour.	2017-10-05 12:59:56 -07:00
Seth Alves	b96fac2f00	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-05 11:43:25 -07:00
Seth Alves	53a49272dc	fix importing of avatar-entities	2017-10-05 11:43:19 -07:00
Nissim Hadar	1e2bd23c0b	Fixed typo in variable name.	2017-10-05 11:31:08 -07:00
Nissim Hadar	794cb961d5	Merge branch 'master' into hazeZone	2017-10-04 23:03:59 -07:00
Nissim Hadar	ad03301df8	WIP - implementing range+altitude mode.	2017-10-04 23:03:21 -07:00
Nissim Hadar	8b72e3044a	WIP - implementing range+altitude mode.	2017-10-04 22:26:53 -07:00
Nissim Hadar	6dcd8b7b57	Haze Range works.	2017-10-04 21:47:20 -07:00
Zach Fox	27d6cc2657	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-04 15:49:33 -07:00
Zach Fox	4cfb860e23	Wow, this actually seems to be working	2017-10-04 15:45:12 -07:00
Zach Fox	f974672e7b	Working way better than I expected	2017-10-04 15:19:06 -07:00
Zach Fox	b35eaf2cc8	Throw a bunch of code at the wall and hope some sticks	2017-10-04 15:06:55 -07:00
Zach Fox	f7ea50ef3b	Free memory	2017-10-04 14:02:28 -07:00
Nissim Hadar	eef778a463	Replaced uint8_t with uint32_t in server packet.	2017-10-04 13:47:13 -07:00
Zach Fox	cf7c1934f8	Progress?	2017-10-04 13:16:33 -07:00
Nissim Hadar	62cfaaaf38	Sam's corrections.	2017-10-04 12:56:14 -07:00
Zach Fox	ab08dc6bd6	Progress?	2017-10-04 12:33:58 -07:00
Nissim Hadar	2ce86ebfae	WIP - working on byte order in server messages.	2017-10-04 11:56:35 -07:00
Nissim Hadar	3f677ec7c9	WIP - working on byte order in server messages.	2017-10-04 10:23:59 -07:00
Zach Fox	2cdd5c29f3	Uncertified rez rights	2017-10-04 09:58:29 -07:00
Nissim Hadar	8c430d36fa	WIP - working on byte order in server messages.	2017-10-03 21:59:40 -07:00
Nissim Hadar	76f843c741	WIP - working on byte order in server messages.	2017-10-03 21:46:50 -07:00
Nissim Hadar	75509b9ecb	WIP - working on byte order in server messages.	2017-10-03 21:39:41 -07:00
Nissim Hadar	4019c3bc10	WIP - working on byte order in server messages.	2017-10-03 21:36:20 -07:00
Nissim Hadar	3505fedc00	WIP - working on byte order in server messages.	2017-10-03 21:34:21 -07:00
Nissim Hadar	16a10a8a0c	WIP - working on byte order in server messages.	2017-10-03 20:57:56 -07:00
Nissim Hadar	89381e7c8e	Moved _hazeProperties.getProperties(properties); into the ReadLock	2017-10-03 19:43:35 -07:00
Nissim Hadar	c1f4735468	Replaced HazeMode with uint8_t in transport protocol.	2017-10-03 19:39:34 -07:00
Brad Hefta-Gaub	a1979a2600	Merge branch 'master' into RC-56	2017-10-03 18:16:21 -07:00
Nissim Hadar	d4acb00aa5	Merge branch 'master' into hazeZone	2017-10-03 17:44:31 -07:00
Zach Fox	ed40e41b94	Potential progress? Not totally sure	2017-10-03 16:18:29 -07:00
SamGondelman	fc6e5df2cb	fix text/web registration point usage	2017-10-03 15:02:21 -07:00
SamGondelman	c9d2d40e1e	possibly fix registration offset issue	2017-10-03 14:44:11 -07:00
Zach Fox	9c4b02c659	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-03 14:37:07 -07:00
Zach Fox	b7e50c5b73	First steps	2017-10-03 14:36:22 -07:00
Seth Alves	6040c4a3e8	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-03 14:06:01 -07:00
Seth Alves	05e173a1d0	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-03 13:11:03 -07:00
Anthony J. Thibault	1389c2e31d	Bug fix for deadlock in ModelEntityItem::setCompundShapeURL() The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache) is made around the _compoundShapeURL QString.	2017-10-03 12:15:23 -07:00
Nissim Hadar	86c497a12f	Merge branch 'master' into hazeZone # Conflicts: # libraries/networking/src/udt/PacketHeaders.cpp # libraries/networking/src/udt/PacketHeaders.h	2017-10-03 10:34:33 -07:00
Daniela	2b18296cfd	Merge remote-tracking branch 'upstream/master' # the commit.	2017-10-03 15:26:22 +01:00
Daniela	1d6985a9eb	Fix Animation hue bug.	2017-10-03 15:25:54 +01:00
Nissim Hadar	93a2776cb5	Changes for debug	2017-10-02 18:13:23 -07:00
Seth Alves	e7fa8131ea	make json importer understand AVATAR_SELF_ID	2017-10-02 16:44:03 -07:00
Howard Stearns	9b0ebf0e07	doh! string not boolean	2017-10-02 16:18:28 -07:00
Seth Alves	ca11d19b3e	allow importing of avatar entities from json	2017-10-02 16:06:44 -07:00
Howard Stearns	0b7af66016	more linux warnings	2017-10-02 15:38:59 -07:00
Howard Stearns	136381adb9	fatal compiler warning on mac/linux	2017-10-02 13:56:15 -07:00
Howard Stearns	7b0321c1e1	guess for mac/linux openssl	2017-10-02 12:30:25 -07:00
Howard Stearns	5c5f052bc2	explicit free, and remove header that isn't available on mac/linux	2017-10-02 10:28:47 -07:00
Howard Stearns	0f6884dd80	fix mac/linux compiler error	2017-10-02 09:44:10 -07:00
Nissim Hadar	bdd469cec4	Integrated haze shader into this branch.	2017-10-01 21:52:34 -07:00
Nissim Hadar	951ce247a2	Working on adding zone to haze.	2017-09-29 17:36:14 -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
Nissim Hadar	2e1919eba5	Merge branch 'master' into hazeZone	2017-09-29 15:16:46 -07:00
Nissim Hadar	f26345a3f0	Working on adding zone to haze.	2017-09-29 15:15:49 -07:00
Zach Fox	96b6a2f013	Fix entity add after incomplete rezCertified implementation (cherry picked from commit `0f66fb41fd`)	2017-09-29 13:27:21 -07:00
Andrew Meadows	8134e2b7f9	fix const violation	2017-09-29 11:34:36 -07:00
Andrew Meadows	32910e6f40	use [this] for lambda capture list	2017-09-29 11:34:35 -07:00
Andrew Meadows	f5f1a64c92	use const ref on pointer, and use dynamic_cast	2017-09-29 11:34:35 -07:00
Andrew Meadows	b16d666026	remove dupe addToNeedsParentFixupList() call	2017-09-29 11:34:35 -07:00
Andrew Meadows	5dcd6bc496	namechange: apparentAngle --> angularDiameter	2017-09-29 11:34:35 -07:00
Andrew Meadows	1c30f7424e	remove cruft and add comments	2017-09-29 11:34:35 -07:00
Andrew Meadows	49e11d2173	fix Differential scan logic for LOD culling	2017-09-29 11:34:35 -07:00
SamGondelman	f2de03bc38	small fixes and LOD cull children instead of parent	2017-09-29 11:34:35 -07:00
Andrew Meadows	355a59edb1	fix missing entities in differential traversal	2017-09-29 11:34:35 -07:00
SamGondelman	defed80be7	edited entities are not repeatedly sent if out of view, handles cases where usesViewFrustum changes	2017-09-29 11:34:34 -07:00
SamGondelman	7938e301e7	full scene traversal and json filters	2017-09-29 11:34:34 -07:00
SamGondelman	0ad5f47bfd	trying to fix entity editing bugs, needs testing	2017-09-29 11:34:34 -07:00
SamGondelman	6c066605cd	add state to entity tree send thread	2017-09-29 11:34:34 -07:00
Andrew Meadows	b6818c4369	first-pass sending entities from _sendQueue	2017-09-29 11:34:34 -07:00
Andrew Meadows	cf2e500ec4	remove unnecessary const qualifiers	2017-09-29 11:34:33 -07:00
SamGondelman	bb5368eb55	use correct rootSizeScale	2017-09-29 11:34:33 -07:00
Andrew Meadows	7597088c7c	simpler logic flow	2017-09-29 11:34:33 -07:00
Andrew Meadows	3e50d01734	more correct handling of LOD	2017-09-29 11:34:33 -07:00
Andrew Meadows	8b7c43f3b1	add LOD culling in DiffTraversal	2017-09-29 11:34:33 -07:00
Andrew Meadows	0758b60afc	abstract DiffTraversal out of EntityTreeSendThread	2017-09-29 11:34:33 -07:00
Andrew Meadows	8d535f9c5a	remove bump to changeFromRemote for server case (revert)	2017-09-29 11:34:33 -07:00
Andrew Meadows	3665a3fbee	libraries/entities/src/EntityTreeElement.cpp	2017-09-29 11:34:33 -07:00
Andrew Meadows	dd1febba2f	add missing bump to element changed content	2017-09-29 11:34:33 -07:00
Andrew Meadows	481df49386	on server: note time of entity edit by remote	2017-09-29 11:34:33 -07:00
Andrew Meadows	2b31a746e3	add content timestamp for EntityTreeElement	2017-09-29 11:34:32 -07:00
Andrew Meadows	ca470d67b4	fix indentation	2017-09-29 11:34:32 -07:00
Andrew Meadows	7edd99ca0b	add basics for send queue and tree traversal	2017-09-29 11:34:32 -07:00
Andrew Meadows	82ed19386f	make Octree::readBitstreamToTree() virtual	2017-09-29 11:34:32 -07:00
Andrew Meadows	56bc48b31a	don't use octcode data in entity update packets	2017-09-29 11:34:32 -07:00
Andrew Meadows	55e9ced5c3	cleanup MovingEntitiesOperator	2017-09-29 11:34:32 -07:00
Andrew Meadows	4fa60f5108	cleanup AddEntityOperator	2017-09-29 11:34:32 -07:00
Seth Alves	72cacc4cef	server only deletes and entity if it's still the child of an avatar, not if it has ever been	2017-09-28 19:56:15 -07:00
Howard Stearns	d1350a03c2	working checkpoint, but with a lot of debug/development stuff	2017-09-28 17:06:07 -07:00
Zach Fox	0f66fb41fd	Fix entity add after incomplete rezCertified implementation	2017-09-28 16:07:15 -07:00
Nissim Hadar	9d0cf16c20	Fixed Ubuntu warnings.	2017-09-27 19:33:04 -07:00
Nissim Hadar	4d8a1db895	Merge branch 'master' into hazeZone # Conflicts: # libraries/entities-renderer/src/RenderableModelEntityItem.cpp	2017-09-27 17:50:51 -07:00
Nissim Hadar	55fafeacb1	Implemented HazePropertyGroup and added the haze shader. Shader does not work yet!	2017-09-27 17:43:09 -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
Daniela	c22d2add17	Resolve conflict with hifi/master.	2017-09-27 17:06:12 +01:00
Nissim Hadar	2394d0931c	Adding HazeStage	2017-09-26 19:05:11 -07:00
Nissim Hadar	f92707a00c	WIP	2017-09-26 18:08:41 -07:00
Howard Stearns	4403c27b52	working checkpoint. still needs verification/hashing, etc.	2017-09-26 14:14:37 -07:00
Daniela	179a426389	Address QA comments.	2017-09-26 17:44:46 +01:00
Nissim Hadar	27af4685e7	Added range and altitude to UI.	2017-09-25 09:32:52 -07:00
Nissim Hadar	543bc5a71b	HazeMode calls Haze::setIsHazeActive.	2017-09-24 18:25:20 -07:00
Nissim Hadar	6cbf087708	First version with combo for Haze Mode.	2017-09-24 15:08:22 -07:00
Nissim Hadar	678b4e35b1	Before replacing "Haze Active" checkbox with "Haze Mode" combo.	2017-09-24 14:06:00 -07:00
Nissim Hadar	c2eea7d40b	Minor cleanup.	2017-09-22 18:37:21 -07:00
Nissim Hadar	736a6aa311	Haze checkbox in UI doesn't disable the UI.	2017-09-22 18:20:35 -07:00
Howard Stearns	8fdd405593	consistent comments	2017-09-22 15:10:30 -07:00
Howard Stearns	f25e22b463	entityInstanceNumber	2017-09-22 15:06:39 -07:00
Howard Stearns	7724fc204b	working checkpoint	2017-09-22 14:19:54 -07:00
Nissim Hadar	5e1d470553	WIP	2017-09-22 09:48:22 -07:00
Nissim Hadar	953ddfdcd3	First version of adding haze to the zone.	2017-09-21 14:54:16 -07:00
Howard Stearns	81585afb7c	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-09-21 12:46:34 -07:00
Bradley Austin Davis	bc4193f276	Merge branch 'master' into android_new	2017-09-19 14:27:31 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Daniela	4568541737	Remove redundant variables.	2017-09-19 18:47:02 +01:00
Daniela	1426e10024	Fix texture loading issue with upstream master. Tune amount of points.	2017-09-19 17:47:00 +01:00
Daniela	7e53f0b7dc	Clean up.	2017-09-19 15:29:17 +01:00
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
howard-stearns	b9f5810d99	snapshot	2017-09-15 17:09:07 -07:00
Artur Gomes	e37b98e0f5	Fix polyline optimization. Add more points to the polyline to check if the optimizations are working.	2017-09-15 19:20:33 +01:00
Seth Alves	cf2979dc78	Merge branch 'master' of github.com:highfidelity/hifi into rework-scriptengine-lifetime	2017-09-14 10:42:26 -07:00
Seth Alves	d89f2b77da	rework ScriptEngine lifetimes using 'smart' pointers	2017-09-14 10:42:21 -07:00
Anthony J. Thibault	7959988622	Merge branch 'master' into feature/ant-man	2017-09-14 10:37:45 -07:00
Brad Davis	f4d8216501	Fix race condition accessing QString sub-properties in zones	2017-09-13 18:06:21 -07:00
Artur Gomes	b65520e788	Merge remote-tracking branch 'upstream/master'	2017-09-13 12:32:17 +01:00
Artur Gomes	ae4e9b16e9	Fix some issues with the polyline optimizations.	2017-09-12 17:07:27 +01:00
Anthony J. Thibault	b81f85e1ae	Merge branch 'master' into feature/ant-man	2017-09-11 15:14:03 -07:00
Bradley Austin Davis	37b184d982	Fix crashes in entity rendering on OSX	2017-09-07 14:32:50 -07:00
Daniela	0655264b44	Replace bytes for uint8_t.	2017-09-07 14:21:41 +01:00
Daniela	3c32171c15	Add pack and unpack optimization in Entity Properties	2017-09-06 18:02:36 +01:00
Dante Ruiz	fec8482b69	Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man	2017-09-05 16:26:51 -07:00
Anthony J. Thibault	6618ba12e9	Merge branch 'master' into feature/ant-man	2017-08-31 18:10:39 -07:00
Brad Davis	65b49a958f	Merge branch 'master' into 21484	2017-08-31 14:59:30 -07:00
Menithal	0e3fc64f63	Fixed Inverse logic and Cleanup	2017-09-01 00:35:56 +03:00
Menithal	663e8514de	Found the culprit. Was overriding the value	2017-09-01 00:00:24 +03:00
Daniela	42be6434af	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-08-31 18:03:39 +01:00
Anthony J. Thibault	c9cdaadeb5	Better scale support in SpatiallyNestable class. Previously avatar used SpatiallyNestable scale to keep track of model rendering scale. It now uses a new member variable _modelScale instead. This is important because the notion of "Avatar" space does NOT include scale, so this is now reflected correctly in the SpatiallyNestable class. Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale field. a new _dimensions member variable is used instead. The SpatiallyNestable scale field for entities should always be one. Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale. This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint. Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions. Added qDebug stream support for Transform class.	2017-08-30 15:46:36 -07:00
Menithal	ea79748ed3	Some adjustments	2017-08-29 23:59:36 +03:00
Daniela	58f0601af2	Fix identation.	2017-08-29 17:19:41 +01:00
Zach Fox	0cdef28cfd	Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-28 14:55:18 -07:00
Brad Davis	3ad32af975	Additional locking in model entities	2017-08-25 11:49:45 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
Chris Collins	751440388a	Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix Bug fix for deadlock between EntitySimulation and EntityItem locks.	2017-08-23 20:50:41 -07:00
Zach Fox	2a75d97006	First steps	2017-08-22 12:56:16 -07:00
Anthony J. Thibault	da20eac995	Bug fix for deadlock between EntitySimulation and EntityItem locks. This is a classic deadlock between the main thread and the OctreeProcessor network thread. On the main thread, the EntitySimulation lock is taken before the EntityItem read lock is taken. On the network thread, the EntityItem write lock is taken before the EntitySimulation lock is taken. To work around this issue the network thread no longer takes the EntitySimulation lock when calling PhysicalEntitySimulation::addDynamic(). Instead, a fine grained lock around the EntitySimulation's dynamic lists is used instead.	2017-08-21 17:14:49 -07:00
Chris Collins	72bb52c7ed	Merge pull request #11046 from rickdaniels/21448 Address bug #21448 "Correctly Size Bounding Boxes for Polylines"	2017-08-21 15:32:22 -07:00
Menithal	dc5e374485	Merge remote-tracking branch 'upstream/master' into 21484	2017-08-17 22:28:43 +03:00
Artur Gomes	83cdd1739d	Add hue, saturation and brightness dynamic brushes. Add continuous drawing mode. Add new brushes. Remove some brushes. Fix animation play distance for when painting in Desktop mode. Fix Hue animation not starting from the chosen color (would always start from red). Fix multiple color polyline.	2017-08-16 18:35:15 +01:00
Artur Gomes	678dd5fbae	Do not test! Add missing information to property.	2017-08-16 18:33:43 +01:00
Artur Gomes	03b70ed492	Do not test! Add color qvector to polyline entity to allow for multiple colors through the line. Add some new icons to the tabs of the app.	2017-08-16 18:32:17 +01:00
Delanir	ed5515a2d4	Add new Property to polyline to enable different uv modes. 2	2017-08-16 18:25:00 +01:00
SamGondelman	a641fb7a7f	rename qvector findRayIntersection to avoid script conflicts	2017-08-15 18:03:52 -07:00
rick@ghostpunch.com	8d248f5ccd	Remove the attempt to determine the maximum width of a PolyLineEntity's strokes using the _strokeWidths[] array, as the values don't seem to correspond with reality. Use a flat 0.075M value for the maxium half of a stroke width instead.	2017-08-14 15:59:21 -04:00
rick@ghostpunch.com	87139f5d82	Remove debug print	2017-08-09 04:46:42 -04:00
rick@ghostpunch.com	cc69853ff1	Make requested style changes to code.	2017-08-09 04:37:47 -04:00
rick@ghostpunch.com	a730da5299	Account for PloyLine stroke width when calculating the dimensions of the PolyLilne's bounding box.	2017-08-09 04:23:39 -04:00
SamGondelman	3645bf04b6	possibly fix most annoying crash	2017-08-08 18:10:53 -07:00
Menithal	982d4a451f	Updated Protocol to add allowTranslation There still is a bug for the value no actually updating	2017-08-08 23:47:37 +03:00
rick@ghostpunch.com	c94d9b3810	Merge remote-tracking branch 'upstream/master' into 21448	2017-08-07 19:23:57 -04:00
Howard Stearns	71ce5a6494	Merge pull request #11016 from highfidelity/context-overlays Context Overlays	2017-08-03 16:28:14 -07:00
Andrew Meadows	e465186511	Merge pull request #11048 from 1P-Cusack/21389 WL21389 PR1: Representation of collision shapes need updating (details below).	2017-08-03 09:04:31 -07:00
David Kelly	6ae516c46a	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 15:45:34 -07:00
Dante Ruiz	c22e08f3e8	loacked script engine in EntityEditPacketSender	2017-08-01 19:58:23 +01:00
David Kelly	bd7c4b3b26	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00
Brad Davis	861b33a845	Fix potential nullptr access in EntityTreeElement	2017-07-29 17:22:25 -07:00
LaShonda Hopper	cc4fbc97cd	[WL21389] PR1 Update based on code review discussion & feedback (details below). * Removed some left overs from prior approach. * Moved _collisionShapeType & getShapeType override from ShapeEntityItem to RenderableShapeEntityItem (see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r130154903) * Switched _collisionShapeType default from SHAPE_TYPE_NONE to SHAPE_TYPE_ELLIPSOID ** see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r129982909 Note(s): * Retested and the cylinder behaves as expected along with the Box & Sphere shapes save from the previously mentioned caveats in the PR notes (https://github.com/highfidelity/hifi/pull/11048) * Confirmed that currently unsupported shapes (hedrons, polygons, & cone) fallback to ellipsoid behavior given default change. Changes Committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/shared/src/ShapeInfo.cpp	2017-07-28 15:59:17 -04: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
rick@ghostpunch.com	3e2dbe58ec	Style guide corrections	2017-07-27 16:39:49 -04:00
Zach Fox	bd5f7b85d8	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_renderMOde	2017-07-26 14:11:28 -07:00
Zach Fox	1e80736718	Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays	2017-07-26 14:11:03 -07:00
Zach Fox	9147bc21d0	Getting there.	2017-07-26 11:41:27 -07:00
rick@ghostpunch.com	0c03b4ec53	Use fabsf() instead of abs() so Clang doesn't default to int abs()	2017-07-25 16:37:40 -04:00
LaShonda Hopper	ef1e426273	[WL21389] Some code and todo cleanup in prep for PR1. Changes to be committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/shared/src/ShapeInfo.cpp	2017-07-25 15:27:02 -04:00
Leander Hasty	d155c02640	[WL21389] wip and modifications based on comments https://github.com/highfidelity/hifi/pull/11024#pullrequestreview-51611518 Cleans up tabs, moves new functionality out of ShapeFactory directly to RenderableShapeEntityItem's computeShapeInfo override, begins to break down where we will need pointlists. Still need to determine how rotation is handled for pointlists, and check for axis alignment on cylinders before deciding on a shape. Changes to be committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h modified: libraries/entities/CMakeLists.txt modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/physics/src/ShapeFactory.h modified: libraries/shared/src/ShapeInfo.cpp modified: scripts/developer/tests/basicEntityTest/entitySpawner.js	2017-07-25 15:20:35 -04:00
rick@ghostpunch.com	3189cb90e4	Address bug #21448 "Correctly Size Bounding Boxes for Polylines" Changed PloyLineEntity code to calculate the scale vector (which PolyLineEntity uses as the bouding box) and the registration point (the offset of the bounding box from the first point in the Polyline) based on the points in the PolyLineEntity so the bounding box is just big enough to contain all the points in the line.	2017-07-25 15:20:11 -04:00
LaShonda Hopper	75403124b6	[WL21389] Addresses physics library dependency and has some other fixes (details below). * Addresses physics library dependency by moving computeShapeInfo override from ShapeEntityItem (which is within Entities Library) to RenderableShapeEntityItem (which is in Entities-Renderer Library). Entities-Renderer library already links against the physic library. Per discussion with Andrew Meadows: In order to ShapeEntityItem to be utilized the library dependency between the Entity and Physics library would need to be resolved to avoid the cyclical reliance which isn't in the scope of this ticket. * Updates shapeSpawner test script from the default clone of basicEntityTest\entitySpawner.js Objects now have a finite lifetime Script now cleans up the objects created when the script ends ** Also moved some adjustable properties out into var aliases at the top of the file for easier/less error prone tweaking. Should probably add one for the shapeType. * Fixes some issues with validateShapeType helper function * Removed naive attempt at including physics library within entities library. * Transferred some todos from notes * Fixed some formatting NOTE(s): This compiles and runs. Cylinder is spawned and treated as CYLINDER_Y. TODO(s): * Add tweakable var for shapeType within shapeSpawner.js * Vet and verify other shapes. * Add in edge case handling. * Add in support for other shapes to ShapeInfo infrastructure. Changes to be committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h modified: libraries/entities/CMakeLists.txt modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/shared/src/ShapeInfo.cpp modified: scripts/developer/tests/basicEntityTest/shapeSpawner.js	2017-07-25 14:43:39 -04:00
LaShonda Hopper	5bc38bd7f0	[WL21389] Collision Shapes need to be updated (details below). Revised approach involves creating a helper function within ShapeFactory to aid in devising the ShapeType to be used by an ShapeEntityItem for collision. The ShapeFactory is currently doing this for creating the actual Bullet Library collision shapes. ShapeEntityItem overrides its virtually inherited computeShapeInfo which in turn calls the new ShapeFactory helper function. ShapeEntityItem has a new memvar _collisionShapeType to cache its actual ShapeType used by the physics system. This memvar is returned via the getShapeType accessor which is expected to return an object's ShapeType. Note(s): This is similar to the original approach save translation between entity::Shape and ShapeType isn't tied to the EntityItemProperties shapeTypeNames or shapeType. This approach more directly solves the issue of getting the actual ShapeType used by the time it's needed to determine the bullet collision object type created when initializing the physic information. Translation of the ShapeEntityItem's entity::Shape to its ShapeType is handled by ShapeFactory which handles creating the bullet collision objects when setting up physics on the ShapeEntityItems. Known Issue(s): This doesn't compile. It appears that the Entity Library needs to know about the Physics Library. The naive attempt at providing that link failed to resolve all compilation issues. Current Error: C1083: Cannot open include file: btBulletDynamicsCommon.h: No such file or directory (C:\projects\cusack\libraries\entities\src\ShapeEntityItem.cpp) C:\projects\cusack\libraries\physics\src\ShapeFactory.h 15 1 entities modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities/CMakeLists.txt modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/physics/src/ShapeFactory.h modified: libraries/physics/src/ShapeInfo.cpp modified: scripts/developer/tests/basicEntityTest/entitySpawner.js new file: scripts/developer/tests/basicEntityTest/shapeSpawner.js	2017-07-25 14:43:07 -04:00
Ryan Huffman	6817cf9db4	Fix entity properties sometimes being resent When writing entity properties to a packet, we start off with a list of requested properties (`requestedProperties`) and keep track of which properties didn't fit (`propertiesDidntFit`) the packet, which is intialized to requestedProperties. As we pack the properties, we remove them from propertiesDidntFit if they didn't need to be written or were able to be packed. At the end we store propertiesDidntFit, and use it in the future as our requestedProperties when we try to pack more data into a packet. The bug: because of the order in which propertiesDidntFit is initialized, it ended up always being the list of all properties for that entity. This typically wasn't an issue because we usually go through and try to append all of the properties, and if we don't need to append them (because they aren't in requestedProperties) we remove them from our propertiesDidntFit list. When we don't have enough remaining space in the current packet for even the entity header, which is fairly small, we don't bother trying to append any of the properties. When this happens, propertiesDidntFit contains the full list of properties, which we save for the next pass through the entity, and use as our requestedProperties, causing us to resend entity data again. In the worst case we never end up sending all of the entity's data.	2017-07-25 10:59:03 -07:00
Zach Fox	40038ce54b	Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays	2017-07-25 09:33:07 -07:00
Andrew Meadows	d86ae98211	always update bounding box on script edit	2017-07-21 10:57:09 -07:00
Andrew Meadows	17323ba42a	always update the bounding box	2017-07-21 10:25:03 -07:00
Andrew Meadows	e1eb223616	cleanup bad indentation, cruft, and constants	2017-07-20 16:12:33 -07:00
Andrew Meadows	a8dac0cb79	don't send constant updates for grabbed objects	2017-07-20 15:45:50 -07:00
Andrew Meadows	fcd3126b85	undo accidental name change	2017-07-20 08:32:48 -07:00
Andrew Meadows	54426a5b81	update queryAACube on server when it probably changed	2017-07-20 08:21:10 -07:00
Andrew Meadows	d88d7dda2b	changed dimensions flag entity for new queryAACube	2017-07-20 08:19:59 -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	9ca3ec4313	faster computation of entity bounding cube	2017-07-19 13:35:34 -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
Zach Fox	1d26a268c1	Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay	2017-07-19 09:53:51 -07:00
Dante Ruiz	7fe47e4e2f	Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity	2017-07-18 16:51:41 +01:00
Dante Ruiz	d504000604	made requested changes	2017-07-18 16:51:21 +01:00
Brad Hefta-Gaub	d94365cc44	Merge pull request #10979 from zfox23/hoverOverlay_lasers Create/Destroy Hover Overlays using hand controller lasers	2017-07-18 08:44:48 -07:00
Andrew Meadows	5f4df0da2b	Merge pull request #10847 from AndrewMeadows/entitymap faster EntityItem lookup by EntityItemID	2017-07-18 08:04:37 -07:00
Zach Fox	96f52a9812	First pass at getting overlays to show up on hover	2017-07-17 17:05:16 -07:00
Dante Ruiz	21d760a533	make sure to lock data	2017-07-17 22:11:05 +01:00
Dante Ruiz	282b364fad	Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity	2017-07-17 21:28:17 +01:00
Dante Ruiz	f6208a394c	delete avatar entity when switching domains	2017-07-17 21:27:55 +01:00
Zach Fox	974dff36b0	Make hover overlays work for hand controller lasers	2017-07-17 13:16:53 -07:00
Zach Fox	19b42b0180	CR feedback	2017-07-17 13:15:23 -07:00
Zach Fox	4b9797c179	Comment explaining category debugs	2017-07-17 11:35:27 -07:00
Zach Fox	0a4ab23356	Remove unnecessary include	2017-07-17 11:32:47 -07:00
Zach Fox	147474e19a	Logging category and filter	2017-07-17 11:17:59 -07:00
Zach Fox	19d5b8750a	Cleanup logging	2017-07-17 09:51:00 -07:00
Zach Fox	e602d3610e	Initial commit for HoverOverlayInterface	2017-07-14 17:26:53 -07:00
Andrew Meadows	c7ec82f98a	use local copy of _element for thread safety	2017-07-13 13:30:57 -07:00
Andrew Meadows	8fc4d1f43e	make UNEXPECTED logs warnings	2017-07-13 13:30:57 -07:00
Andrew Meadows	02bc9b9610	minimize the lock context	2017-07-13 13:30:57 -07:00
Andrew Meadows	f71ef554b7	use copy of _entityMap for debug logging	2017-07-13 13:30:57 -07:00
Andrew Meadows	fe79514b08	lock when changing EntityTree elements	2017-07-13 13:30:57 -07:00
Andrew Meadows	a0c6c49360	bump some "debug" messages to "warning" status	2017-07-13 13:30:57 -07:00
Andrew Meadows	39e5259e03	remove unused variable	2017-07-13 13:30:57 -07:00
Andrew Meadows	7ea1e7285f	map EntityItemID to EntityItemPointer	2017-07-13 13:30:57 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
Brad Davis	8130a91b8c	Cleanup entity dependencies	2017-06-27 19:15:49 -07:00
Seth Alves	428dc81083	Merge pull request #10696 from AndrewMeadows/avoid-ownership-bid-race ignore remote update younger than recent ownership bid	2017-06-20 10:42:54 -07:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Andrew Meadows	8d19395b0a	ignore remote update younger than recent bid	2017-06-14 16:04:52 -07:00
Andrew Meadows	29a05d7eb4	bid immediately when creating new entity also clear EntityMotionState::_numInactiveUpdates on new ownership	2017-06-01 17:39:21 -07:00
Andrew Meadows	c56a6c44f8	minor formatting fix	2017-06-01 17:39:21 -07:00
samcake	6dbbd6c8d0	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-25 11:25:46 -07:00
Brad Hefta-Gaub	5af95c8fdf	Merge pull request #10476 from sethalves/fix-imported-children-querybox fix up queryAACubes before sending imported entities to server	2017-05-25 08:29:23 -07:00
samcake	e7b808cbc1	Merging with upstream	2017-05-23 12:12:31 -07:00
Stephen Birarda	cecbf43129	make server entity scripts respect script whitelist	2017-05-22 16:17:01 -07:00
Seth Alves	381de7a1e2	tabs	2017-05-21 08:42:53 -07:00
Seth Alves	c68efc2ed0	treat locked like other properties that affect simulation	2017-05-21 08:29:35 -07:00
Seth Alves	2512b39848	don't dirty motion-type if lock value isn't actually changing	2017-05-20 14:14:33 -07:00
Seth Alves	8f38ea8c6a	force locked entities to be static in bullet	2017-05-20 11:54:42 -07:00
Seth Alves	a442181859	remove some redundancy	2017-05-20 08:51:44 -07:00
Seth Alves	5c94147f40	children collision hulls appear to be in the right place, now	2017-05-19 17:09:42 -07:00
Seth Alves	67f222cb3f	be more careful about fixing up entities which arrived before their parents	2017-05-19 15:19:16 -07:00
Seth Alves	386c76545c	be more careful about fixing up entities which arrived before their parents	2017-05-19 14:21:05 -07:00
Seth Alves	54dafa0f83	be more careful about fixing up entities which arrived before their parents	2017-05-19 14:14:00 -07:00
Seth Alves	5c93dbd20d	be more careful about fixing up entities which arrived before their parents	2017-05-19 13:48:29 -07:00
Seth Alves	936d0e2d50	be more careful about fixing up entities which arrived before their parents	2017-05-19 12:13:43 -07:00
Seth Alves	735e4b7d05	trying to get child collision hulls to be in the right place after import	2017-05-19 10:59:59 -07:00
Seth Alves	7220fe0ad8	set more physics flags dirty when an entity parent is found	2017-05-19 10:40:24 -07:00
Seth Alves	77ce8a19cf	call entityChanged after settings flags	2017-05-19 10:11:02 -07:00
Seth Alves	0c12baa258	call entityChanged after settings flags	2017-05-19 09:57:42 -07:00
Seth Alves	4007133423	collision hulls are still not always in the right place	2017-05-18 14:59:26 -07:00
Seth Alves	1b0eeb9c2c	try harder to put things in place when their parent entities are discovered	2017-05-18 14:35:39 -07:00
Seth Alves	ef556fae9b	when an entity's parent wasn't known and then becomes known, patch up the rigid-body and the render-item bounds	2017-05-18 14:13:33 -07:00
Seth Alves	ec02887ae6	attempt to get imported entities into the correct octree-element	2017-05-18 13:20:44 -07:00
Sam Gateau	d9ad45bf4a	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-18 09:37:04 -07:00
Seth Alves	b8567e0550	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-18 09:10:58 -07:00
Seth Alves	b05cb4af3b	fix nan	2017-05-17 20:51:34 -07:00
Seth Alves	0dc355cf86	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-17 16:43:50 -07:00
Brad Hefta-Gaub	0d3f7058ec	Merge pull request #10483 from AndrewMeadows/cap-velocities cap scripted linear and angular velocity inputs	2017-05-17 16:15:42 -07:00
Seth Alves	8a88b30da7	Merge pull request #10468 from AndrewMeadows/cleanup-actions cleanup Actions and Constraints part-1	2017-05-17 11:33:53 -07:00
Andrew Meadows	97ed719506	cap scripted linear and angular velocity inputs	2017-05-17 10:40:45 -07:00
Sam Gateau	0f250e693d	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-17 09:49:20 -07:00
Seth Alves	8ab676e627	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-17 09:09:04 -07:00
Thijs Wenker	278bc610d4	Merge pull request #10466 from misslivirose/feat-find-entities-by-type Add function findEntitiesByType EntityScriptingInterface	2017-05-17 15:06:04 +02:00
Seth Alves	d90843428d	when importing entities, make a queryAACube that takes children into account	2017-05-16 16:54:16 -07:00
Seth Alves	1e4e2cc1b4	when a parent entity is deleted, delete its children in the local tree, rather than waiting for the server to tell us about it	2017-05-16 16:22:40 -07:00
Seth Alves	b9005a9e76	fix up queryAACubes before sending imported entities to server	2017-05-16 14:32:55 -07:00
Andrew Meadows	e6accb61b0	more purging of legacy 'Spring' action	2017-05-16 08:09:20 -07:00
Andrew Meadows	9e08dadaf4	Remove ObjectActionSpring	2017-05-15 22:11:42 -07:00
Liv Erickson	32fd905918	style pass	2017-05-15 20:49:30 -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
samcake	2df6d0df48	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-15 13:40:56 -07:00
Seth Alves	630d95a812	fix constraint import some more	2017-05-12 13:03:51 -07:00
Seth Alves	bc6fb182eb	pull out motor action, fix import of slider and cone-twist constraints	2017-05-12 10:32:28 -07:00
Seth Alves	80e6edda0c	code review	2017-05-11 10:13:15 -07:00
samcake	c36035d3eb	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-09 10:46:38 -07:00
Seth Alves	4f24a7618a	cleanups	2017-05-09 10:23:04 -07:00
Seth Alves	4816e4f826	what does VS mean when it uses words?	2017-05-08 21:39:41 -07:00
Seth Alves	de589a32f3	clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring	2017-05-08 16:36:51 -07:00
Seth Alves	1346ce22b9	don't crash if imported entities make a reference to an unknown entity	2017-05-08 15:51:25 -07:00
Seth Alves	94dfbc81f3	entity export/import involving constraints now works	2017-05-08 15:44:31 -07:00
Seth Alves	fd238f5438	working on fixing action/constraint export/import	2017-05-08 11:02:35 -07:00
Seth Alves	7a1a9d6496	start on code to remap constraint IDs during import	2017-05-07 19:42:04 -07:00
Seth Alves	5d539bcc17	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-06 07:49:02 -07:00
Sam Cake	db3d634840	Adding the change notifications	2017-05-05 00:11:22 -07:00
Seth Alves	7f4399b0a3	fix name in entity-edit-an-overlay warning	2017-05-04 19:16:15 -07:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -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	d25db099b9	be more effecient about ignoring edits to unknown entities	2017-05-04 18:49:46 -07:00
samcake	df2c5b8c23	adding the notification for keyLight changes modifying the KeyLIghtPayoad	2017-05-04 18:28:12 -07:00
Seth Alves	74a82f92df	return null uuid for failure	2017-05-04 10:05:17 -07:00
Seth Alves	9171995ed3	add a comment	2017-05-03 21:41:00 -07:00
Seth Alves	69944cc76d	add a way to get a SpatiallyNestable's name without knowing what its type is	2017-05-03 21:32:49 -07:00
Seth Alves	03f416ff4d	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-03 20:32:08 -07:00
Seth Alves	0fff7678bf	code review	2017-05-03 19:07:46 -07:00
Seth Alves	e96c3e84b4	if a script attempts to edit a non-entity, don't send the edit packet over the wire	2017-05-03 13:58:49 -07:00
Seth Alves	7f69bdecb2	first try at angular-velocity setting action	2017-05-01 07:06:21 -07:00
Seth Alves	4c4e0dffcc	bullet cone-twist constraint	2017-04-29 12:30:12 -07:00
Seth Alves	6623028d71	ball-and-socket constraint	2017-04-29 08:35:55 -07:00
Seth Alves	e2e9371e96	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4	2017-04-29 08:04:31 -07:00
1st-BrainStormer	953a3f7a6f	Update EntityDynamicInterface.cpp Grammar correction.	2017-04-28 20:14:01 -07:00
Seth Alves	b196dd082b	expose bullet slider constraint to javascript	2017-04-27 07:56:35 -07:00
Seth Alves	f7378abb08	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-20 02:40:10 -07:00
Chris Collins	889b054085	Merge pull request #10067 from humbletim/fix-Entities-setLocalJointTranslations Fix Entities.setLocalJointTranslations	2017-04-19 09:32:28 -07:00
Seth Alves	21ca767b7c	remove setPosition and setRotation for actions because they were never finished and never used.	2017-04-18 11:59:16 -07:00
Andrew Meadows	31bfc98b87	use const reference for ScenePointer when possible	2017-04-18 11:52:22 -07:00
Seth Alves	b1dc5be316	make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar	2017-04-14 11:48:06 -07:00
Seth Alves	2dab3069da	fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called.	2017-04-14 11:06:40 -07:00
Seth Alves	afa8fc161b	allow hinge constraint between two entities	2017-04-13 15:37:28 -07:00
Seth Alves	9b12956909	formatting	2017-04-12 16:34:34 -07:00
Seth Alves	507f658a5f	update comment	2017-04-12 07:37:41 -07:00
Seth Alves	74c0a70cb0	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
Stephen Birarda	602d65a71a	Merge pull request #10001 from birarda/cleanup-ebp cleanup EncodeBitstreamParams to use nodeData when possible	2017-04-10 15:54:30 -07:00
Brad Hefta-Gaub	0d4649ded8	Merge pull request #10079 from jherico/entity_thread_safety Thread safety for property getter/setters on entities	2017-04-07 19:01:07 -07:00
Andrew Meadows	b9c7d6351f	Merge pull request #10135 from samcake/ambient Rename render::PendingChanges to render::Transaction	2017-04-07 09:54:10 -07:00
samcake	6122155880	Renaming the PendingCHanges class to Transaction	2017-04-05 13:10:31 -07:00
Brad Davis	15f7e895aa	More thread safety	2017-04-04 15:09:21 -07:00
Brad Davis	cd7c1643a3	More thread safety	2017-04-04 14:03:30 -07:00
Brad Davis	54200c03a7	Fixing deadlock	2017-04-04 13:53:49 -07:00
Brad Davis	fe84232ab4	More work on thread safety	2017-04-04 10:50:56 -07:00
Brad Davis	03c6275268	more thread safety	2017-04-04 10:50:54 -07:00
Brad Davis	172fab6789	Thread safety for property getter/setters on entities	2017-04-04 10:50:53 -07:00
Ryan Huffman	b9fffc10f8	Fix entity "unlock" edits not being propagated to clients The lastEditedBy property was not being updated when changing the locked property of entities from true to false.	2017-04-03 15:51:19 -07:00
David Kelly	348674a267	Merge pull request #10034 from davidkelly/dk/avatarEntityIssue bad serialization of Avatar Entity parentID	2017-03-30 10:12:19 -07:00
humbletim	d02fd06305	mark joint translations dirty	2017-03-30 07:45:18 -04:00
David Kelly	4b40633104	oops damn space	2017-03-28 11:22:18 -07:00
David Kelly	e119c38748	bad serialization of parentID	2017-03-28 09:26:40 -07:00
Seth Alves	651d87dc2a	move Qt-related stuff out of model and into model-networking	2017-03-28 07:53:25 -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
Seth Alves	5ed0ff729b	cleanups	2017-03-27 07:25:40 -07:00
Stephen Birarda	53e6a77fcc	cleanup EncodeBitstreamParams to use nodeData when possible	2017-03-24 13:41:36 -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
Seth Alves	048da6e6cb	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-21 09:52:15 -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
Atlante45	73dd2abdaf	Delete old sitting points code	2017-03-20 17:29:44 -07:00
Seth Alves	d5ea69d81d	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-20 14:06:00 -07:00
Brad Hefta-Gaub	bc5d7d8698	Merge pull request #9851 from AndrewMeadows/simulation-ownership-2 zero velocity of deactivated dynamic entities	2017-03-20 10:20:11 -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	b876d22e46	fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels	2017-03-18 22:36:24 -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
humbletim	52a571558c	* changes per CR feedback * revert JSON content-type workaround * add specific error check / advice for unanchored module ids * update unit tests	2017-03-16 01:23:23 -04: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
humbletim	db73c80ba1	remove unused meta property adapter	2017-03-13 19:16:00 -04:00
Andrew Meadows	a16760278e	remove debug code	2017-03-09 17:58:53 -08:00
Andrew Meadows	8ddcae2a15	restore transform of deactivated entities	2017-03-09 17:26:53 -08:00
Andrew Meadows	d4abdcb6c8	comments, namechange, and temporary debug code	2017-03-09 17:26:53 -08: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
Andrew Meadows	10b3e7fc67	sphere shapeType for models means 'sphere'	2017-03-06 15:14:51 -08:00
ZappoMan	9e71801ae1	remove properties from RayToEntityIntersectionResult	2017-03-01 18:21:04 -08: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
Stephen Birarda	9d336a84ab	force a full scene send for new ancestors/descendants	2017-02-16 16:46:09 -08:00
Stephen Birarda	a3883a746c	add the basic structure for inclusion of ancestors/descendants in ESS queries	2017-02-16 16:46:09 -08:00
David Kelly	f0e87360c1	don't capture a temporary by reference. Ugh	2017-02-15 12:37:00 -07:00
David Kelly	5184cbe615	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2	2017-02-15 12:08:55 -07:00
David Kelly	e6969321ca	fix for not properly filtering entity adds	2017-02-15 09:15:35 -07:00
David Kelly	08d30608c7	remove debug logging	2017-02-14 14:28:20 -07:00
David Kelly	17acd8fa4f	I should just build on linux exclusively	2017-02-14 13:30:43 -07:00
David Kelly	342584b2a8	Filter failure mode updated The decision here is that all failed filters (syntax errors, 404s, bad urls etc...) lock out all edits for those without lock rights. If it is the domain-wide one, then that applies to entire domain. If a zone filter, then that applies to all edits in that zone. Also - zone filters don't apply to the zone itself. Other zone filters whose zones lie within that zone _do_ apply, in addition to the global one.	2017-02-14 13:05:12 -07:00
Brad Hefta-Gaub	f433347362	Merge pull request #9652 from sethalves/avatar-as-child-fixes some fixes for when an avatar is a child of something else	2017-02-14 09:07:47 -08:00
Seth Alves	4393bc3c2e	Merge pull request #9656 from humbletim/21114-part1 CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors	2017-02-14 06:49:05 -08:00
Seth Alves	ba025d44e0	Merge pull request #9642 from AndrewMeadows/beware-humbletim fix performance problem for invalid "avatarEntityData"	2017-02-14 06:33:48 -08:00
Seth Alves	2e2a3c60d0	Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes	2017-02-14 06:26:20 -08:00
Seth Alves	2e245e9cba	Merge pull request #9667 from huffman/fix/entity-scripts-not-loading Fix entity scripts not loading in certain cases	2017-02-14 06:20:29 -08:00
howard-stearns	487adc7f18	whitespace	2017-02-13 16:35:03 -08:00
Ryan Huffman	d0cddd01d7	Fix entity scripts not loading in certain cases This fixes a bug where an entity script would be loaded but immediately unloaded. This happens when the script property of the entity is changed shortly after it is added. Flow of events: Entity added => Entity added event emitted Entity edited => Script changing event emitted <= Entity added event received Script loaded <= Script changing event received Script stopped Tries to load script again, but because the script hasn't changed since it was last loaded, it is not loaded again. The change here is to modify the behavior when receiving a script changing event. Instead of always unloading and then conditionally loading the script, it will either do both (unload + load) or neither.	2017-02-13 14:59:31 -08:00
howard-stearns	6241889e38	lastEditedBy is set by add/edit, but not by physics packets	2017-02-13 13:47:20 -08:00
Seth Alves	bc5f563f57	make _parentID and _parentJointIndex private to avoid accidental direct access	2017-02-12 11:37:29 -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
David Kelly	8a7a3926c5	rest of issues w/linux and mac	2017-02-10 15:57:27 -07:00
David Kelly	9891d7b7d2	build issue on linux/mac	2017-02-10 15:24:58 -07:00
David Kelly	2996298e79	First bit of cleanup consolidate to one map, some minor other cleaning. More coming.	2017-02-10 14:57:09 -07:00
Andrew Meadows	0e504e9ec6	make methods private: avoid sanity check logic	2017-02-10 13:14:20 -08:00
David Kelly	1c1b0d1332	oops, debugging left in	2017-02-10 13:16:52 -07:00
David Kelly	7ec27cab13	Use EntityItem.contains Cuz it works - seemed like it was broken but nope. Also, trim off the filters for zones that no longer are in the tree.	2017-02-10 12:47:48 -07:00
David Kelly	cf780b3b73	fixed persist issue, working much better	2017-02-10 11:42:56 -07:00
David Kelly	5ca80803c0	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2	2017-02-09 20:01:43 -07:00
David Kelly	415d71956f	minor logging crap	2017-02-09 19:59:55 -07:00
David Kelly	8d666854c7	working it seems But, AABox for zones isn't very helpful (box is _small). Time to use the shape of the zone.	2017-02-09 15:39:38 -07:00
Atlante45	3a30de79aa	CR	2017-02-09 13:04:43 -08: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
David Kelly	ff7c9d3546	Working like before Single entity script running properly. Now, need to add the zone filters and execute them.	2017-02-08 15:36:16 -07:00
David Kelly	c08adc9faa	and the new filter class	2017-02-08 10:51:28 -07:00
David Kelly	4821180dd3	Just add a pointer to the filter class but do nothing with it	2017-02-08 10:48:26 -07:00
David Kelly	61e558e568	Entity Edit Filters for zones Part 1 - just put them in the zones entities. Next I'll hook them up and actually filter...	2017-02-08 09:53:25 -07:00
Chris Collins	194fd925cf	Merge pull request #9609 from sethalves/tablet-ui-fix-equipping don't send AVATAR_SELF_ID over wire	2017-02-06 16:56:11 -08:00
Seth Alves	aaefc550f0	avoid bootstrapping self with something that has someone else as simulation owner	2017-02-06 14:16:47 -08:00
howard-stearns	12720cac32	Pass filter type as an int, with constants to compare against.	2017-02-06 13:36:45 -08:00
Seth Alves	2ea07390c8	when the parentID is changed by a network update, set physics flags	2017-02-06 12:10:26 -08:00
howard-stearns	dacaa3df1d	Send new entity physics packet from physics simulation, accept in server, and make it go through filter (when supplied) regardless of lock rights.	2017-02-06 11:12:18 -08:00
howard-stearns	8b44e83d9e	Add new EntityPhysics packet type.	2017-02-06 11:11:18 -08:00
Seth Alves	81bf5ee655	another AVATAR_SELF_ID adjustment	2017-02-03 16:47:03 -08:00
Seth Alves	37de4aefa6	don't send AVATAR_SELF_ID over wire	2017-02-03 14:05:23 -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
howard-stearns	4499a92a82	filter gets isAdd argument	2017-02-02 13:07:08 -08:00
Seth Alves	24510ee3fe	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-02-01 18:42:56 -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
howard-stearns	6f4441028d	Merge branch 'master' of https://github.com/highfidelity/hifi into accept-forced-physics-values	2017-02-01 09:41:08 -08:00
David Kelly	f25bbc9649	Merge pull request #9574 from howard-stearns/delete-failed-entity-adds cleanly log failed entity adds, and tell the client to delete his copy	2017-02-01 10:12:17 -07:00
Brad Hefta-Gaub	0c7a181d33	Merge pull request #9573 from birarda/bug/whitelist-starts-with drop empty parts when splitting script whitelist	2017-02-01 07:38:02 -08:00
Seth Alves	adaee0e62c	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-01-31 21:27:00 -08:00
howard-stearns	e42853a96c	cleanly log failed entity adds, and tell the client to delete his copy	2017-01-31 16:05:38 -08:00
Stephen Birarda	d4a161041e	drop empty parts when splitting script whitelist	2017-01-31 15:32:47 -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
howard-stearns	18f8c2b866	comment	2017-01-31 13:31:33 -08:00
howard-stearns	8d8b338c66	dry up custom setters, per code review	2017-01-31 12:07:48 -08:00
Thijs Wenker	3608998877	use dedicated bool rather than unreliable dirtyFlags to determine if the entityItem had ever bid for simulation ownership	2017-01-31 21:01:03 +01:00
Thijs Wenker	e445af74aa	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-01-31 20:39:39 +01:00
howard-stearns	1ddc804e10	Merge branch 'master' of https://github.com/highfidelity/hifi into accept-forced-physics-values	2017-01-31 10:58:49 -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
Brad Hefta-Gaub	5287c94786	Merge pull request #9555 from huffman/fix/entity-is-child-of-crash Fix Entities.isChildOfParent crashing if given unknown ID	2017-01-31 08:42:45 -08:00
Brad Hefta-Gaub	619bcdeed8	Merge pull request #9553 from huffman/fix/polyvox-import Fix importing of PolyVox entities	2017-01-31 08:42:28 -08:00
Seth Alves	39d195fce2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-31 05:02:07 -08:00
Seth Alves	1ea11572a7	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-01-30 19:54:56 -08:00
Thijs Wenker	c3f9663ab0	- Fix for simulation owned entities moving to 0,0,0 after cache reload - Fix for simulation priority, use SCRIPT_GRAB_SIMULATION_PRIORITY in EntityItem::grabSimulationOwnership()	2017-01-31 01:25:59 +01:00
howard-stearns	fe8fe816f4	accept forced physics results from entity server (e.g., when filtered)	2017-01-30 16:14:40 -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
Ryan Huffman	f553656e36	Fix importing of PolyVox entities PolyVox entities reference neighboring PolyVox entities in their entity properties so that they can be stitched together. When importing, a new ID is generated for each entity. When importing PolyVox entities, the neighboring entity IDs were not updated to reflect the newly generated IDs. This commit fixes that.	2017-01-30 13:33:42 -08:00
howard-stearns	93414d802d	fetch entity filter script asynchronously (but reject edits while waiting)	2017-01-30 11:06:36 -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	fa61bbe2a6	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 18:21:39 -08:00
Howard Stearns	f36b968860	Merge branch 'edit-entity-filter' into entity-filter-resource	2017-01-25 19:39:12 -08:00
Howard Stearns	a1afbe7d5e	Merge branch 'master' of https://github.com/highfidelity/hifi into edit-entity-filter	2017-01-25 19:16:29 -08:00
howard-stearns	4437063a3a	remove logging, now that we have error logging	2017-01-25 17:04:09 -08:00
howard-stearns	9cbc4fd1b9	Merge branch 'master' of https://github.com/highfidelity/hifi into entity-filter-resource	2017-01-25 16:23:52 -08:00
howard-stearns	b62f3e550a	error check/log on execution, too	2017-01-25 16:23:07 -08:00
Seth Alves	c317ba8054	merge from upstream	2017-01-25 15:57:53 -08:00
Clément Brisset	3f34a9e832	Merge pull request #40 from birarda/entity-script-server hack to accept possibly newer server scripts	2017-01-25 13:21:45 -08:00
Atlante45	f540c94113	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
Stephen Birarda	304618f51d	cleanup comment and scoping for server script URL changes	2017-01-25 12:39:41 -08:00
Stephen Birarda	f1b4f79ad9	a simple hack to accept newer server scripts	2017-01-25 12:39:41 -08:00
Stephen Birarda	586c3512a7	remove useless additional includeThisEntity sets	2017-01-24 17:35:45 -08:00
Stephen Birarda	67a3d97f81	cleanup includeThisEntity check	2017-01-24 16:41:20 -08:00
Stephen Birarda	543d0ce77e	add a comment about usesFrustum check in EntityTreeElement	2017-01-24 16:36:44 -08:00
Stephen Birarda	33378ede5c	force full scene send if json parameters changed	2017-01-24 16:34:57 -08:00
howard-stearns	8eff3b1e83	restructure initialization so that server can do server-like things to get the filter program from file	2017-01-24 16:14:41 -08:00
Stephen Birarda	5a3f99a504	Merge pull request #9479 from birarda/bug/whitelist-starts-with use host check for entity script whitelist instead of startsWith	2017-01-24 15:21:25 -08:00
howard-stearns	c25072c1db	Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter	2017-01-24 12:15:39 -08:00
howard-stearns	da914f0a4f	bypass entity-server edit filter if you have lock/unlock rights	2017-01-24 11:59:31 -08:00
Stephen Birarda	9229a07f6a	avoid failing scheme check	2017-01-23 16:46:59 -08:00
Stephen Birarda	7362bf16c1	use isParentOf to check script whitelist, clarify description in settings	2017-01-23 16:44:28 -08:00
howard-stearns	ada685a376	cr changes	2017-01-23 15:31:55 -08:00
Stephen Birarda	a8118e83ff	cleanup debug for safe web entity URLs	2017-01-23 13:54:43 -08:00
howard-stearns	24a9cf1f23	Merge branch 'edit-entity-filter' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter	2017-01-23 13:52:39 -08:00
Seth Alves	c958314918	merge from upstream	2017-01-23 13:52:01 -08:00
Stephen Birarda	db398b7850	check URL host for script whitelist, not startsWith	2017-01-23 13:36:02 -08:00
howard-stearns	0a4634446d	typo	2017-01-23 13:09:28 -08:00
Stephen Birarda	f02832ca71	output the actual value set in WebEntityItem	2017-01-23 11:50:05 -08:00
Stephen Birarda	d7651e9838	move value sanitizing to WebEntityItem	2017-01-23 11:45:21 -08:00
howard-stearns	7b986dcac6	works, but removes an optimization we'd like to keep	2017-01-20 17:03:52 -08:00
Clément Brisset	95f07f3917	Merge pull request #32 from huffman/feat/entity-server-script-property PR FIxes	2017-01-20 15:39:22 -08:00
Ryan Huffman	4e358f76fe	Remove trailing whitespace from EntityItemProperties.cpp	2017-01-20 14:36:45 -08:00
Ryan Huffman	ee8898568d	Remove const from getScript & getServerScripts	2017-01-20 14:36:01 -08:00
Stephen Birarda	ab8a0a7d39	Merge pull request #30 from Atlante45/ess-pr Remove unnecessary const from `const bool`	2017-01-20 14:22:11 -08:00
Stephen Birarda	5ef0bd7573	remove weird extra whitespace	2017-01-20 14:10:42 -08:00
Stephen Birarda	1e25b5012f	use a static_cast to get EntityNodeData	2017-01-20 14:05:55 -08:00
Stephen Birarda	67951517b4	don't grab the JSON filters for each entity checked	2017-01-20 13:59:48 -08:00
Atlante45	8740481579	Remove unnecessary const from `const bool`	2017-01-20 13:54:49 -08:00
Stephen Birarda	c5140ac695	use ENTITY_ITEM_DEFAULT_SERVER_SCRIPTS in EntityItemProperties	2017-01-19 16:42:14 -08:00
Stephen Birarda	0cb14ab25c	whitespace fix in EntityTreeElement	2017-01-19 16:42:14 -08:00
Stephen Birarda	a40c25ddbf	fix repeated send of matching entities	2017-01-19 16:42:14 -08:00
Atlante45	20a82df9a0	Fix scripts not reloading in certain edge cases	2017-01-19 15:48:44 -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
Clément Brisset	89d1242925	Merge pull request #10 from huffman/feat/entity-server-script-property Entity script status + reload	2017-01-19 11:19:40 -08:00
Stephen Birarda	33cde412b1	make getJSONParameters thread-safe	2017-01-18 17:49:54 -08:00
Stephen Birarda	5fbdc94c66	pass usesFrustum down to EntityTreeElement	2017-01-18 17:49:54 -08:00
Stephen Birarda	ed41412d95	fix for unpack of OctreeQuery	2017-01-18 17:49:54 -08:00
Atlante45	cbc69fbf9e	Fix script preload functions	2017-01-18 16:42:25 -08:00
Atlante45	e94cccf08d	Fix server script preload funcitons	2017-01-18 16:12:41 -08:00
Stephen Birarda	112b119f17	send entities that just stopped matching filter	2017-01-18 14:58:36 -08:00
Stephen Birarda	5d1b53c600	move map population with properties back	2017-01-18 14:58:36 -08:00
Stephen Birarda	b08bfe93f4	change lastViewFrustumSent to lastQuerySent	2017-01-18 14:58:36 -08:00
Stephen Birarda	a1ad496772	handle match on non-default serverScripts property during entity send	2017-01-18 14:58:36 -08:00
Stephen Birarda	3556379034	leverage JSON filter changes to OctreeQuery in EntityServer	2017-01-18 14:58:36 -08:00
howard-stearns	90c9c5b137	logging change	2017-01-18 14:32:05 -08:00
howard-stearns	957b1d9ae4	pass just what is given to filter, more or less	2017-01-18 13:22:54 -08:00
howard-stearns	00e53c8ea6	more tractable copy semantics	2017-01-18 13:21:28 -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
howard-stearns	60eb6dca9d	remove debug dump that was printing to screeen during << operator	2017-01-18 10:29:11 -08:00
howard-stearns	2e9b26057e	refactor bumpTimestamp, and fix implementation of wasChanged	2017-01-18 10:27:32 -08:00
Atlante45	20b7bb0c54	EntityScriptServer tracks server scripts	2017-01-17 16:41:56 -08:00
Ryan Huffman	812aaee48c	Add Entities.reloadServerScripts	2017-01-17 14:47:57 -08:00
Ryan Huffman	b0c2a9d614	Add serverScripts entity property	2017-01-17 14:47:06 -08:00
howard-stearns	09a57efaf3	checkpoint	2017-01-16 12:47:26 -08:00
Seth Alves	3b4f5e3023	don't include overlays in results from EntityScriptingInterface::getChildrenIDsOfJoint	2017-01-15 11:27:29 -08:00
howard-stearns	121d79ef36	getting there, but not yet complete	2017-01-13 16:59:51 -08:00
howard-stearns	f6446c6806	minimum entity edit filter	2017-01-13 13:18:24 -08:00
Seth Alves	a47aaea37a	don't bootstrap self with an avatar hold action	2017-01-12 10:12:45 -08:00
Seth Alves	4a29cce584	adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled	2017-01-10 06:17:40 -08:00
Seth Alves	35577f49d0	change the test for when MY_AVATAR collisions are short-circuited	2017-01-09 17:00:39 -08:00
Seth Alves	ad45bbf5ba	set DIRTY_COLLISION_GROUP flag when parentID changes	2017-01-09 16:45:54 -08:00
Seth Alves	45a26d599f	if something is a child of the local avatar, never let it collide with MY_AVATAR	2017-01-09 16:40:28 -08:00
Seth Alves	01ff3f14b6	re-evaluate an entities in-bullet status when parentID changes	2017-01-09 15:28:05 -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	9459b967be	Merge branch 'master' into 21089	2016-12-16 20:02:43 +13:00
Anthony J. Thibault	8b99fa90e8	Merge branch 'master' into tablet-ui	2016-12-15 13:28:23 -08:00
David Rowe	be00730073	Add canWriteAssets method and signal to Entities API	2016-12-14 14:27:55 +13:00
Seth Alves	d97be52542	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2016-12-12 16:24:17 -08:00
Seth Alves	6fe35ac0da	use smart pointers to avoid leaking EntityTreeElementExtraEncodeData	2016-12-12 16:04:41 -08:00
David Rowe	c87149cfc2	Tidying	2016-12-10 12:59:01 +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
Faye Li Si Fi	9289dd36d4	Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property	2016-12-08 10:50:00 -08:00
Faye Li Si Fi	1fde68c86e	better code style	2016-12-07 16:10:03 -08:00
Faye Li Si Fi	b6798adb5c	yay	2016-12-07 15:40:37 -08:00
Faye Li Si Fi	0556661d13	getting rid of uneccessary flag, fix formatting, and getting it to work yay	2016-12-07 15:40:21 -08:00
Faye Li Si Fi	0fcb8803b6	attempt to expose last edited property to script	2016-12-07 12:27:31 -08:00
Brad Davis	5cbf7588ac	Fixes for building on MSVC 2015 / Qt 5.8	2016-12-02 14:58:09 -08:00
Seth Alves	d2b32c3084	Merge pull request #9057 from druiz17/childParent fixed children of parent object not being added back when performing an undo	2016-12-01 16:59:06 -08:00
Dante Ruiz	348c0c95e5	conforming to coding standard and better variable naming	2016-12-01 22:22:17 +00:00
Chris Collins	942850293e	Merge pull request #9105 from druiz17/teleportBug Fix for unable to teleport to areas that you should	2016-12-01 11:35:06 -08: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
Dante Ruiz	1b20cc8bd0	more clean up	2016-11-30 18:28:50 +00:00
Dante Ruiz	104cbbff7e	clean up	2016-11-30 18:26:06 +00:00
Dante Ruiz	34d24b947e	better implementation	2016-11-30 18:03:11 +00:00
Dante Ruiz	daf12047ca	removed unnessary comments	2016-11-22 18:55:20 +00:00
Dante Ruiz	2dfb745443	made some chnages	2016-11-22 18:53:03 +00:00
samcake	dfc0b7beac	adressed reveiw comments	2016-11-22 10:15:49 -08:00
Dante Ruiz	a176c624ab	fixed teleport bug	2016-11-21 23:04:07 +00:00
Dante Ruiz	1ba769b0ef	teleportBug	2016-11-21 10:38:20 -08:00
samcake	9031e65aa5	Merge and fix the bug!!!	2016-11-16 19:12:56 -08:00
Dante Ruiz	66ff81f450	Another function name change	2016-11-16 22:32:15 +00:00
Dante Ruiz	9c4ae9df5a	function name change	2016-11-16 22:09:22 +00:00
Dante Ruiz	ff7c11d48c	Fixed avatar parent delete issue	2016-11-16 13:03:34 -08:00
samcake	982664dac5	Merging with upstream	2016-11-15 18:14:25 -08:00
Brad Hefta-Gaub	84573d373b	Merge pull request #9070 from huffman/fix/docs Add jsdoc to Camera	2016-11-15 13:46:16 -08:00
Ryan Huffman	5fd1ae64b0	Begin adding entities jsdoc	2016-11-14 16:54:55 -08:00
samcake	a05e42138c	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-11-14 09:58:12 -08:00
Seth Alves	15c247fc5e	quiet warnings	2016-11-11 06:37:22 -08:00
Seth Alves	899dec8b10	Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by	2016-11-11 06:11:49 -08:00
samcake	00addcad9e	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-11-10 17:57:34 -08:00
Seth Alves	850361f222	lastEditedBy property for entities	2016-11-10 15:26:28 -08:00
Chris Collins	5b91c8f32b	Merge pull request #8984 from sethalves/fix-setLocalJointRotation-name fix names of model-entity joint setters	2016-11-10 13:39:14 -08:00
samcake	784a0540ed	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-11-10 10:05:03 -08:00
Brad Hefta-Gaub	8758e4a9ba	add support for whitelist entity scripts	2016-11-09 19:17:24 -08:00
Seth Alves	51f6b5af78	code review	2016-11-05 10:35:21 -07:00
Seth Alves	339d6a55cf	getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation	2016-11-03 10:06:07 -07:00
samcake	6926cd274c	Merge with upstream	2016-11-02 18:15:08 -07:00
Seth Alves	844cc03dcb	fix names of model-entity joint setters	2016-11-02 10:24:01 -07:00
Seth Alves	9b7086b1fb	added EntityItemProperties.merge function. when sending edits for avatar-entities, don't call setProperties on the entity. Fix currentFrame bug in AnimationPropertyGroup::copyToScriptValue	2016-10-17 16:11:37 -07:00
Seth Alves	fe09a1a57c	make sure interface accepts server adjustment to lifetime, even for imported entities	2016-10-13 16:45:37 -07:00
Seth Alves	01c1cb328f	don't change UNKNOWN_CREATED_TIME to 1 during addition of LAST_EDITED_SERVERSIDE_BUMP	2016-10-13 15:05:13 -07:00
samcake	8a44140e6b	cleaning up the comments from review and trying something to adress the issue that showed up on i5	2016-10-07 16:04:19 -07:00
samcake	92d71a2e37	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-10-07 10:13:24 -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
samcake	56eb322b7d	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-10-06 15:14:31 -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
samcake	6f7f949343	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-10-06 09:35:48 -07:00
Clément Brisset	d18394f249	Merge pull request #8596 from huffman/feat/my-avatar-self-id Add ability to parent overlays to MyAvatar for use across servers	2016-10-05 12:03:01 -07:00
Ryan Huffman	16d535c495	Move EntityTree RayArgs back to header	2016-10-04 20:20:48 -07:00
Ryan Huffman	ee50469213	Add collidableOnly arg to findRayIntersection	2016-10-04 20:19:54 -07:00
Ryan Huffman	da6afb605b	Fix default findRayIntersection surfaceNormal to be in world space	2016-10-04 20:19:54 -07:00
Ryan Huffman	b0c7e91737	Disable ray picking against invisible objects in far grab and teleport	2016-10-04 20:19:51 -07:00
Ryan Huffman	17c63eb722	Add the ability to ignore invisible entities in findRayIntersection	2016-10-04 20:19:32 -07:00
samcake	81e0266e7e	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-09-28 09:34:29 -07:00
Seth Alves	90adb5f67e	fix an AC script's ability to delete entities	2016-09-26 17:14:45 -07:00
samcake	11c6bb7d80	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-09-13 17:44:42 -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
samcake	3bcea4310d	Fixing the vizualisation shader for world to cluster space	2016-09-10 10:41:18 -07:00
samcake	108910052a	Adding the reverse transformation	2016-09-09 19:00:54 -07:00
David Rowe	68499f49ad	Fix count of textures	2016-09-10 10:15:13 +12:00
Brad Davis	ecfe56085d	GLM update and GLI integration	2016-09-09 10:18:15 -07: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	dc0d0c2d5c	Merge branch 'master' into feature/tablet-ui-foundation	2016-09-07 09:49:55 -07:00
sam	248f172832	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-09-06 23:37:16 -07:00
David Rowe	f83599f855	Merge branch 'master' into 21040	2016-09-07 10:08:51 +12:00
David Rowe	17d30796cc	Use count of textures actually rendered Textures specified in model may be invalid and so not actually rendered.	2016-09-03 13:07:00 +12:00
Seth Alves	b8b1127d55	merge from upstream	2016-09-02 15:11:21 -07:00
Anthony J. Thibault	0128d7c61b	Merge branch 'master' into feature/tablet-ui-foundation	2016-09-02 12:16:25 -07:00
samcake	7b68f1439f	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-09-02 09:28:35 -07:00
Anthony J. Thibault	21bf931559	eventBridge for web entities.	2016-09-01 16:32:06 -07:00
Brad Hefta-Gaub	e1845e2c3f	add support for renderInfo properties to model entities	2016-08-31 15:00:21 -07:00
samcake	b563e280e4	Commuting the LIghtEntityItem changes correctly to the LightRenderItem	2016-08-31 13:55:41 -07:00
samcake	3755a3fc32	Add batch timing information vs gpu	2016-08-29 17:54:17 -07:00
Seth Alves	3fb10d0eea	action for arrow flight, etc	2016-08-28 19:08:13 -07:00
Andrew Meadows	19cd4648ad	scale collision render mesh correctly	2016-08-24 22:26:56 -07:00
Andrew Meadows	acaa77b75a	remove cruft from debug efforts	2016-08-24 22:26:56 -07:00
Andrew Meadows	b0a0293e6e	move compoundResource out of Model class	2016-08-24 22:26:56 -07:00
Andrew Meadows	3b772d2fe6	fallback to SIMPLE_COMPOUND when can't do COMPOUND	2016-08-24 22:26:56 -07:00
Andrew Meadows	b2dfa49a6f	stubbery for alerting entity that shape changed	2016-08-24 22:25:45 -07:00
Anthony J. Thibault	31ed378dbf	Added dpi entity property for web-entities	2016-08-23 10:10:26 -07:00
Anthony J. Thibault	6704ae9ad4	Added dpi parameter to userData (this is temporary)	2016-08-23 10:09:17 -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
Anthony J. Thibault	8bb6bb7c6f	generalized keyboard focus interface Removed dynamic casts to RenderableWebEntityItem, instead virtual methods were added to EntityItem to facilitate this. * bool wantsKeyboardFocus() * void setProxyWindow() * QObject* getEventHandler()	2016-08-19 10:56:52 -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
Brad Hefta-Gaub	1cec7b2db0	Merge pull request #8429 from SamGondelman/loadingFade2 Don't do fade effect once physics kick in	2016-08-18 12:46:24 -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	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
Anthony J. Thibault	d4e1f53581	Fix for inconsistent override warning in WebEntityItem.h	2016-08-16 17:48:28 -07:00
Anthony J. Thibault	7de8cc6422	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-16 16:49:57 -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
SamGondelman	ccca6d935f	don't fade after physics kick in	2016-08-12 14:35:22 -07:00
Ryan Huffman	211da3c428	Add more user activity tracking data	2016-08-11 16:49:29 -07:00
Seth Alves	15e2140cb2	Merge branch 'master' of github.com:highfidelity/hifi into overlay-children	2016-08-11 15:06:58 -07:00
Anthony J. Thibault	1ddbd7022a	Moved keyboardFocus, mouse/touch event methods from Reticle to Entities	2016-08-11 11:52:04 -07:00
Brad Hefta-Gaub	a714f325fe	Merge pull request #8333 from SamGondelman/miscFixes Miscellaneous cmake and render engine improvements	2016-08-10 11:06:50 -07:00
SamGondelman	36d9f92101	performance optimization to minimize calling usecTimestampNow	2016-08-09 13:10:02 -07:00
SamGondelman	ac9a80131a	refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes	2016-08-04 12:34:46 -07:00
SamGondelman	d63a0ef08f	working on making other entities transparent	2016-08-02 18:09:42 -07:00
Seth Alves	e4e86c245e	3d overlays can be children of entities or avatars	2016-07-31 14:11:56 -07:00
SamGondelman	676f4bdfcf	misc fixes from particles branch	2016-07-29 15:36:32 -07:00
Zander Otavka	c25b87c33f	Use custom dialog for asset server add to world	2016-07-22 17:14:45 -07:00
Seth Alves	5f6e608207	don't overwrite physical properties with those from the entity during editEntity -- only set those that the script didn't.	2016-07-19 11:23:21 -07:00
Brad Davis	03cb6175ab	Support triangle and hexagon shapes, add shape support to overlays.	2016-07-15 22:02:17 -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
Andrew Meadows	431043e195	declare new shape types	2016-07-06 10:50:51 -07:00
Seth Alves	b9f9b18083	if an edit packet doesn't include a change to lifetime, don't attempt to cap the lifetime	2016-06-30 15:41:58 -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
Zander Otavka	2786061d71	Fix bug with entity adding w/o permission Entities could be added to the local tree, but be rejected by the server because of a lack of permissions.	2016-06-24 16:34:54 -07:00
Brad Hefta-Gaub	2e8f6c2cc6	Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject cap lifetime rather than reject edits from nodes which only have tmp-rez rights	2016-06-24 14:08:29 -07:00
Seth Alves	2fd38c1585	when adding or editing an entity from a script, make the _lastEdited in the transmitted properties be the same as the one in the Entity in the local tree	2016-06-23 13:10:15 -07:00
Andrew Meadows	1d8d1240ca	remove override to avoid new Jenkins OSX warnings	2016-06-23 10:38:46 -07:00
Andrew Meadows	8009d23f70	more STATIC_MESH and dynamic overlap prevention	2016-06-22 15:20:45 -07:00
Seth Alves	c62b73bf61	when the entity-server caps a lifetime of an edit from a tmp-rez only interface, bump the lastEdited time forward so that the interface accepts the change back into its local tree	2016-06-22 11:42:57 -07:00
Seth Alves	9ca27f267d	cap lifetime rather than reject edits from nodes which only have tmp-rez rights	2016-06-21 16:48:04 -07:00
Andrew Meadows	702e83ba6a	prevent incompatible entity properties combos	2016-06-21 14:03:21 -07:00
Andrew Meadows	937bd0c1be	SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH	2016-06-21 13:54:21 -07:00
Andrew Meadows	f41fb30ace	add "Static Mesh" option to edit.js	2016-06-20 17:29:20 -07:00
humbletim	e65e6dc9ce	Fix entity lifetime guards (re: canRez/canRezTmp)	2016-06-19 13:40:03 -04:00
Atlante45	fc7b271e50	Missed OS X Warning	2016-06-14 16:29:50 -07:00
James B. Pollack	1306417c8e	more verbose messaging about incorrect entity types	2016-06-13 17:48:58 -07:00
Seth Alves	99bfc76dd3	Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam	2016-06-13 11:14:26 -07:00
Brad Hefta-Gaub	da28b0f3e7	Merge pull request #8048 from ctrlaltdavid/20961 fix import of invalid JSON file failing silently	2016-06-12 19:42:53 -07:00
David Rowe	2953ca08cb	Fix import of invalid JSON file failing silently	2016-06-10 12:04:41 +12:00
Seth Alves	5650ef9d52	have code where physics guesses at server values also avoid doing simple simulation of children of avatars	2016-06-09 14:35:17 -07:00
Seth Alves	bade215907	maximum 'tmp' entity lifetime is now a domain-server setting, defaults to 1 hour	2016-06-09 10:41:30 -07:00
Seth Alves	d7fc789ea7	try harder to not do simple-simulation on things that have an avatar ancestor	2016-06-08 13:47:52 -07:00
Seth Alves	a1766539f4	don't do simple simulation on children of avatars	2016-06-08 12:17:07 -07:00
Seth Alves	1977efae4f	Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid	2016-06-08 10:36:52 -07:00
Atlante45	71fb0e665f	Fix OSX warning	2016-06-07 16:46:32 -07:00
Seth Alves	b2f63a2132	hook up can-rez-tmp and can-write-to-asset-server	2016-06-07 16:17:58 -07:00
Brad Hefta-Gaub	30526374bc	Merge pull request #7996 from ctrlaltdavid/get-entity-children add Entities.getChildrenIDs() method	2016-06-06 16:25:25 -07:00
Brad Hefta-Gaub	b4721ec57e	Merge pull request #7973 from ctrlaltdavid/clipboard-dimensions add Clipboard.getContentsDimensions() JavaScript method	2016-06-06 12:03:10 -07:00
Andrew Meadows	c2317adf06	undo ambitious cleanup (try again another day)	2016-06-03 11:06:36 -07:00
Andrew Meadows	211bbb88e6	purge SHAPE_TYPE_ELLIPSOID which wasn't used	2016-06-03 10:47:54 -07:00
Andrew Meadows	c066b4d4ac	purge collision shape for ParticleEffectEntityItem	2016-06-03 10:47:54 -07:00
Andrew Meadows	5d9e320dd7	purge SHAPE_TYPE_LINE	2016-06-03 10:47:54 -07:00
Brad Hefta-Gaub	1075ba1599	CR feedback	2016-06-03 08:01:09 -07:00
Brad Hefta-Gaub	7ed35399e9	make the application of redundant physics update idempotent to improve action glitches	2016-06-02 18:01:23 -07:00
David Rowe	44fe7c1144	Add Entities.getChildrenIDs() method	2016-06-02 21:26:33 +12:00
David Rowe	7a8954d851	Merge branch 'master' into clipboard-dimensions	2016-06-02 12:55:23 +12:00
Brad Hefta-Gaub	0ec7eae58c	fix shapes to property polymorph and persist	2016-05-27 16:59:42 -07:00
David Rowe	2f3fa80b96	Add Clipboard.getContentsDimensions() JavaScript method	2016-05-26 09:52:22 +12:00
Brad Davis	b16e701ea3	Fix broken protocol for shapes	2016-05-25 13:53:28 -07:00
Brad Davis	8f3918b5ba	Fix primitive shape collisions	2016-05-25 11:21:05 -07:00
Brad Hefta-Gaub	b8b39b962d	Merge pull request #7868 from jherico/entity_shape Add a generic shape primitive	2016-05-24 08:40:58 -07:00
Brad Davis	2c703e963c	More shapes	2016-05-22 19:48:59 -07:00
Brad Davis	cd1e910844	Add a generic shape primitive	2016-05-21 23:46:44 -07:00
Seth Alves	40e862cf9e	quiet gcc 5 warnings	2016-05-21 16:53:01 -07:00
Brad Hefta-Gaub	ac49feda22	Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS Conflicts: libraries/entities/src/EntityEditPacketSender.h	2016-05-21 09:23:45 -07:00
Seth Alves	637735bbc3	unmangle merge	2016-05-20 18:07:38 -07:00
Seth Alves	f91a2403be	merge from upstream	2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub	18613908df	Merge pull request #7800 from sethalves/no-fly-zones No fly zones	2016-05-20 16:59:55 -07:00
Seth Alves	ff36b39067	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-20 14:38:53 -07:00
Brad Hefta-Gaub	770fab956f	remove dead code	2016-05-20 12:23:06 -07:00
Seth Alves	7ea7bd3e1d	set created-time for imported entities to 'now'	2016-05-19 10:21:04 -07:00
Seth Alves	74520f5c92	Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones	2016-05-19 09:49:44 -07:00
Seth Alves	419c744bd4	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-19 09:49:18 -07:00
Brad Hefta-Gaub	67891abf17	Merge pull request #7877 from Atlante45/fix/asset-client Fix Asset Client crash	2016-05-18 11:37:34 -07:00
Brad Hefta-Gaub	9a3b6bf081	Merge pull request #7858 from Atlante45/remove-deprecated-entity-props removed dead code for overlays/entities glow level	2016-05-18 09:14:26 -07:00
Seth Alves	cf829f1bab	magic number	2016-05-17 19:14:44 -07:00
Seth Alves	3380b2a668	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-17 19:10:33 -07:00
Seth Alves	d77b3bf59a	fix some comments and debug pritns	2016-05-16 14:12:05 -07:00
Atlante45	0878d87ac7	remove some unnecessary dependencies	2016-05-14 14:50:02 -07:00
Atlante45	38f74c1843	Remove the last of the glow level	2016-05-14 14:49:31 -07:00
Seth Alves	9bd4b4f8d8	Merge branch 'master' of github.com:highfidelity/hifi into fix-update-entity-operator	2016-05-13 07:12:11 -07:00
Seth Alves	2f93a38a6a	Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3	2016-05-12 11:17:18 -07:00
Seth Alves	63073301ee	try again to fix update logic	2016-05-12 11:16:42 -07:00
Seth Alves	c9c619916c	Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones	2016-05-11 19:37:57 -07:00
Seth Alves	2101d7dea3	Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3	2016-05-11 18:50:01 -07:00
Seth Alves	ce3faa2916	fix logic in UpdateEntityOperator	2016-05-11 18:47:20 -07:00
Seth Alves	ac506dc4b7	where needed, copy clientOnly into properties before calling queueEditEntityMessage	2016-05-11 12:46:16 -07:00
Seth Alves	872f1b0c64	clear avatarEntity data for entities that are deleted	2016-05-10 17:48:55 -07:00
Seth Alves	e4e0be8fa3	relay owningAvatar from properties to entity on entity creation	2016-05-10 16:51:38 -07:00
Seth Alves	de12680ff1	don't put actions on other people's avatarEntities	2016-05-10 16:43:27 -07:00
Seth Alves	144715f00c	don't make changes to other avatar's avatarEntities	2016-05-10 16:05:40 -07:00
Seth Alves	4b13fd969e	split code that sends edits via avatar-mixer out of queueEditEntityMessage	2016-05-10 15:37:54 -07:00
Seth Alves	de4c9530c9	carry clientOnly flag over from properties when addEntity is called	2016-05-10 14:48:12 -07:00
Seth Alves	f90b9ec65d	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub	350743454b	Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1 use smart pointers for entity simulations	2016-05-10 11:35:57 -07:00
Seth Alves	4c1f815870	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-10 10:09:40 -07:00
Brad Hefta-Gaub	d7eee98acc	Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum resurrection of threadsafe ViewFrustum	2016-05-10 09:06:38 -07:00
Seth Alves	b761ecf44f	merge from upstream	2016-05-10 08:18:45 -07:00
Andrew Meadows	ffc3123467	Merge pull request #7658 from sethalves/grab-fixes Grab fixes	2016-05-09 15:30:37 -07:00
Seth Alves	473010f634	addEntity has a clientOnly flag now	2016-05-07 16:45:09 -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
Andrew Meadows	7d6424bdcc	Head::render() was cruft	2016-05-05 18:28:27 -07:00
Andrew Meadows	bcf2cc8074	use references not pointers for ViewFrustums also unravelling some spaghetti: (1) split Octree stuff out of ViewFrustum (2) moved ViewFrustum from octree to shared lib (3) removed some cruft	2016-05-05 18:28:27 -07:00
Atlante45	07adef9465	Fix entities collision sounds	2016-05-05 14:55:28 -07:00
Seth Alves	cd934bab90	set _actionDataDirty when adding an action.	2016-05-05 14:16:13 -07:00

... 20 21 22 23 24 ...

4263 commits