3650 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	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
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
Andrew Meadows	d42375e4fe	finish uint8_t to uint16_t conversion	2018-05-24 11:28:52 -07:00
Andrew Meadows	31dd59d212	double bits in collision groups	2018-05-24 11:28:52 -07:00
SamGondelman	e6741a363e	add local-only isVisibleInSecondaryCamera flag to entities	2018-05-23 16:35:21 -07:00