6037 commits

Author	SHA1	Message	Date
John Conklin II	94ab0c71b2	Merge pull request #13040 from 1P-Cusack/BugFix_EntityListException_20180427 ... [BugFix] EntityList UncaughtException in that.sendUpdate	2018-07-02 12:35:20 -07:00
John Conklin II	d9a3676c7c	Merge pull request #13493 from alexiamandeville/sittingUpdate ... Resolving issue where VR input for movement stops emotes	2018-07-02 12:30:50 -07:00
David Back	fd4a8fdd83	fix color NaN check	2018-06-29 15:33:55 -07:00
David Back	328bf37f64	Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix	2018-06-29 10:34:17 -07:00
Zach Fox	2d27de12bd	Fix MS14743: Change SNAP prints such that they don't fall through the floor	2018-06-28 12:06:31 -07:00
John Conklin II	138342ba91	Merge pull request #13485 from zfox23/MS16257_clearOverlay ... Implement MS16257: Remove 'clear overlay when moving' setting and code	2018-06-28 09:31:04 -07:00
David Back	e74d30ce22	fix color fallbacks	2018-06-27 17:43:41 -07:00
Alexia Mandeville	8228afb378	Resolving issue where VR input for movement stops emotes	2018-06-27 17:15:54 -07:00
David Back	dd09ec1656	Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix	2018-06-27 16:32:21 -07:00
John Conklin II	e9d2797573	Merge pull request #13472 from alexiamandeville/sittingUpdate69 ... Restoring Emote app to stable build state, adding sit and love emotes	2018-06-27 16:00:53 -07:00
Zach Fox	cfc8c0fb09	Implement MS16257: Remove 'clear overlay when moving' setting and code	2018-06-27 14:07:04 -07:00
Alexia Mandeville	0f25ab7376	Fixing error from typo	2018-06-27 13:30:10 -07:00
David Back	2cdda23169	more robustness for optional properties	2018-06-27 13:05:39 -07:00
John Conklin II	2da3192c33	Merge pull request #13402 from ctrlaltdavid/21895 ... Make desktop left and right mouse button actions independent	2018-06-27 12:46:11 -07:00
Zach Fox	bdeb22703c	Merge pull request #13474 from zfox23/MS16235_handshakeParticles ... Fix MS16235: Set previously-buggy Handshake particle properties to 0	2018-06-27 12:16:48 -07:00
John Conklin II	a38859e4da	Merge pull request #13397 from ctrlaltdavid/21893 ... Fix Create app selection updating when entities are deleted	2018-06-26 17:06:43 -07:00
Zach Fox	6f956ffb8d	Fix MS16235: Set previously-buggy Handshake particle properties to 0	2018-06-26 15:45:18 -07:00
Alexia Mandeville	b3eec72c90	Removing animations.zip	2018-06-26 15:39:50 -07:00
Alexia Mandeville	6f6a9b2c64	Style formatting, updating comments	2018-06-26 15:02:46 -07:00
Alexia Mandeville	92acbdbbd7	Adding sit and love emotes	2018-06-26 14:21:10 -07:00
David Back	40b2525b99	Merge pull request #13439 from dback2/editHandleFixesImprovements ... Edit handle fixes	2018-06-26 13:33:25 -07:00
John Conklin II	47f907f44e	Merge pull request #13441 from wayne-chen/collisionlessGrab-case-12661 ... Fixing collisionless grabbing	2018-06-26 13:05:25 -07:00
David Back	46b5c0cc8e	Merge pull request #13448 from dback2/multiSelectColorInvisibleFix ... Fix multi-selection color setting visible/locked to false	2018-06-26 11:28:58 -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
Sam Gondelman	acfd562309	Merge pull request #13435 from gcalero/breakpad_android ... Breakpad integration for android Interface (part II)	2018-06-25 16:47:07 -07:00
David Back	05438f3b85	bad avatar collision merge	2018-06-25 15:26:54 -07:00
David Back	f65bc9b5ed	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements	2018-06-25 15:22:07 -07:00
Gabriel	ea2c1298e5	Remove crash added with testing purposes only	2018-06-25 19:13:47 -03:00
humbletim	b73a957935	changes per PR	2018-06-25 14:17:33 -04:00
David Back	6fa191742c	Merge pull request #13390 from dback2/editHandleDebugWindowFix ... Prevent edit press events when pointing at tablet or desktop windows	2018-06-25 11:11:37 -07:00
David Back	39b3e5a711	tabs	2018-06-22 18:15:16 -07:00
David Back	09ccd3acf0	fix multi-selection color setting visible/locked to false	2018-06-22 18:13:40 -07:00
David Back	88762e879f	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-22 13:53:04 -07:00
David Back	80adad7965	myAvatar constant	2018-06-22 13:52:43 -07:00
David Back	6a4c5ed12a	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-22 11:58:28 -07:00
Wayne Chen	1239472f2d	adding line for allowing grabbing of collisionless overlays	2018-06-22 11:35:01 -07:00
Wayne Chen	5b36449edd	allowing grabbing of collisionless entities	2018-06-22 09:54:25 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
SamGondelman	223350b7be	remove logging, play with debounce times	2018-06-21 17:26:39 -07:00
David Back	c019a4816f	CR changes + eslint fixes	2018-06-21 16:45:09 -07:00
David Back	ed56f09fcf	comment	2018-06-21 15:00:10 -07:00
David Back	37b35353d2	space	2018-06-21 14:48:37 -07:00
David Back	e3e8de1042	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements	2018-06-21 10:24:12 -07:00
John Conklin II	835528b212	Merge pull request #13383 from dback2/autoLaserFix2 ... Fix auto lasering locked web entities & only auto laser tablet and web overlays	2018-06-21 09:21:54 -07:00
David Rowe	d43be5ce19	Code review	2018-06-21 16:35:37 +12:00
David Back	945ee8cec9	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements	2018-06-20 15:53:51 -07:00
David Back	54145e0310	use previous pick ray when translate reaches end	2018-06-20 15:53:38 -07:00
Menithal	55e75298bd	Added Logging	2018-06-21 01:24:32 +03:00
Menithal	903762b122	Make sure max constraints reset ... This now occurs when selecting a new entity and having the UI filled again	2018-06-21 01:04:01 +03:00
David Back	7704e8c2a9	fix stretching too far, improve stretch sphere vs camera dist sizing	2018-06-20 14:47:41 -07:00