51517 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	4a650ff2bb	Overlays::getOverlayAtPoint was depending on the order in which the overlays were added	2017-02-19 18:37:35 -08:00
Brad Hefta-Gaub	598e79f697	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements	2017-02-19 13:29:37 -08:00
Brad Hefta-Gaub	fa0749b494	Merge pull request #9696 from ctrlaltdavid/21168 ... Add finger painting script	2017-02-19 11:37:25 -08:00
Brad Hefta-Gaub	942c5689fc	more comment cleanup	2017-02-18 14:09:47 -08:00
Brad Hefta-Gaub	73d64120df	removed dead comment	2017-02-18 14:08:03 -08:00
Brad Hefta-Gaub	bc858f82fc	fixed a FIXME comment	2017-02-18 14:07:20 -08:00
Brad Hefta-Gaub	2b79602220	debug cleanup	2017-02-18 13:14:14 -08:00
Brad Hefta-Gaub	e95e7f663c	more cleanup	2017-02-18 13:04:00 -08:00
Brad Hefta-Gaub	66a6666b52	more cleanup, improved stats, port throttling	2017-02-18 12:29:01 -08:00
Seth Alves	ea03f41b57	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-18 10:32:11 -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
Brad Hefta-Gaub	71af81851e	migrate to new style throttling	2017-02-17 22:20:32 -08:00
Brad Hefta-Gaub	42d916a719	fix warnings	2017-02-17 21:58:48 -08:00
Brad Hefta-Gaub	d233430809	fix warnings	2017-02-17 21:58:35 -08:00
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
Ryan Huffman	9e39d0a0bb	Update shortbow enemy lifetime from 3 minutes to 1 minute	2017-02-17 10:54:55 -08:00
Ryan Huffman	7e5c1907d9	Update spawnShortbow.js to stop after done spawning	2017-02-17 10:53:40 -08:00
Ryan Huffman	0fab462181	Update shortbow to edit entities directly instead of using messsages	2017-02-17 10:53:10 -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