55980 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Burt Sloane	4f7243e444	Merge branch 'master' of https://github.com/burtsloane/hifi into midi	2017-07-26 13:30:57 -07:00
Burt Sloane	c777384d93	another comment removal	2017-07-26 10:00:19 -07:00
Burt Sloane	215fa7b816	removed extra comments	2017-07-26 09:34:46 -07:00
Burt Sloane	246a5c9fa4	1 more	2017-07-26 08:59:48 -07:00
Burt Sloane	d2975c79c9	add midi to 3 CMakeLists.txt for linking	2017-07-26 08:41:26 -07:00
Burt Sloane	88838da6e5	cleaning up for mac and linux	2017-07-25 17:46:08 -07:00
Burt Sloane	2b111358e1	extra quote	2017-06-29 16:49:00 -07:00
Burt Sloane	f1485afccc	public script	2017-06-22 13:01:11 -07:00
Burt Sloane	6f842dc204	requested changes	2017-06-16 14:30:20 -07:00
Burt Sloane	a29f07aef5	one more	2017-06-15 17:32:59 -07:00
Burt Sloane	4f7a1a6e2e	got rid of tabs	2017-06-15 16:35:53 -07:00
Burt Sloane	c35020eb5a	last of the PR changes	2017-06-15 16:24:12 -07:00
Burt Sloane	fbc28c0e2f	pedantic PR	2017-06-15 16:16:29 -07:00
Burt Sloane	7d92ef9f25	more PR fixes	2017-06-15 16:12:16 -07:00
Burt Sloane	a73281b827	fix PR issues	2017-06-15 16:10:08 -07:00
Burt Sloane	43488fe5b8	Merge branch 'midi' of https://github.com/burtsloane/hifi into midi	2017-06-15 15:57:08 -07:00
Burt Sloane	af5e812f00	neutralized for non-windows compile	2017-06-15 15:56:49 -07:00
burtsloane	2358d51ef1	Delete USBEventListener.cpp	2017-06-15 15:22:51 -07:00
burtsloane	19e35e1cd0	Delete USBEventListener.h	2017-06-15 15:22:40 -07:00
burtsloane	ade017fab0	Delete BuildInfo.h	2017-06-15 15:21:36 -07:00
Burt Sloane	7022c4009f	midi in and out	2017-06-15 15:18:06 -07:00
Chris Collins	a1933b535d	Merge pull request #10704 from sethalves/remove-chat-from-default-scripts ... remove chat from default scripts	2017-06-15 14:44:47 -07:00
Andrew Meadows	5e0be1a823	Merge pull request #10662 from ctrlaltdavid/21394 ... Smoothly ease hands from uncontrolled to controlled positions	2017-06-15 13:17:26 -07:00
Brad Hefta-Gaub	0597c3105f	Merge pull request #10705 from ZappoMan/moreAudioFixes ... fix no audio device from previously removed audio device	2017-06-15 11:04:14 -07:00
Seth Alves	023ca85623	remove chat from default scripts	2017-06-15 09:27:43 -07:00
ZappoMan	d352163d77	fix no audio device from previously removed audio device	2017-06-15 09:24:14 -07:00
Brad Hefta-Gaub	035a9e898f	Merge pull request #10684 from howard-stearns/avatar-whitelist ... avatar whitelist	2017-06-15 08:45:16 -07:00
druiz17	347f020b04	Merge pull request #10692 from jherico/fix_tablet_crash ... Fix crash on exit when tablet is open	2017-06-15 08:15:02 -07:00
Brad Hefta-Gaub	c807827a36	Merge pull request #10693 from seefo/master ... Incomplete sandbox content updates are now removed and reperformed	2017-06-14 19:32:01 -07:00
Andrew Meadows	9c928f16b2	Merge pull request #10632 from Atlante45/fix/node-leak ... Fix SharedNodePointer leak	2017-06-14 17:03:52 -07:00
Andrew Meadows	becb968a75	Merge pull request #10685 from ctrlaltdavid/21327-b ... Use HMD roll angle to turn while flying or walking in HMD	2017-06-14 16:56:29 -07:00
seefo	9fa21fc79f	Incomplete sandbox content updates are now removed and reperformed	2017-06-14 14:45:25 -07:00
David Rowe	16bebdd409	Rename identifiers	2017-06-15 09:20:55 +12:00
David Rowe	55e0082792	Code review	2017-06-15 09:10:08 +12:00
Brad Davis	7a6df850c5	Fix crash on exit when tablet is open	2017-06-14 13:22:53 -07:00
howard-stearns	665870b846	comment per cr	2017-06-14 12:06:29 -07:00
howard-stearns	2deb26551f	typos in comments/help-strings	2017-06-14 11:56:47 -07:00
Atlante45	5777b5e805	Create one packet per node	2017-06-14 11:42:25 -07:00
Atlante45	3cc2396021	CR	2017-06-14 11:42:25 -07:00
Atlante45	a15660993d	Fix comment	2017-06-14 11:42:25 -07:00
Atlante45	61eb93af35	Fix SharedNodePointer leak	2017-06-14 11:42:25 -07:00
howard-stearns	b3091de536	forgot proper initial value of flag after changing whitelist to be actual ... list	2017-06-14 11:16:55 -07:00
Stephen Birarda	1baff8af33	Merge pull request #10686 from seefo/fb4958 ... Resolved FB4958	2017-06-14 11:14:37 -07:00
Howard Stearns	15a5464bab	Merge pull request #10682 from zfox23/PAL_fixTabBackgroundColor ... Make the PAL's tab background color white	2017-06-13 20:50:13 -07:00
David Rowe	e3b4e4aa20	Disable print statements	2017-06-14 15:37:36 +12:00
Howard Stearns	87f3ce7699	reset avatar on domain change if the last domain imposed something on us	2017-06-13 19:30:01 -07:00
seefo	74066647c6	Resolved FB4958	2017-06-13 18:01:53 -07:00
David Rowe	395d40f0f9	Fix script default to match C++ default	2017-06-14 12:21:19 +12:00
David Rowe	be2bcb1c13	Turn with head roll in HMD when walking or flying	2017-06-14 12:20:46 +12:00
Zach Fox	bae27ec209	Merge pull request #10680 from zfox23/ZachRenderingImprovements1 ... Small rendering improvements based on spectator-camera changes	2017-06-13 17:18:43 -07:00