3955 commits

Author	SHA1	Message	Date
SamGondelman	b5b7574c48	set created	2019-01-04 16:52:11 -08:00
David Back	5ea84fb952	CR fixes	2019-01-04 15:39:27 -08:00
SamGondelman	1452d237e2	trying to fix avatar entity issue	2019-01-04 14:34:46 -08:00
Andrew Meadows	13a3982b5a	fix ZoneEntityItem::contains() for model shapes	2019-01-04 12:38:32 -08:00
Andrew Meadows	a642af23b7	enable shapeType=ellipsoid and expose zone shapeType to UI	2019-01-04 12:37:23 -08:00
Andrew Meadows	a656ea723e	special handling of SPHERE case in EntityItem::contains()	2019-01-04 12:37:23 -08:00
Andrew Meadows	65e920039c	cleaner return logic for EntityItem::contains() cylinder cases	2019-01-04 12:37:23 -08:00
Andrew Meadows	7625aebaa8	remove reduntant model-networking link dependency	2019-01-04 12:37:23 -08:00
Andrew Meadows	a8325b5c00	add ZoneEntityItem::contains() and support for shapes	2019-01-04 12:37:23 -08:00
Andrew Meadows	b480720409	proper shape support for EntityItem::contains(point)	2019-01-04 12:37:23 -08:00
David Back	ad25d50934	follow-up merge from PR 14585	2019-01-04 12:01:13 -08:00
David Back	eff9d11437	Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit	2019-01-04 11:07:28 -08:00
Andrew Meadows	65a7e15f5d	don't send AvatarEntity updates when not necessary	2019-01-03 17:57:11 -08:00
Sam Gondelman	5a6f9eb9e3	Merge branch 'master' into NOverlays8	2019-01-03 15:11:48 -08:00
SamGondelman	a2fe8ef9e7	merge with master	2019-01-03 13:51:07 -08:00
SamGondelman	4cd1cd6606	merge with master	2019-01-03 12:56:41 -08:00
Seth Alves	a7515a4bde	include owningAvatarID in entityPropertyFlagsFromScriptValue	2019-01-03 08:18:34 -08:00
Seth Alves	3ccbd0bc7b	disable positionand velocity script edits on grabbed entities	2019-01-03 08:17:52 -08:00
Seth Alves	54a5805b5c	add final edit when dropping an avatar-entity. don't allow grabbing of other's avatar entities	2019-01-03 08:17:52 -08:00
Seth Alves	05a80ae0e4	don't bootstrap with a traits-based grab	2019-01-03 08:17:52 -08:00
Seth Alves	895e8cdba1	fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again	2019-01-03 08:17:52 -08:00
Seth Alves	bc5079e5d7	fix flawed logic in updateEntityQueryAACubeWorker	2019-01-03 08:17:52 -08:00
Seth Alves	38cc2205ec	dimensions is a simulation restricted change	2019-01-03 08:17:52 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
SamGondelman	ea11497a67	Merge remote-tracking branch 'upstream/master' into NOverlays7	2019-01-02 18:09:19 -08:00
SamGondelman	a9d798070a	wip	2019-01-02 18:08:59 -08:00
David Back	b92beca7d1	bad merge	2019-01-02 11:26:38 -08:00
unknown	dde7fbdfce	how did these happen	2019-01-02 11:15:22 -08:00
unknown	f8f13e974d	property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties	2019-01-02 11:12:10 -08:00
SamGondelman	32bec57cfe	Merge remote-tracking branch 'upstream/master' into NOverlays6	2019-01-02 09:53:29 -08:00
SamGondelman	bb030660bd	Merge remote-tracking branch 'upstream/master' into NOverlays4	2018-12-20 13:26:23 -08:00
Shannon Romano	21ec4e0c53	Merge pull request #14524 from SamGondelman/NOverlays3 ... Case 20132, Case 16928: First class Image Entities	2018-12-20 21:20:49 +00:00
Shannon Romano	b6d1607acd	Merge pull request #14547 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities	2018-12-20 19:10:22 +00:00
SamGondelman	05e0fb464e	new improved polylines	2018-12-19 15:01:49 -08:00
SamGondelman	3578df7a0e	material targeting	2018-12-19 13:28:33 -08:00
Sam Gondelman	e890fc6980	Merge branch 'master' into NOverlays3	2018-12-19 11:37:10 -08:00
Adam Smith	828672343a	Merge pull request #14523 from SamGondelman/NOverlays2 ... Case 20131: Cleanup some Entity Properties	2018-12-19 11:33:24 -08:00
SamGondelman	6094a2f0a0	add back line entities, undo polyline changes temporarily	2018-12-14 15:41:11 -08:00
SamGondelman	5dd00bed1d	new improved polylines	2018-12-14 14:15:56 -08:00
SamGondelman	770da220d7	cleanup entity properties more and start polyline work, remove lines	2018-12-12 16:47:35 -08:00
SamGondelman	b261665072	working on lines	2018-12-12 09:39:01 -08:00
SamGondelman	250baa9c72	add missing properties to text entities	2018-12-11 15:42:24 -08:00
SamGondelman	fd8245e258	Merge remote-tracking branch 'upstream/master' into NOverlays6	2018-12-11 10:46:39 -08:00
SamGondelman	cd83be162c	merge with NOverlays3	2018-12-11 10:38:55 -08:00
Shannon Romano	bb9a764855	Merge pull request #14517 from luiscuenca/getEntityJointParent ... Add method to check entities joint hierarchy	2018-12-11 01:06:38 +00:00
SamGondelman	5eccaad135	remove new API	2018-12-10 13:05:39 -08:00
SamGondelman	6aac596698	updated entityscriptinginterface API and related functions	2018-12-07 15:25:21 -08:00
Alexander Ivash	600d09e533	relax 'isWearable()' condition to match latest changes in 'master'	2018-12-07 11:23:17 +03:00
Alexander Ivash	72a91668a5	FB19219 Make avatarapp to handle wearables update via drag&drop	2018-12-07 11:23:17 +03:00
Sam Gondelman	d21d764131	Merge branch 'master' into NOverlays4	2018-12-06 12:48:05 -08:00
Sam Gondelman	2291c7e5fb	Merge branch 'master' into NOverlays3	2018-12-06 12:37:18 -08:00
Sam Gondelman	533e0e0326	Merge branch 'master' into NOverlays2	2018-12-06 12:29:38 -08:00
Luis Cuenca	37854ab05e	Add jsdoc information	2018-12-06 11:58:48 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Sam Gondelman	c38a6966a9	Merge branch 'master' into NOverlays4	2018-12-06 11:25:43 -08:00
Sam Gondelman	a7c083e97a	Merge branch 'master' into NOverlays2	2018-12-06 11:24:27 -08:00
Sam Gondelman	d30dd4c26c	Merge branch 'master' into NOverlays3	2018-12-06 11:23:50 -08:00
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
SamGondelman	abef5c4d61	fix grab billboarding bug	2018-12-05 15:05:01 -08:00
SamGondelman	305cb6d323	grid entities	2018-12-03 18:04:34 -08:00
SamGondelman	98f9dc0ca4	remove grid entity files	2018-12-03 12:07:26 -08:00
SamGondelman	3ce6f7f3d6	real image entities	2018-12-03 11:50:59 -08:00
SamGondelman	1fd8a21f8e	cleanup	2018-12-03 11:07:54 -08:00
luiscuenca	ad42f6a590	Add method to check entities joint hierarchy	2018-12-01 12:32:29 -07:00
SamGondelman	e282d51883	CR	2018-11-26 01:15:07 -05:00
SamGondelman	e8d45c46c1	shouldn't be able to write actionData	2018-11-19 23:31:20 -05:00
Seth Alves	d19cdc62d7	Merge pull request #14135 from ElderOrb/FB18573 ... FB18573 - Other avatars' avatar entities may appear to be successfull…	2018-11-16 10:05:22 -08:00
SamGondelman	8dbb2d806b	local entities are always collisionless	2018-11-14 14:48:07 -08:00
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
Simon Walton	82e21e89e4	Merge remote-tracking branch 'upstream/master' into max-json-size	2018-11-13 17:26:20 -08:00
Simon Walton	167a8fdc04	Merge branch 'master' into max-json-size	2018-11-13 14:57:06 -08:00
Brad Hefta-Gaub	bb2239c0bd	Merge pull request #14359 from howard-stearns/no-url-logging ... remove urls from logs in Interface	2018-11-13 13:19:30 -08:00
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
Simon Walton	d183968175	Add skipThoseWithBadParents functionality to octree visitor; reviewer suggestions	2018-11-08 18:20:20 -08:00
Ryan Huffman	1ff644b619	Merge pull request #14256 from ctrlaltdavid/M17008 ... Fix Interface crash importing JSON with duplicate entity IDs in file	2018-11-08 11:04:43 -08:00
Zach Fox	142dfab9ac	CR round 1	2018-11-08 10:05:57 -08:00
Zach Fox	1ab1cb95d8	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
Roxanne Skelly	cef7000a72	Case 19754 - Remove logging URLs and related file locations. ... The goal is to strip out data that can be used by untoward users in copying models, avatars, etc.	2018-11-06 16:24:32 -08:00
sabrina-shanman	2801f324b7	Switch references to HFM to the HFM lib and remove HFM classes in FBX	2018-11-05 12:47:34 -08:00
Zach Fox	b43ad15fa7	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-01 11:32:38 -07:00
Simon Walton	6f6c92e647	Remove unused variable	2018-10-30 09:40:08 -07:00
SamGondelman	df005eedbf	fix shape not getting marked changed	2018-10-29 17:43:16 -07:00
John Conklin II	fa2fb3a87a	Merge pull request #14246 from sethalves/sync-grab-props ... keep userData and new grab properties in sync	2018-10-26 11:52:47 -07:00
SamGondelman	faff5f11e8	Merge remote-tracking branch 'upstream/master' into particleLoad	2018-10-25 10:56:11 -07:00
Seth Alves	c5aafd4644	fix spatialKey conversion	2018-10-25 07:47:16 -07:00
Seth Alves	387a8ce933	fix QJsonArray handling	2018-10-25 07:47:15 -07:00
Seth Alves	252e504ab9	attempt to keep userData and new grab properties in sync	2018-10-25 07:47:15 -07:00
Zach Fox	d1556ae4e8	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-23 15:51:34 -07:00
Kerry Ivan Kurian	e7d1c2873a	Merge branch 'master' into log-resource-requests-2	2018-10-23 13:46:59 -07:00
Zach Fox	988bca201b	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-23 13:36:46 -07:00
SamGondelman	8807b90474	fix emitRadiusStart	2018-10-23 13:33:14 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
David Rowe	794767144f	Fix Interface crash importing JSON with duplicate entity IDs in file	2018-10-23 15:30:33 +13:00
Zach Fox	493262052c	Remove extraneous code changes; remove QUrlAncestry code; remove extra logging	2018-10-22 13:59:52 -07:00
Zach Fox	7be5d5674d	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-22 13:59:35 -07:00
Zach Fox	1eca1bfd55	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-22 11:18:10 -07:00
Sam Gateau	6005b934ad	Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001 ... minor bug fix and optimization in ModelEntity animation	2018-10-19 17:02:48 -07:00
Brad Davis	2687c024eb	Fix light color / serialization	2018-10-19 14:47:02 -07:00
Zach Fox	2f37a2b1a1	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-18 11:12:26 -07:00
Andrew Meadows	6558d539e4	adjust simulation bid priority by props changed	2018-10-18 10:33:02 -07:00
Andrew Meadows	9bfa4a5267	remove unhelpful/wrong TODO comment	2018-10-18 10:33:02 -07:00
Andrew Meadows	1a685d2409	set script-triggerd sim ownership priority correctly	2018-10-18 10:33:02 -07:00
Andrew Meadows	ce81ab1f9d	don't edit restricted properties unless sim ownership possible	2018-10-18 10:33:02 -07:00
Andrew Meadows	bb51079284	move some bid-prep logic from EntityMotionState to EntityItem	2018-10-18 10:33:02 -07:00
Andrew Meadows	0b34524ba0	minimimze time holding locks on tree in editEntity()	2018-10-18 10:31:27 -07:00
Andrew Meadows	21654ba77c	cleanup access to sessionID	2018-10-18 10:31:27 -07:00
Andrew Meadows	f63610af2b	namechange: TerseUpdate --> TransformAndVelocities	2018-10-18 10:31:27 -07:00
Zach Fox	2a9e0041b2	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-18 10:16:07 -07:00
John Conklin II	1cc2569bd8	Merge pull request #13596 from SamGondelman/scriptvec3 ... Replace vec2, vec3, and xColor properties with JS prototypes	2018-10-18 09:47:56 -07:00
Kerry Ivan Kurian	3b15548ea3	Display resource-access events in marketplace item tester ... Includes refactoring marketplace item tester into a single-page app.	2018-10-18 01:04:47 -07:00
Simon Walton	be279f08dc	Restore the addMarketplaceIDToDocumentEntities() hack ... Fixes for Linux compiles; other improvements	2018-10-17 15:43:38 -07:00
John Conklin II	8e5bc1678f	Merge pull request #14219 from SamGondelman/materialCull ... QueryAACube fixes and materials expand to include their parent	2018-10-17 15:15:23 -07:00
Sam Gondelman	3f117cd3e0	Merge branch 'master' into scriptvec3	2018-10-17 13:57:21 -07:00
Brad Hefta-Gaub	0e0542ec6e	Merge pull request #13890 from sethalves/grab-properties-1 ... move grab pseudo-properties (userData) into first-class EntityItemProperties	2018-10-17 13:29:20 -07:00
Sam Gondelman	e3543cf098	Merge branch 'master' into scriptvec3	2018-10-17 13:10:29 -07:00
Andrew Meadows	0c61779331	remove deprecated cruft; stub setAnimationURL() override	2018-10-17 11:45:39 -07:00
Andrew Meadows	148944814b	consolidate two bad string checks into one	2018-10-17 11:45:39 -07:00
John Conklin II	eb088772d0	Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls ... Fix "Good" collision not honoring mesh groups in OBJ files	2018-10-17 11:12:21 -07:00
Sam Gondelman	cba4a4139a	fix compile error	2018-10-16 18:25:17 -07:00
SamGondelman	49b496046b	queryAACube fixes	2018-10-16 14:35:39 -07:00
Simon Walton	ad9f7f3a1d	Include the skipDefaults option in case we ever need it ... Also print errors from parsing entities file; other tweaks	2018-10-12 11:18:38 -07:00
Simon Walton	0eec0e376c	Convert EntityTree direct to JSON, not via QJsonDocument	2018-10-11 18:13:26 -07:00
Zach Fox	7de784ce27	First steps (definitely not working)	2018-10-10 12:32:55 -07:00
Sam Gondelman	67662df760	Merge branch 'master' into scriptvec3	2018-10-08 12:59:34 -07:00
divya	91df342ae9	Merge pull request #14094 from wayne-chen/interstitialMerged ... Merged interstitial page/redirect domain improvements	2018-10-08 10:32:29 -07:00
sabrina-shanman	c8cccc5ec7	Fix "good" collision not subdividing OBJ meshes by group	2018-10-08 09:24:33 -07:00
Andrew Meadows	c3478dc018	remove expired avatarEntities from their avatars	2018-10-05 13:48:35 -07:00
Dante Ruiz	651f37aceb	Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged	2018-10-04 15:01:39 -07:00
Dante Ruiz	bda9735b5d	fix loading progress	2018-10-04 15:01:16 -07:00
John Conklin II	afe6d97b00	Merge pull request #14100 from danteruiz/soft-entities-updates ... update soft entities and fix deadlock from qml.	2018-10-04 13:33:34 -07:00
Alexander Ivash	9cf94c968a	FB18573 - Other avatars' avatar entities may appear to be successfully deleted until edited ... note: partially revert commit 888f2f64a5 / "Merge pull request #10981 from druiz17/bug/delete-avatar-entity	2018-10-03 03:15:36 +03:00
Sam Gondelman	5b6e7b2566	Merge branch 'master' into scriptvec3	2018-10-02 08:58:04 -07:00
Seth Alves	834699fa12	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-02 08:54:12 -07:00
John Conklin II	3ab83731b9	Merge pull request #14087 from sethalves/quiet-asan ... fix several uninitialized reads	2018-10-01 16:48:54 -07:00
Brad Hefta-Gaub	6290b56383	Merge pull request #14079 from luiscuenca/simpleAvatarTransit ... Simple avatar transit	2018-10-01 16:24:46 -07:00
Brad Hefta-Gaub	edd5db7768	Merge pull request #14042 from thoys/perf/create/getMultipleEntities ... Speed up Entity List properties fetching by adding Entities.getMultipleEntities API	2018-10-01 16:16:48 -07:00
Dante Ruiz	31baa46ee0	merging from master	2018-10-01 09:44:54 -07:00
John Conklin II	11492ce8ee	Merge pull request #14045 from sethalves/enterEntity-wait-for-script ... don't call enterEntity before the entity's script is loaded	2018-09-28 16:07:08 -07:00
Dante Ruiz	c1c853790b	update soft entities and fix deadlock	2018-09-27 14:53:28 -07:00
Seth Alves	ff2a47e7e6	fix several uninitialized reads	2018-09-26 09:33:12 -07:00
Thijs Wenker	80beb6c444	addressed CR feedback	2018-09-25 22:43:58 +02:00
John Conklin II	55848e6959	Merge pull request #14008 from sethalves/fix-local-angular-velocity ... fix bug that caused localAngularVelocity to get zeroed out	2018-09-24 14:32:57 -07:00
luiscuenca	012cd207b3	No data sent during basic transit	2018-09-24 11:39:10 -07:00
Seth Alves	f6e57f54b0	don't call enterEntity until script preload has finished	2018-09-21 10:26:55 -07:00
Thijs Wenker	1094b6722f	self-CR	2018-09-20 23:36:53 +02:00
Thijs Wenker	e2cb96193d	JSDocs	2018-09-20 22:47:14 +02:00
Thijs Wenker	6d72881f3f	remove commented out test code	2018-09-20 21:14:30 +02:00
Thijs Wenker	06491ef12f	API function for retrieving multiple entity properties with better performance	2018-09-20 19:34:00 +02:00
Seth Alves	1a44054c49	attempt fix for fb-17131	2018-09-15 09:15:43 -07:00
SamGondelman	c522d1bc93	merge with master	2018-09-14 00:57:13 -07:00
Sam Gondelman	42ded53b5f	Merge branch 'master' into modelBugs	2018-09-12 14:35:46 -07:00
Wayne Chen	63ad85215b	Merge branch 'master' into interstitalMerged	2018-09-11 17:17:33 -07:00
SamGondelman	9a2bdda365	make animation properties threadsafe	2018-09-10 11:58:45 -07:00
John Conklin II	405e2da91e	Merge pull request #13949 from sabrina-shanman/stt_parenting_scale ... Scale Collision Pick to match parent	2018-09-07 11:54:02 -07:00
sabrina-shanman	8d4c47cf8e	Make template specialization of BaseNestableTransformNode explicit	2018-09-07 08:49:44 -07:00
sabrina-shanman	836f810c41	Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code	2018-09-06 16:33:29 -07:00
sabrina-shanman	3f7a7fb11a	Return early from AvatarTransformNode and similar when getTransform fails	2018-09-06 10:29:01 -07:00
sabrina-shanman	f7226757ad	Just import TransformNode in AvatarTransformNode.h and similar	2018-09-06 10:03:05 -07:00
sabrina-shanman	e8ce152687	Scale collision picks relative to parent by adding and using more ... specialized transform nodes.	2018-09-05 16:51:28 -07:00
Wayne Chen	c47788efe4	merging with dante's PR	2018-09-04 18:00:06 -07:00
SamGondelman	589e88af4a	Merge remote-tracking branch 'upstream/master' into scriptvec3	2018-09-04 17:54:45 -07:00
SamGondelman	9b75c7e07f	trying to separate colors and vectors	2018-09-04 17:20:05 -07:00
SamGondelman	0c8a4cc81e	merge with master	2018-08-28 17:31:51 -07:00
SamGondelman	aae06e8f49	faster aabox ray intersection and pre-computed inverse direction	2018-08-27 15:40:33 -07:00
Sam Gondelman	6730635931	Merge branch 'master' into scriptvec3	2018-08-27 10:43:52 -07:00
Dante Ruiz	af19849a75	fixing merge conflict	2018-08-24 15:48:42 -07:00
Dante Ruiz	3796675123	script update and visuallyReady entities	2018-08-24 15:46:39 -07:00
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -07:00
SamGondelman	b5b7167644	add to stats	2018-08-23 17:56:24 -07:00
SamGondelman	283c0c0311	s i m p l i f y	2018-08-23 11:47:56 -07:00
SamGondelman	5c0b12abf6	ordered ray/parabola intersection code	2018-08-22 16:29:17 -07:00
Stephen Birarda	99f532a20e	always check added avatar entities once in updateAvatarEntities	2018-08-21 10:32:05 -07:00
Stephen Birarda	e33f349d53	fix flagging for avatar entity update/delete	2018-08-21 10:32:05 -07:00
Sam Gondelman	f0986a7f5a	Merge branch 'master' into scriptvec3	2018-08-20 10:56:45 -07:00
John Conklin II	1edf1b4337	Merge pull request #13555 from SamGondelman/destroy ... Trying to fix dependency shutdown	2018-08-16 13:14:58 -07:00
John Conklin II	02f53c4ee5	Merge pull request #13808 from dback2/createEntitiesGrabbable ... Use Create Entities as Grabbable option when adding asset to world	2018-08-16 09:22:23 -07:00
Andrew Meadows	fd9876cb63	don't attempt physics with invalid modelURL	2018-08-13 13:30:30 -07:00
unknown	5641c59f5f	Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable	2018-08-10 09:49:37 -07:00
David Back	8db0711b5b	set grabbable user data in addModelEntity, pass grabbable from asset browser	2018-08-08 16:33:47 -07:00
SamGondelman	fb75b42059	working on enabling bloom	2018-08-07 22:26:30 -07:00
Sam Gondelman	7772e8adf2	Merge branch 'master' into scriptvec3	2018-08-03 14:57:49 -07:00
SamGondelman	1ba28de5b6	try to fix nodelist not getting destroyed	2018-08-01 17:52:27 -07:00
David Back	0b9e520b53	fix grab cloning parented entitiy	2018-08-01 16:00:25 -07:00
John Conklin II	7a635b6a57	Merge pull request #13709 from thoys/fix/require-load-queue ... MS17041: Fix for require fail when the same script loaded simultaneously from another entity script	2018-08-01 11:15:32 -07:00
Thijs Wenker	003e826d60	move over definition so it could be linked in the assignment-client too	2018-08-01 00:23:34 +02:00
SamGondelman	7c8d080050	Merge remote-tracking branch 'upstream/master' into scriptvec3	2018-07-31 14:04:23 -07:00
Thijs Wenker	74343c71d8	CR fixes	2018-07-31 22:29:53 +02:00
SamGondelman	2ca217eb4a	merge with master	2018-07-30 17:43:15 -07:00
David Rowe	b36b981b55	Merge branch 'master' into M19690 ... # Conflicts: # libraries/entities/src/EntityItemProperties.cpp	2018-07-31 08:41:32 +12:00
Sam Gondelman	8201997a16	Merge pull request #13660 from SamGondelman/parabolic ... Parabolic Picking + Pointers	2018-07-30 10:49:02 -07:00
John Conklin II	fc88165e23	Merge pull request #13696 from SamGondelman/particleRot ... Particles don't spin with head roll, new spin + rotateWithEntity properties	2018-07-27 14:54:48 -07:00
Sam Gateau	a95ddb0492	Merge pull request #13616 from AndrewMeadows/remove-cruft-001 ... remove cruft for rendering collision shapes	2018-07-27 19:19:44 +02:00
SamGondelman	6a52b7b8f3	CR improvements	2018-07-26 12:15:12 -07:00
SamGondelman	1c1b68ee66	emitterShouldTrail fix, review comments, rotateWithEntity	2018-07-26 11:41:16 -07:00
David Rowe	51865294ac	Fix radius and alpha start/finish values	2018-07-26 09:54:42 +12:00
John Conklin II	21d043d179	Merge pull request #13534 from huffman/fix/ess-avatar-entities ... Fix crash when editing avatar entities with no myAvatar	2018-07-25 14:21:12 -07:00
Sam Gondelman	d29332595b	jsdoc fixes	2018-07-25 09:54:14 -07:00
SamGondelman	4750611af9	particles don't spin with head roll, add particle spin properties, negative emitSpeed	2018-07-24 23:47:58 -07:00
David Rowe	1ac6845899	Fix ParticleEffect entity JSDoc	2018-07-25 09:16:46 +12:00
SamGondelman	645f905239	cleanup, model performance improvements	2018-07-24 13:25:49 -07:00
SamGondelman	318ef907b8	parabola/polyvox, fixing some bugs	2018-07-24 10:08:35 -07:00
SamGondelman	956c1511b6	Merge remote-tracking branch 'upstream/master' into parabolic	2018-07-19 15:23:25 -07:00
SamGondelman	845ddda695	parabola-overlay and -avatar intersection, handle case where acceleration == 0	2018-07-17 12:41:03 -07:00
Andrew Meadows	207aea8712	remove cruft from rendering collision shapes	2018-07-16 10:29:34 -07:00
SamGondelman	f9cdfbad7c	cleanup	2018-07-12 17:59:57 -07:00
John Conklin II	a8c2f9c861	Merge pull request #13585 from thoys/fix/animationFPSChanging ... MS14979: Fix Animation FPS changeability	2018-07-12 11:23:54 -07:00
SamGondelman	16ad9cb5d3	xcolor/rgbcolor conversion	2018-07-11 18:06:06 -07:00
SamGondelman	9929529f30	vec3 conversion	2018-07-11 14:18:22 -07:00
Thijs Wenker	e7345c5a27	fix changing allowTranslation / fps for entity model animation without having to change any other animation property value	2018-07-11 19:15:08 +02:00
SamGondelman	5bbd5b9e52	vec2 conversion	2018-07-10 16:32:49 -07:00
Andrew Meadows	0b87df45b5	cleanup return statement	2018-07-10 11:16:56 -07:00
SamGondelman	fcc523fbef	parabola sphere intersection	2018-07-09 15:15:36 -07:00
SamGondelman	bbe9a0005d	parabola vs. web and text	2018-07-05 17:02:55 -07:00
SamGondelman	7130b5aa7f	fixing findRayIntersection bugs	2018-07-05 10:27:12 -07:00
Ryan Huffman	a5a7f56a32	Fix crash when editing clientOnly entity with no myAvatar	2018-07-03 10:25:52 -07:00
SamGondelman	90091d11e4	parabola picks, started implementing math	2018-07-03 09:47:31 -07:00
Andrew Meadows	5b4b0a7c25	fix server-side bug in kinematics	2018-07-02 15:04:11 -07:00
John Conklin II	7834bca39a	Merge pull request #13508 from wayne-chen/crashEntityAppendPoint-case-12473 ... Fixing crash on appending a point to an entity	2018-07-02 12:36:51 -07:00
Wayne Chen	9e3626cca3	returning false if there is no entity to connect to	2018-06-29 14:42:33 -07:00
David Back	a8e231c5af	floats .0f	2018-06-28 11:33:38 -07:00
David Back	4f5a1bc340	zero out spread values for previous versions	2018-06-27 19:02:55 -07:00
Sam Gondelman	fbe54437b8	Merge pull request #13409 from humbletim/add-raypick-shapeID ... Include shapeID in RayPick results	2018-06-26 10:25:39 -07:00
SamGondelman	d37a8bcd72	more jsdoc updates	2018-06-22 10:13:18 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
SamGondelman	de5fcccc7b	proper reporting of nan values in get	2018-06-19 14:22:24 -07:00
SamGondelman	12a5d8b550	quiet ubuntu warnings, particle properties show radians	2018-06-19 12:51:35 -07:00
Andrew Meadows	44c3620b6e	remove cruft	2018-06-18 17:45:58 -07:00
humbletim	dc5c5c20df	raypick partIndex commit ... include shapeID for accessing proper material index add raypick shapeID test script	2018-06-18 18:22:30 -04:00
SamGondelman	0d34689320	spread variables jsdoc	2018-06-18 12:33:36 -07:00
SamGondelman	93fe0c60fa	correctly update bounding box based on radius and other properties	2018-06-18 11:26:09 -07:00
Andrew Meadows	6d422e4678	Merge 'master' into 'workload'	2018-06-18 10:30:13 -07:00
SamGondelman	7771661948	fix particle spread properties	2018-06-15 17:35:49 -07:00
SamGondelman	9ea65950d5	particles: threadsafe, cleanup, rework initialized logic	2018-06-15 15:45:06 -07:00
Andrew Meadows	be0899c41d	remove unnecessary writes to appease Xcode's static analyzer	2018-06-15 11:44:22 -07:00
Andrew Meadows	d0baa2d2a1	fix typos in simulation ownership documentation	2018-06-15 10:28:00 -07:00
Andrew Meadows	4329ea5240	Merge master' into 'workload'	2018-06-04 16:11:25 -07:00
David Rowe	b5028a9626	Merge branch 'master' into 21880 ... # Conflicts: # interface./src/scripting/WindowScriptingInterface.h	2018-06-05 09:13:54 +12:00
John Conklin II	08fcad1932	Merge pull request #13227 from SamGondelman/entityMirror ... Add local-only isVisibleInSecondaryCamera flag to entities	2018-06-04 11:06:00 -07:00
Seth Alves	97b3fdfe68	make legacy collisionless property work right	2018-06-01 09:34:34 -07:00
SamGondelman	86ee5c12d8	merge and update based on sam's changes	2018-05-31 17:53:36 -07:00
John Conklin II	ec3f9549f1	Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934 ... Fix EntityScriptingInterface::getChildrenIDs function	2018-05-31 14:27:25 -07:00
Andrew Meadows	addbb597fc	move setSpaceIndex() to cpp file for easier debugging in future	2018-05-31 10:22:39 -07:00
Andrew Meadows	003e444246	Merge branch 'master' into 'workload'	2018-05-30 16:04:13 -07:00
Oren Hurvitz	b9306a35cc	Fixed formatting	2018-05-30 11:01:07 +03:00
David Rowe	ac0607b5ae	Review Entites.cloneEntity() JSDoc and add JSDoc for new properties	2018-05-30 10:02:10 +12:00
samcake	559d436dfa	Fixing the merge conflicts	2018-05-24 16:57:10 -07:00
Anthony Thibault	eae5215d94	Merge pull request #13206 from ctrlaltdavid/21872-c ... JSDoc fixes	2018-05-24 16:44:55 -07:00