3588 commits

Author	SHA1	Message	Date
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	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
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	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
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
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
Thijs Wenker	74343c71d8	CR fixes	2018-07-31 22:29:53 +02: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
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
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
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