57862 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ken Cooke	ee752df653	fix typo	2017-08-09 20:11:52 -07:00
Ken Cooke	bcdf13c59c	Add explicit shutdown request, since null device means something else	2017-08-09 19:40:07 -07:00
Ken Cooke	ee6d4dfc14	If real input device fails to start, use dummy input	2017-08-09 17:50:20 -07:00
Ken Cooke	fc5b4be459	bugfix	2017-08-09 16:59:02 -07:00
Ken Cooke	9c6b7306c4	Re-implement callback to Use common handleAudioInput()	2017-08-09 16:58:12 -07:00
Ken Cooke	7daa3ecff3	Handle dummy input callbacks	2017-08-09 15:54:14 -07:00
Ken Cooke	6f2cc9cfeb	When no input device, create dummy input to generate callbacks	2017-08-09 14:01:17 -07:00
Chris Collins	153b5cb065	Merge pull request #11137 from highfidelity/bug/6834 ... Fixed bugs related to express installer	2017-08-08 10:11:11 -07:00
utkarshgautamnyu	56c695acbb	Update NSIS.template.in	2017-08-07 18:34:20 -07:00
utkarshgautamnyu	dc4121f9d1	Update NSIS.template.in	2017-08-07 17:55:45 -07:00
utkarshgautamnyu	b80def995f	Update NSIS.template.in	2017-08-07 17:53:39 -07:00
utkarshgautamnyu	c9c36bb19e	indentation fixes	2017-08-07 17:50:53 -07:00
utkarshgautamnyu	3ee5f78c40	bug fixes for express installer	2017-08-07 17:44:07 -07:00
Seth Alves	e0daa92757	Merge pull request #11133 from druiz17/bug-create-spinner ... Fixed this issue of the spinner not displaying in create mode	2017-08-07 14:48:27 -07:00
Seth Alves	60895872ca	Merge pull request #11123 from vladest/attachment_speedup ... Remove snap to item. Add caching for scrolling speedup	2017-08-07 13:18:50 -07:00
Seth Alves	af1e27dc36	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support ... Improved support for Vive Trackers on biceps	2017-08-07 13:11:48 -07:00
Dante Ruiz	38db4a6f47	fixed create spinner not appearing	2017-08-07 20:03:55 +01:00
Zach Fox	36453644e0	Merge pull request #11130 from zfox23/contextOverlays_fixCrash1 ... Fix crash in Context Overlays code	2017-08-07 11:29:30 -07:00
Zach Fox	07a4beac73	Fix the crash	2017-08-07 10:28:36 -07:00
Chris Collins	4acccb6ace	Merge pull request #11118 from cain-kilgore/chat-char-limit ... WL 21493 - Update the Chat.js to indicate when a message is too long	2017-08-07 09:52:57 -07:00
Seth Alves	c570d483d8	Merge pull request #11113 from elisa-lj11/zip_drag ... Zip drag (needs review)	2017-08-07 03:17:31 -07:00
Seth Alves	f898a05014	Merge pull request #11122 from ElderOrb/case6760 ... fix for 6760: Create Mode turns to Portrait when Reopening tablet	2017-08-06 19:02:47 -07:00
Seth Alves	8798e47f99	Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes ... Crash fixes for avatars without Hips, and web overlays	2017-08-06 18:48:07 -07:00
Brad Davis	959499eab8	Merge pull request #11128 from sethalves/fix-some-crash-on-exit ... Fix some crash on exit	2017-08-06 17:27:22 -07:00
Seth Alves	931369ae00	Merge pull request #11127 from vladest/fix_mouse_release_lost ... fixed typo leads to lost touch or mouse release events	2017-08-06 13:17:50 -07:00
Seth Alves	83a30e2f35	missed some statics	2017-08-06 13:12:27 -07:00
Seth Alves	6f9460162d	avoid calling a pure virtual function from GLBackend dtor	2017-08-06 12:47:45 -07:00
Seth Alves	186035dc5d	adjust various things that cause a crash-on-exit on Linux	2017-08-06 11:57:55 -07:00
vladest	134bad9534	fixed typo leads to lost touch or mouse release events	2017-08-06 19:09:40 +02:00
vladest	3a013bf86e	Remove snap to item. Add caching for scrolling speedup	2017-08-05 13:28:08 +02:00
beholder	06c9378b03	fix for 6760: Create Mode turns to Portrait when Reopening tablet	2017-08-05 04:07:04 +03:00
Brad Hefta-Gaub	95c28b2fa1	Merge pull request #11119 from highfidelity/anshuman64-entervr ... Capitalize "ENTER VR"	2017-08-04 18:03:20 -07:00
anshuman64	22afb25d44	Capitalize "ENTER VR"	2017-08-04 17:19:26 -07:00
Elisa Lupin-Jimenez	a246c59277	changed debug print for unsupported entity files	2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez	af432087e3	small revisions to bracketing/variable name	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	8c9ce82986	Fixed Mac and Ubuntu platform build issue (hopefully)	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	c2cb7573c5	Removed commented out blocks code	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	ebc28a6557	Renamed isBlocks to isZip, added debug print for non-entity files	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	06ff766952	Drag zip cleaned up, marketplaces stylized, back button fixed	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	692aa4c4b9	Clara download working again, still can drag in Blocks zip	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	9d2be28a8a	troubleshooting Blocks injection	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c6d5b1a5e6	Removed extraneous print statements	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c3d943ff72	Drag zip folder works	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ed1ed4f3e0	Blocks drag does not work yet	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ca6a323d54	Can drag blocks zip folder into hifi and upload the .obj	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	4570814145	Added Blocks to marketplace window	2017-08-04 16:56:30 -07:00
Elisa Lupin-Jimenez	a7dd6a5a41	Changed marketplaces message to be more discoverable	2017-08-04 16:56:30 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
Cain Kilgore	f79a8b3cb5	Merge branch 'master' of https://github.com/highfidelity/hifi into chat-char-limit	2017-08-04 23:34:44 +01:00
Brad Hefta-Gaub	cce0ba9596	Merge pull request #11043 from jherico/threaded_render_checkpoint ... Updates from Threaded Rendering project	2017-08-04 15:28:00 -07:00