2017 commits

Author	SHA1	Message	Date
howard-stearns	023a32563c	work around .qml settings issues	2017-02-22 12:59:40 -08:00
howard-stearns	2b9c69926b	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 15:42:00 -08:00
howard-stearns	1ddc7de581	remove debugging (and fix missing brace)	2017-02-21 15:41:17 -08:00
Seth Alves	8cf71ebc65	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-21 13:54:21 -08:00
howard-stearns	aff44d682e	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 13:45:25 -08:00
howard-stearns	15d8041683	snapshot working, before button change	2017-02-21 13:14:45 -08:00
Philip Rosedale	5c782deb4d	Merge pull request #9701 from ctrlaltdavid/21175 ... Fix laser beam jumping upon grabbing entity	2017-02-20 13:37:11 -08:00
Seth Alves	70c9853189	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-20 12:38:13 -08:00
Seth Alves	4a650ff2bb	Overlays::getOverlayAtPoint was depending on the order in which the overlays were added	2017-02-19 18:37:35 -08:00
David Rowe	71ba38afb0	Process controller and script updates only when finger painting is on	2017-02-18 21:28:30 +13:00
David Rowe	05c63e16ca	Send messages local only	2017-02-18 20:40:27 +13:00
David Rowe	6827a28807	Fix grab position	2017-02-18 16:36:14 +13:00
David Rowe	692fa52aca	Disable drawing pointer lasers while painting	2017-02-18 15:21:48 +13:00
David Rowe	2c02b42c96	Finger paint button icon files	2017-02-18 14:21:54 +13:00
David Rowe	0689557ba5	Draw smoother lines	2017-02-18 13:39:59 +13:00
David Rowe	777a0b51c1	Ignore spurious finger tip position values	2017-02-18 13:35:16 +13:00
David Rowe	784009a9fa	Merge branch 'master' into 21168	2017-02-18 13:20:39 +13:00
Seth Alves	def669364b	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-17 15:45:19 -08:00
David Rowe	2c5782e4bb	Fix laser beam jumping upon grabbing entity	2017-02-18 09:11:04 +13:00
Seth Alves	47cdade1e9	fix home-button on tablet	2017-02-17 11:47:37 -08:00
David Rowe	3712aea861	Handle trigger values of 1.0 not repeating	2017-02-17 19:31:53 +13:00
David Rowe	bdfc9fd418	Tidying	2017-02-17 19:31:40 +13:00
David Rowe	25761adf6c	Erase closest line	2017-02-17 19:31:25 +13:00
David Rowe	9c1bb37a34	Paint lines	2017-02-17 19:31:11 +13:00
David Rowe	5236f123c1	Interpret trigger and grip values	2017-02-17 19:30:57 +13:00
David Rowe	7b36669d80	Point index finger while painting if tablet not displayed	2017-02-17 19:30:40 +13:00
David Rowe	867e24762b	Disable lasers and grabbing while painting if tablet not displayed	2017-02-17 19:30:23 +13:00
David Rowe	bad57fa03f	Controller and painting code framework	2017-02-17 19:30:04 +13:00
David Rowe	585691f71c	Add finger painting button to tablet	2017-02-17 19:29:11 +13:00
Anthony J. Thibault	47e87e1ad4	Bug fix for clara.io marketplace	2017-02-16 17:41:36 -08:00
Anthony J. Thibault	2ea88012f9	Remove toolbar from tablet-goto.js	2017-02-16 17:36:16 -08:00
Anthony J. Thibault	345f0519ef	Removed use of Toolbar API for most default scripts.	2017-02-16 17:29:35 -08:00
Anthony J. Thibault	cffdecbf68	Merge branch 'master' into feature/toolbar-tablet-switcheroo	2017-02-16 16:28:43 -08:00
Anthony J. Thibault	7f95753a1e	Prevent tablet from being open while in toolbarMode	2017-02-16 16:18:51 -08:00
howard-stearns	6e3ae1fe4f	cleanup some accumulated cruft in pal code	2017-02-16 10:53:02 -08:00
David Kelly	5184cbe615	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2	2017-02-15 12:08:55 -07:00
Faye Li	2388ec65fe	Merge pull request #9659 from fayeli/users-fix ... Tablet Users Fixes	2017-02-15 10:25:06 -08:00
Faye Li	8aae2aa5f0	simpler filter code	2017-02-15 10:23:36 -08:00
Faye Li	5ece3f1e1a	use new users icon	2017-02-15 10:16:20 -08:00
Philip Rosedale	01bdac49d0	Merge pull request #9672 from ctrlaltdavid/21121 ... Fix far grabbing making entity jump upon grab	2017-02-14 17:02:42 -08:00
Anthony J. Thibault	912e8aa04a	Tablet buttons now work in toolbar. ... Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.	2017-02-14 15:37:24 -08:00
Anthony J. Thibault	f8055a027e	Refactor of pal.js to dynamically switch between toolbar and tablet.	2017-02-14 15:34:24 -08:00
David Rowe	625f5efdf8	Merge branch 'master' into 21164 ... # Conflicts: # scripts/system/audio.js	2017-02-15 10:00:52 +13:00
Chris Collins	442e8d68ef	Merge pull request #9650 from kunalgosar/browserFix ... Added isAway (paused) property to myAvatar	2017-02-14 11:16:07 -08:00
Dante Ruiz	46cfa7cf13	saving work	2017-02-14 07:46:31 -08:00
Dante Ruiz	61912b6ff0	saving work	2017-02-14 07:46:31 -08:00
Seth Alves	4393bc3c2e	Merge pull request #9656 from humbletim/21114-part1 ... CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors	2017-02-14 06:49:05 -08:00
Seth Alves	30c46b89a0	Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect ... Removed ColorOverlay from TabletButton, added more icon & text states	2017-02-14 06:16:59 -08:00
David Rowe	2672b8d10a	Fix tabs	2017-02-14 17:30:56 +13:00
David Rowe	61f8631a2b	Fix far grabbing making entity jump upon grab	2017-02-14 17:30:20 +13:00