51440 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Hefta-Gaub	4570b3439d	some cleanup	2017-02-17 21:38:30 -08:00
Brad Hefta-Gaub	c2c843d841	fix mac warnings	2017-02-17 21:05:02 -08:00
David Rowe	6827a28807	Fix grab position	2017-02-18 16:36:14 +13:00
Brad Hefta-Gaub	291b823cfa	const cleanup and fix crash	2017-02-17 18:28:07 -08: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
Anthony J. Thibault	856a38af0c	Fix for audio, toolbar and tablet on macos.	2017-02-17 17:08:23 -08:00
Chris Collins	ec07969c0b	Merge pull request #9703 from kunalgosar/logDisplayMode ... Logging HMD/Desktop Transitions	2017-02-17 17:07:02 -08: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
Seth Alves	d7bb6f105b	make tablet part IDs available through qApp	2017-02-17 15:43:20 -08:00
Seth Alves	f6bd21c483	Merge pull request #9694 from hyperlogic/feature/toolbar-tablet-switcheroo ... By default, tablet icons will display on the toolbar in desktop mode.	2017-02-17 15:07:17 -08:00
kunalgosar	b8b5927351	Logging display mode changes	2017-02-17 13:21:01 -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
Anthony J. Thibault	5963c6ddc3	Fix for toolbar visibility after snapshots.	2017-02-17 11:04:04 -08:00
Brad Hefta-Gaub	305e1ae1d2	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-17 10:18:53 -08:00
Brad Hefta-Gaub	92ca7de0bf	some tweaks to support too large avatar data	2017-02-17 10:12:35 -08:00
Seth Alves	2b02998fae	hook up overlaysToDiscard and overlaysToInclude in Overlays::findRayIntersection	2017-02-17 09:47:40 -08:00
Anthony J. Thibault	e4076e6244	warning fixes	2017-02-17 09:45:13 -08:00
Seth Alves	81f6344023	allow overlays to be parents	2017-02-17 09:36:00 -08:00
Brad Hefta-Gaub	78147c27ad	log too large byteArray instead of crashing	2017-02-17 08:33:27 -08:00
Seth Alves	9db817b415	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-17 07:04:45 -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
Seth Alves	05c135b9d8	uuid keys for overlays appears to work	2017-02-16 21:22:23 -08:00
Howard Stearns	5bef6ea029	Merge pull request #9687 from davidkelly/dk/3177 ... Ban only by machine fingerprint, when possible	2017-02-16 18:50:38 -08:00
Brad Hefta-Gaub	3a0c63cbc7	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements ... Conflicts: assignment-client/src/avatars/AvatarMixer.cpp	2017-02-16 18:14:52 -08: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
Seth Alves	c1e41311fc	working toward using uuids for overlay IDs	2017-02-16 17:18:09 -08:00
Howard Stearns	7afd13d2cb	Merge pull request #9693 from howard-stearns/fix-requestsDomainListData ... fix rquestsDomainListData	2017-02-16 17:06:29 -08:00
Brad Hefta-Gaub	be12a8ffa4	stats cleanup	2017-02-16 16:58:06 -08:00
Anthony J. Thibault	0b9f4d4f11	updated eslint to include Tablet global	2017-02-16 16:53:51 -08:00
Stephen Birarda	78301fd947	call getParentPointer when parent ID changes to update children	2017-02-16 16:46:09 -08:00
Stephen Birarda	9f9fc03751	call EntityTree update when ScriptEngine update occurs	2017-02-16 16:46:09 -08:00
Stephen Birarda	d4119d5676	fix for non-void set of should force scene	2017-02-16 16:46:09 -08:00
Stephen Birarda	4ece56b673	spacing cleanup in EntityTreeSendThread	2017-02-16 16:46:09 -08:00
Stephen Birarda	fe11a945ef	remove debug from EntityTreeSendThread	2017-02-16 16:46:09 -08:00
Stephen Birarda	9d336a84ab	force a full scene send for new ancestors/descendants	2017-02-16 16:46:09 -08:00