17688 commits

Author	SHA1	Message	Date
Anthony J. Thibault	41e0b8732f	fix for occasional crash when deleting web entity	2016-09-07 10:59:16 -07:00
Anthony J. Thibault	dc0d0c2d5c	Merge branch 'master' into feature/tablet-ui-foundation	2016-09-07 09:49:55 -07:00
Anthony J. Thibault	774509ba9e	Changed punctuation button to &123	2016-09-06 17:41:56 -07:00
Brad Davis	9d057233c6	Fixing rebase	2016-09-06 17:40:48 -07:00
SamGondelman	74e5814a48	try to fix rpath issue	2016-09-06 17:40:43 -07:00
SamGondelman	8a4d48ca8d	set browserProfile now that Qt bug is fixed	2016-09-06 17:38:47 -07:00
SamGondelman	99176588cc	remove old webwindowclass that relied on qwebkit	2016-09-06 17:36:59 -07:00
SamGondelman	7f2476f0f8	put pack macdeployqt call, but still removed qtwebprocess	2016-09-06 17:36:58 -07:00
SamGondelman	038aba20e4	disable dropshadows if unsupported (OSX and AMD cards)	2016-09-06 17:36:57 -07:00
SamGondelman	c993a6b818	try removing windows hack	2016-09-06 17:36:56 -07:00
SamGondelman	2db02fdde1	remove QtWebProcess hack on OSX	2016-09-06 17:36:56 -07:00
SamGondelman	716647037e	removed unused code	2016-09-06 17:36:54 -07:00
SamGondelman	9903e464d8	fix error in FileDialog.qml	2016-09-06 17:36:53 -07:00
SamGondelman	98cb3cc366	updated build instructions	2016-09-06 17:36:52 -07:00
SamGondelman	9d447d4dcc	enabled qnetworkrequest redirects everywhere I could find them	2016-09-06 17:35:06 -07:00
Brad Davis	20deae3242	Working on Qt 5.6 compatibility	2016-09-06 17:35:04 -07:00
Anthony J. Thibault	73315e3390	Punctuation mode now works	2016-09-06 17:07:41 -07:00
Anthony J. Thibault	28162915fd	Re-styled keyboard, now with working shift key	2016-09-06 15:21:58 -07:00
Anthony J. Thibault	71520a661a	WIP checkpoint of keyboard shift key support	2016-09-06 13:39:07 -07:00
Seth Alves	37db1cba26	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-09-06 09:38:44 -07:00
Brad Hefta-Gaub	78cf81954c	Merge pull request #8555 from jherico/thread_count ... Stuttering: global thread pool management	2016-09-06 09:27:02 -07:00
Andrew Meadows	0a55afda69	Merge pull request #8554 from elisa-lj11/marketplaces_html ... Include a marketplace status bar and access to "marketplace" of marketplaces	2016-09-02 17:12:05 -07:00
Anthony J. Thibault	9122a33fff	only raise the webEntity virtual keyboard in HMD mode	2016-09-02 16:53:40 -07:00
elisa-lj11	2f07ba87af	Renamed isZipped for more clarity on checking for non-fbx files	2016-09-02 16:48:55 -07:00
Anthony J. Thibault	a54c3bf8c0	support for backspace, carriage return, space and period.	2016-09-02 16:23:46 -07:00
Seth Alves	342f7edff3	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-09-02 16:12:41 -07:00
Brad Davis	94210d2e69	Use dynamic count for global thread pool	2016-09-02 15:23:35 -07:00
Brad Davis	91bfa7677c	Updating stats display for threaded rendering	2016-09-02 14:41:49 -07:00
Anthony J. Thibault	bcc0d27819	more reliable keyboard raise/lower	2016-09-02 12:50:31 -07:00
Anthony J. Thibault	0128d7c61b	Merge branch 'master' into feature/tablet-ui-foundation	2016-09-02 12:16:25 -07:00
Anthony J. Thibault	3d5e8fc213	First pass of keyboard raising and lowering	2016-09-02 12:15:30 -07:00
Anthony J. Thibault	442f6207fb	Added raiseAndLowerKeyboard detector, streamlined EventBridge for web entities.	2016-09-02 11:17:08 -07:00
Anthony J. Thibault	21bf931559	eventBridge for web entities.	2016-09-01 16:32:06 -07:00
Seth Alves	25f6e1d79d	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-09-01 15:06:52 -07:00
Brad Hefta-Gaub	b3e5e21f40	Merge pull request #8559 from birarda/android-interface ... create a foundation for interface target compile on android	2016-09-01 13:10:45 -07:00
Seth Alves	1a9f43cb67	fix AvatarActionHold's idea of where the controllers are when the avatar has been scaled	2016-09-01 12:17:34 -07:00
Anthony J. Thibault	823420ae0a	Working web entity keyboard ... * Missing many keys * Does not dynamically appear and disappear	2016-08-31 17:57:13 -07:00
elisa-lj11	bebf9c5890	Added error feature when user tries to download a non fbx file	2016-08-31 17:46:35 -07:00
Stephen Birarda	7b8293dc80	repairs for non-android builds after changes	2016-08-31 17:28:09 -07:00
Stephen Birarda	6efa47a04e	workaround plugin build failures	2016-08-31 16:45:12 -07:00
Seth Alves	dc31525794	remove some left-over code	2016-08-31 16:39:57 -07:00
Stephen Birarda	85ba0f36cf	fix controllers/shared compile for android interface port	2016-08-31 16:34:31 -07:00
Seth Alves	280b603747	remove some leftover code	2016-08-31 16:30:51 -07:00
Seth Alves	74dc2ce493	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-31 16:26:21 -07:00
Chris Collins	02afa460ff	Merge pull request #8557 from jherico/location_bar ... Don't show address bar when starting up in a connected state	2016-08-31 16:03:37 -07:00
elisa-lj11	5c40e9a8f5	Restored download ability and removed extra file types from download options	2016-08-31 15:39:29 -07:00
elisa-lj11	9748a17abe	checking out to try new branch	2016-08-31 15:22:28 -07:00
Brad Davis	b9a97712d5	Don't show address bar when starting up in a connected state	2016-08-31 15:17:57 -07:00
elisa-lj11	b131338dd0	Injected script to remove other file types from download options	2016-08-31 14:13:26 -07:00
Stephen Birarda	b56a596c29	put android build output in target folder	2016-08-31 13:23:19 -07:00