17673 commits

Author	SHA1	Message	Date
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
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
elisa-lj11	2f07ba87af	Renamed isZipped for more clarity on checking for non-fbx files	2016-09-02 16:48:55 -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
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
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
Stephen Birarda	62504d457b	put the apk and apk-build folders in root of build	2016-08-31 11:50:39 -07:00
Stephen Birarda	feef76cbab	add tools, no plugins, add InterfaceActivity	2016-08-31 11:31:07 -07:00
Stephen Birarda	7c2fea4598	remove glew/oglplus requirement for android interface	2016-08-31 11:03:53 -07:00
Stephen Birarda	f1ed7a2e78	initial changes needed for android interface cmake	2016-08-31 10:53:29 -07:00
Zach Pomerantz	441005bba0	use existing defaults for zoneless keylight	2016-08-31 09:47:53 -07:00
Zach Pomerantz	372c52fea5	restore default ambient skybox	2016-08-30 17:07:34 -07:00
Seth Alves	c6804ba721	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-30 16:23:22 -07:00
elisa-lj11	d16ef521f4	fixed merge conflicts from Howard's webview fix	2016-08-30 15:33:59 -07:00
Brad Davis	3ca01a1e4b	Merge pull request #8540 from howard-stearns/restore-WebView-tab-handler ... restore onNewViewRequested	2016-08-30 15:21:27 -07:00
elisa-lj11	aceddb0cf8	merge with james repo	2016-08-30 15:07:01 -07:00
Seth Alves	cdd08bd38e	more anti-jitter changes	2016-08-30 14:59:30 -07:00
Seth Alves	78f54a7f33	get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away	2016-08-30 14:39:11 -07:00
howard-stearns	8824507523	new smaller WebView.qml	2016-08-30 14:37:08 -07:00
elisa-lj11	bbb80f4a55	hello again	2016-08-30 14:24:00 -07:00