70 commits

Author	SHA1	Message	Date
Gabriel Calero	7778ddfdcb	Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec	2018-03-12 18:33:05 -03:00
Gabriel Calero	25f207a6db	Add hifi audio codec in Android build	2018-03-12 18:29:57 -03:00
Brad Davis	47b08d7228	Update Hifi icon	2018-03-08 15:38:13 -08:00
Gabriel Calero	069d3e40bc	Merge branch 'android' into android_bubble_fix	2018-03-06 18:58:49 -03:00
Gabriel Calero	d64a6ecda7	Fix keyboard in Samsung Note 8	2018-03-02 16:56:06 -03:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Andrew Meadows	b6f81a8131	android app depends on task lib	2018-02-13 08:58:24 -08:00
Sam Gateau	714e3f445d	Merge pull request #11537 from jherico/threaded_qml ... Migrating QML rendering off the main thread	2018-02-12 15:32:33 -08:00
Brad Davis	a45fec682d	Enable QML on android	2018-02-12 12:11:59 -08:00
Brad Davis	18f2387fa1	Fix windows/android Qt build	2018-02-12 11:20:43 -08:00
Bradley Austin Davis	97c878e4fe	Fix Windows android build	2018-02-09 15:06:09 -08:00
Bradley Austin Davis	023ee35b2e	Merge remote-tracking branch 'upstream/master' into threaded_qml	2018-02-08 17:16:36 -08:00
Bradley Austin Davis	fd007e845d	Squashed scribe changes	2018-02-07 10:29:29 -08:00
Bradley Austin Davis	6b8bfdb750	Use version IDs in scribe tool downloads	2018-02-06 17:35:00 -08:00
Bradley Austin Davis	6092f1503e	Fixing android build	2018-02-06 17:22:06 -08:00
Bradley Austin Davis	0c37263d95	Use version IDs in scribe tool downloads	2018-02-06 14:51:51 -08:00
Brad Davis	7d5502eb92	Migrating QML rendering off the main thread	2018-02-06 11:53:09 -08:00
Brad Davis	b1fb4c2d0f	Re-enable KTX cache on android	2018-02-02 13:43:46 -08:00
Brad Davis	d087530423	Add nvtt to android build	2018-02-02 13:42:26 -08:00
Brad Davis	ca83999546	Trying to fix Android pre-build	2018-01-16 09:22:39 -08:00
Brad Davis	673a396fdc	Extend timeout for capturing executable output	2018-01-16 09:11:50 -08:00
Brad Davis	60bb3f49c9	Fix crash on 0 size assets	2018-01-15 11:57:06 -08:00
Brad Davis	db30e9c45f	Fixing PR builds	2018-01-15 09:47:31 -08:00
Brad Davis	55bfdc105b	Switch android to GLAD	2018-01-14 10:22:18 -08:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Brad Davis	c924cbf2a7	Remove explicit gpu-gl dependencies	2018-01-13 12:20:41 -08:00
Brad Davis	6e3ce95c3c	Force overwrites of existing assets	2018-01-11 08:06:06 -08:00
Brad Davis	4dfe0073bc	Do asset merging post-build	2018-01-10 17:18:30 -08:00
Brad Davis	10a67fd9f8	Fix unpack resources on android	2018-01-10 13:33:43 -08:00
Brad Davis	b1e95681a9	Cleanup android	2018-01-09 23:30:31 -08:00
Brad Davis	105dffebaf	Fixing UI	2018-01-09 18:36:42 -08:00
Brad Davis	fd01f1ca9c	Remove gradle.properties	2018-01-09 11:48:44 -08:00
Brad Davis	bd5af2b493	Working on android avatar rendering	2018-01-09 11:40:32 -08:00
Brad Davis	3d186efbac	Merge remote-tracking branch 'gcalero/android_render_pr' into android_nov	2018-01-08 14:04:52 -08:00
Gabriel Calero	7fbd23f36b	Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr	2018-01-08 17:38:28 -03:00
Gabriel Calero	6050737e7c	Resolving comments in PR	2018-01-08 17:36:08 -03:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
Brad Davis	e0e89604cc	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-08 09:44:14 -08:00
Gabriel Calero	6d732dd8ba	Add missing Qt dependencies to gradle script	2018-01-05 19:45:02 -03:00
Gabriel Calero	8cac98545a	Fixes for Android	2018-01-04 17:36:10 -03:00
Gabriel Calero	597114afea	Prepare forward pipeline for android	2018-01-03 16:42:19 -03:00
Cristian Luis Duarte	da28e0a8cb	Implement generateAssetsFileList in build.gradle (same work as assets file generation by androiddeployqt) + Copy assets at startup	2018-01-03 16:42:18 -03:00
Gabriel Calero	ef8ba1cad0	Include config.h in ResourceImageItem.cpp. Minor fixes	2018-01-03 16:40:14 -03:00
Gabriel Calero	ad7cb24ea3	Restore interface icon and name for android	2018-01-03 16:36:11 -03:00
Gabriel Calero	76b38bebad	Make Interface run in Android	2018-01-03 16:36:11 -03:00
Brad Davis	26291e0a75	PR feedback	2017-12-21 07:29:29 -08:00
Brad Davis	ea5bff8a2b	.	2017-12-18 10:21:22 -08:00
Brad Davis	6cf99e0b03	Add version IDs to dependency downloads	2017-12-16 16:17:31 -08:00
Brad Davis	6cff86b0f3	Fix polyvox archive, correct build errors, add additional libraries	2017-12-12 18:29:36 -08:00
Bradley Austin Davis	282ae7b6f9	Small fixes	2017-12-11 14:42:37 -08:00