19276 commits

Author	SHA1	Message	Date
Dante Ruiz	ea804578ce	Merge branch 'master' into menuFix	2017-03-02 16:06:32 +00:00
Andrew Meadows	96bb01e5f9	Merge pull request #9790 from AndrewMeadows/fix-avatar-transform ... fix bug drawing avatar above ground	2017-03-01 17:20:21 -08:00
Dante Ruiz	58c1a2fb99	Merge branch 'master' into menuFix	2017-03-02 00:55:18 +00:00
howard-stearns	5be952c4e8	persist sort info for tablet re-opening, and start with column 1	2017-03-01 14:51:48 -08:00
David Kelly	dc754cff5f	magical new glyphs	2017-03-01 13:57:03 -07:00
David Kelly	45293ab130	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-03-01 12:55:54 -07:00
David Kelly	55d049ff5c	style updates	2017-03-01 12:43:45 -07:00
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07:00
Dante Ruiz	e2479a78bd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-01 16:04:12 +00:00
Andrew Meadows	148100b26f	fix bug drawing avatar above ground	2017-02-28 15:10:20 -08:00
David Kelly	678020fed6	now use it (plus a bit of cleanup)	2017-02-28 15:03:45 -07:00
Dante Ruiz	16d3f22e77	remove uncommented code	2017-02-28 21:39:33 +00:00
Dante Ruiz	606d618fe8	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-edit-js	2017-02-28 21:35:14 +00:00
Seth Alves	c2085ebb6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-28 13:33:51 -08:00
Dante Ruiz	f0f2b8c4da	fix comboBox and PushOntoStack	2017-02-28 21:30:25 +00:00
Andrew Meadows	c6730f7c58	Merge pull request #9745 from AndrewMeadows/faster-avatar-updates ... Faster avatar updates	2017-02-28 10:55:21 -08:00
Clément Brisset	7f9437dcc5	Merge pull request #9690 from Atlante45/feat/sit ... Add hips pinning / Sit script	2017-02-28 10:41:22 -08:00
Dante Ruiz	50471db376	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-edit-js	2017-02-28 17:12:41 +00:00
Dante Ruiz	d5714bfa6e	Merge branch 'master' into menuFix	2017-02-28 16:55:44 +00:00
Seth Alves	117be16c31	pull from upstream	2017-02-27 16:48:23 -08:00
Atlante45	9ce10742ec	Move avatar not joint	2017-02-27 16:38:57 -08:00
Atlante45	e9316d30d0	More IK smoothing experimentation	2017-02-27 16:38:56 -08:00
Atlante45	cbaaaa21c6	Use head orientation for sitting	2017-02-27 16:38:56 -08:00
Atlante45	e503542b6a	Fix transform computation	2017-02-27 16:38:55 -08:00
Atlante45	8c232b5abb	Initialize max offset to infinity	2017-02-27 16:38:55 -08:00
Atlante45	187cd0d5cf	Get IK error and stand up based on it	2017-02-27 16:38:55 -08:00
Atlante45	69ce0a383e	Add sitting animations	2017-02-27 16:38:54 -08:00
Atlante45	7132969083	Add hips pinning capability to MyAvatar	2017-02-27 16:38:54 -08:00
Atlante45	6821c8621f	More sit work	2017-02-27 16:38:54 -08:00
howard-stearns	c04fd0ec66	smaller glyph size	2017-02-27 16:07:05 -08:00
David Kelly	3bf3f16a6a	whitespace	2017-02-27 12:56:03 -07:00
David Kelly	e7c8085bc8	switch to using glyph button	2017-02-27 12:44:23 -07:00
Seth Alves	df034ea6da	remove commented-out code	2017-02-27 11:27:59 -08:00
Seth Alves	8110921abf	git rid of _mouseToOverlays until I remember why I thought I needed it	2017-02-27 11:11:04 -08:00
Ryan Huffman	5b59939195	Merge pull request #9602 from huffman/feat/shortbow-entity-server ... Add shortbow to marketplace scripts	2017-02-27 11:09:52 -08:00
Dante Ruiz	19110ecfee	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-27 16:00:08 +00:00
Seth Alves	34c5d480c4	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-27 06:35:50 -08:00
Seth Alves	1864975c51	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-27 06:35:22 -08:00
Andrew Meadows	dbd1526d56	Merge pull request #9757 from kunalgosar/EntityFocusFix ... Fix for Web Entity not leaving Focus	2017-02-26 16:35:55 -08:00
Philip Rosedale	4925b3c47c	Merge pull request #9756 from ctrlaltdavid/21122 ... Point index finger and raise thumb if not touching controller	2017-02-25 14:59:48 -08:00
Seth Alves	a2f527b28a	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-25 08:44:03 -08:00
Seth Alves	36bcaa8d0f	delete tablet overlays when switching domains	2017-02-25 08:43:06 -08:00
David Kelly	baa7f81d79	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 18:38:57 -08:00
kunalgosar	d6c1f1c99a	Fixed Wed Entity not leaving Focus	2017-02-24 18:18:48 -08:00
David Rowe	0cc499b08b	Point index fingers and raise thumbs if not touching controls	2017-02-25 14:20:23 +13:00
Dante Ruiz	73c337efd0	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-25 00:42:22 +00:00
Dante Ruiz	835b23832f	some modal clean up	2017-02-25 00:40:38 +00:00
David Rowe	a205d2a00c	Use animation for pointing index finger instead of setting joint angles	2017-02-25 11:36:06 +13:00
Seth Alves	fcd3c09404	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay	2017-02-24 14:27:30 -08:00
Seth Alves	34755dd75d	notify children of an overlay when the parent overlay moves	2017-02-24 13:57:49 -08:00