441 commits

Author	SHA1	Message	Date
Cristian Luis Duarte	19146ef73c	Android - avoid the QtNative.m_qtThread.exit(); call	2018-07-19 20:31:32 -03:00
Cristian Luis Duarte	6577a93cc9	Android Qt - Update QtActivity after change avoiding recursive loop android/app/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java	2018-07-18 12:43:13 -03:00
Qliemillar	43435bdeae	Merge pull request #13609 from Cristo86/android_refresh_domains ... Android - Refresh domains list with swipe	2018-07-16 11:59:14 -06:00
Cristian Luis Duarte	f9baeaf151	Android - logs during startup - weirdly did not get stuck during tests	2018-07-16 12:28:44 -03:00
Cristian Luis Duarte	bdd6f3c5c5	Android - Refresh domains list with swipe	2018-07-13 12:39:31 -03:00
Sam Gondelman	b53772f9ca	Merge pull request #13431 from Cristo86/android_stop_downloads_bg ... Android - Prevent pending downloads to happen when going back to home	2018-07-12 15:22:56 -07:00
Sam Gondelman	1a599fd818	Merge pull request #13486 from jherico/fix/android_qt_5_10_linux ... Move Android builds to Qt 5.11.1	2018-07-11 12:25:37 -07:00
Cristian Luis Duarte	be8351dc0d	Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background	2018-07-06 20:43:52 -03:00
John Conklin II	6e13b0e141	Merge pull request #13453 from gcalero/web_overlay_android ... Support web3d overlays in android	2018-07-06 13:02:56 -07:00
Gabriel Calero	d82c353103	Fix webview dimensions	2018-07-05 23:28:56 -03:00
Gabriel Calero	4e1ab621ed	Fix webview dimensions	2018-07-05 20:29:30 -03:00
Gabriel Calero	ff871a0ed5	Remove pictureInPicture support from manifest	2018-07-05 19:47:07 -03:00
Gabriel Calero	ea58ea0c6f	Code review	2018-07-05 17:32:20 -03:00
Gabriel Calero	6dae9f1c98	Make web view bigger	2018-07-05 16:28:09 -03:00
Gabriel Calero	6e3d3d457f	Clean web resources before closing web PiP	2018-07-04 17:38:42 -03:00
Gabriel Calero	9675328f1e	Keep the domain connection while WebView is expanded	2018-07-04 16:10:54 -03:00
Gabriel Calero	05267a7100	Fix crash in buffer corruption workaround	2018-07-03 19:10:26 -03:00
Gabriel Calero	1ff560a18b	Fix bugs	2018-07-03 18:23:42 -03:00
Gabriel Calero	2a29b4feaf	Add SlidingDrawer to QtLayout instead of main layout	2018-07-03 16:43:04 -03:00
Gabriel Calero	0b3e410694	Fade out web toolbar	2018-07-03 14:30:45 -03:00
Gabriel Calero	770a31faad	Hide web preview buttons after 5 secs	2018-07-03 13:21:13 -03:00
Gabriel Calero	21b089fa39	Bug fix	2018-07-02 19:44:48 -03:00
Stephen Birarda	91db8fa99f	add version code for increasing android appVersionCode	2018-07-02 13:22:55 -07:00
Gabriel Calero	11e47b8fe6	Apply web preview specs	2018-07-02 16:40:54 -03:00
Gabriel Calero	762e8f4bf0	Refactor WebViewActivity using fragment. Try SlidingDrawer.	2018-06-29 20:43:58 -03:00
Brad Davis	9f586799a5	Updating windows Qt build, removing dumpsyms on non-Linux builds	2018-06-29 12:37:11 -07:00
Gabriel Calero	416d2fbb20	Try Picture in Picture mode for webview activity	2018-06-29 15:46:08 -03:00
Gabriel Calero	a6d093d8c9	Merge remote-tracking branch 'upstream/master' into web_overlay_android	2018-06-29 15:09:32 -03:00
Brad Davis	7fbfc3a8c6	Update Android/Mac Qt version	2018-06-29 09:32:45 -07:00
Gabriel Calero	ded02f863f	Try Picture in Picture mode for webview activity	2018-06-28 18:34:08 -03:00
Brad Davis	f2e118de25	Move Linux Android build to Qt 5.11.1	2018-06-28 14:27:23 -07:00
Gabriel Calero	e15fc787d3	Remove the duplicated AccountManager used for android	2018-06-27 19:04:27 -03:00
Gabriel Calero	fedc0a9e61	Support web3d overlays in android	2018-06-25 16:37:03 -03:00
Gabriel Calero	d5e2362ee2	Clean up and complete gradle script	2018-06-21 11:19:29 -03:00
Gabriel Calero	730e14c9d9	Debugging gradle script	2018-06-21 11:19:20 -03:00
Gabriel Calero	ac533a3913	Debugging gradle script	2018-06-21 11:19:11 -03:00
Gabriel Calero	464f8e128a	Debugging gradle script	2018-06-21 11:19:04 -03:00
Gabriel Calero	f8511c5233	Debugging gradle script	2018-06-21 11:18:57 -03:00
Gabriel Calero	b42f546b2a	Debugging gradle script	2018-06-21 11:18:50 -03:00
Gabriel Calero	2a36b85ece	Debugging gradle script	2018-06-21 11:18:43 -03:00
Gabriel Calero	830dfd3233	Debugging gradle script	2018-06-21 11:18:36 -03:00
Gabriel Calero	a7c969f9df	Adding debug info	2018-06-21 11:18:29 -03:00
Gabriel Calero	f184e9fae8	Debug dump_sym run	2018-06-21 11:18:21 -03:00
Gabriel Calero	af29e10fe9	Adding debug info	2018-06-21 11:16:17 -03:00
Gabriel	77d53441c0	Add debug logging	2018-06-21 11:12:43 -03:00
Gabriel	3a473eaa0e	Update breakpad_dump_syms.zip	2018-06-21 11:11:11 -03:00
Gabriel Calero	e2ddaeac02	Add gradle task runBreakpadDumpSyms	2018-06-21 11:11:03 -03:00
Gabriel Calero	e1b5564c7b	Use environment variables BACKTRACE_URL and BACKTRACE_TOKEN (fix)	2018-06-21 11:10:56 -03:00
Gabriel Calero	0242e1d4d5	Use environment variables BACKTRACE_URL and BACKTRACE_TOKEN	2018-06-21 11:10:42 -03:00
Sam Gondelman	8817af9b9c	Merge pull request #13330 from Cristo86/android_enterbackground_startup ... Android - Make sure we call Interface enterBackground when opening	2018-06-18 12:47:43 -07:00
Gabriel Calero	3eecb2f379	Apply code conventions	2018-06-18 14:42:08 -03:00
Gabriel Calero	583c46b3a0	Merge remote-tracking branch 'upstream/master' into breakpad_android	2018-06-15 21:21:03 -03:00
Gabriel Calero	2a20ffcca4	Add delay before uploading minidump	2018-06-15 17:42:42 -03:00
Cristian Luis Duarte	61d1bf7bf7	Android - Show names of screens when going back in the Main screen (Home-Login-Friends)	2018-06-14 21:06:40 -03:00
Gabriel Calero	61fb6004eb	Merge branch 'breakpad_android' of https://github.com/gcalero/hifi into breakpad_android	2018-06-14 19:44:39 -03:00
Gabriel Calero	c02750edd1	Upload breakpad minidumps from an android service	2018-06-14 19:43:03 -03:00
Cristian Luis Duarte	248be87fa3	Android - First list of friends implementation in List of Friends	2018-06-14 15:19:21 -03:00
Gabriel Calero	395767ed80	Set android versionCode and versionName through gradle parameter RELEASE_NUMBER	2018-06-12 20:11:22 -03:00
Cristian Duarte	440ba7a6de	Add a friends fragment and expose the access token to java	2018-06-12 19:46:59 -03:00
Cristian Luis Duarte	26a9364efd	Android - Clean up enterBackground logs	2018-06-08 20:59:38 -03:00
Stephen Birarda	112abc9d7e	Merge pull request #13148 from birarda/feat/new-version-numbers ... add SHA to PR/master version, add build_type (stable/master/pr/dev)	2018-06-08 14:44:22 -07:00
Gabriel	1ec03475dd	Trying to fix android build ... Trying a new breakpad.zip version	2018-06-08 18:31:10 -03:00
Sam Gondelman	c7f05d96b4	Merge pull request #13309 from Cristo86/android_crashes_domains ... Android - Double Click crash and dev-mobile crash with Pixel XL	2018-06-08 13:36:53 -07:00
Sam Gondelman	87e6df3cba	Merge pull request #13319 from Cristo86/android_search_untagged ... Android - Allow search among protocol compatible user stories and not only tagged ones	2018-06-08 10:59:33 -07:00
Gabriel Calero	1a039ca504	Trying to fix build script	2018-06-08 12:38:24 -03:00
Gabriel Calero	cfc98afaf0	Add breakpad as external dependency	2018-06-08 12:11:01 -03:00
Gabriel Calero	3911a93a38	Merge remote-tracking branch 'upstream/master' into breakpad_android	2018-06-07 19:00:16 -03:00
Gabriel Calero	8869af069e	Integrate Breakpad in android Interface	2018-06-07 18:59:43 -03:00
Cristian Luis Duarte	2b0ac6a9bd	Android - Make sure we call Interface enterBackground when opening the app	2018-06-07 18:22:58 -03:00
Cristian Luis Duarte	293388ebc2	Android - Allow search among protocol compatible user stories and not only tagged ones	2018-06-06 19:26:13 -03:00
Sam Gateau	c145c0c1b8	Merge pull request #13186 from SamGondelman/etc2comp ... Android: Local texture compression using Etc2Comp	2018-06-06 11:13:50 -07:00
Gabriel Calero	85c6202e80	Workaround for android < Oreo	2018-06-01 17:11:14 -03:00
Gabriel Calero	459991988c	Fix NullPointerException introduced with the workaround	2018-06-01 15:48:57 -03:00
Gabriel Calero	b2fe5a6d63	Workaround for android buffer corruption issue	2018-06-01 15:00:00 -03:00
Sam Gondelman	ae3b933a80	Merge branch 'master' into etc2comp	2018-05-30 17:17:03 -07:00
Gabriel Calero	a36c41fc13	Make APK release signature optional	2018-05-30 12:43:44 -03:00
Cristian Luis Duarte	c0c246c934	Merge remote-tracking branch 'hifi/master' into android_crashes_domains	2018-05-28 17:14:58 -03:00
Gabriel Calero	8c6166d6e5	Change gradle configuration to sign release apk. Remove Daydream intent from AndroidManifest	2018-05-25 17:42:41 -03:00
Cristian Duarte	ab293376fd	Android - fix crash when double clicking a domain	2018-05-24 18:00:22 -03:00
Stephen Birarda	c3595a3216	pass STABLE_BUILD instead of BUILD_BRANCH through cmake	2018-05-24 12:03:03 -07:00
Andrew Meadows	288efb1f93	remove cuft	2018-05-24 11:30:12 -07:00
Andrew Meadows	14f776cfb7	upgrade android bullet dependency to 2.88	2018-05-24 11:28:52 -07:00
Andrew Meadows	30b2eb0740	update android glm dependency to 0.9.8.5	2018-05-23 14:52:28 -07:00
Andrew Meadows	d95371ae79	HACK: bypass android's baseUrl inflexibility	2018-05-23 14:52:28 -07:00
Sam Gondelman	6e7282bbb8	Merge pull request #13183 from Cristo86/android_search_mobile_domains ... Filter domains by tag 'mobile' in Search (Android)	2018-05-21 13:16:46 -07:00
Gabriel Calero	054e6041af	Code review changes	2018-05-18 19:43:41 -03:00
Gabriel Calero	85cff19020	Use domain thumbnail for the last visited location	2018-05-18 18:32:04 -03:00
SamGondelman	12b91a2ab7	compress skyboxes	2018-05-18 13:18:43 -07:00
Gabriel Calero	7a6b7b8ba3	Add Your Last Location in Android Home	2018-05-18 12:26:41 -03:00
Gabriel Calero	e10b716507	Revert audio fix	2018-05-17 14:26:36 -03:00
Gabriel Calero	5a73da6fdf	Bugfix: stop audio when app starts	2018-05-17 14:05:49 -03:00
Gabriel Calero	8741c5e6a4	Make haptic pulse duration configurable in VirtualPadDevice	2018-05-17 11:37:13 -03:00
Gabriel Calero	65a9b98b97	Use android.os.Vibrator to perform haptic feedback in Android	2018-05-16 20:07:10 -03:00
Gabriel Calero	5370cb7725	Change login option UI	2018-05-16 18:15:31 -03:00
Cristian Luis Duarte	49f4ce9053	Android - Filter domains by tag 'mobile' in Search	2018-05-16 18:15:11 -03:00
Gabriel Calero	fe5da24483	Fix spaces	2018-05-16 15:12:42 -03:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
Gabriel Calero	4a3001be18	Fix clipping on the right edge of login italic text views	2018-05-15 18:21:37 -03:00
SamGondelman	6b268191c8	local compression, patched etc2comp	2018-05-15 14:05:21 -07:00
Gabriel Calero	306b8cc68a	Set HomeActivity transparent to avoid texture corruption (black and white)	2018-05-15 15:14:17 -03:00
Cristian Luis Duarte	97a493d113	Android - Delay workaround to avoid joystick/controls issues	2018-05-14 14:41:31 -03:00
Gabriel Calero	0f8c666647	Trying to fix virtualpad textures corruption	2018-05-11 19:50:00 -03:00
Gabriel Calero	9b5da09dc7	Fix connection issue syncing two AccountManagers	2018-05-11 18:08:56 -03:00
Gabriel Calero	db460e9856	Put back the worker thread for account manager in android	2018-05-11 16:09:40 -03:00
Gabriel Calero	b2bedc4099	Merge branch 'android_places_goto' of https://github.com/Cristo86/hifi into android_places_goto	2018-05-10 18:22:41 -03:00
Cristian Luis Duarte	f30908fb26	Android - Remove delay starting Home + Change default joystick flag	2018-05-10 18:21:33 -03:00
Gabriel Calero	c6f93a17eb	Fix freeze when quitting the app trough back button	2018-05-10 18:01:50 -03:00
SamGondelman	437fa25f6e	Merge remote-tracking branch 'upstream/master' into etc2comp	2018-05-09 14:30:53 -07:00
Gabriel Calero	b0fee3fd8b	Improve code based on changes requested in the PR	2018-05-09 11:06:32 -03:00
SamGondelman	07600f2a81	add etc2comp dependency on desktop and android	2018-05-08 17:30:48 -07:00
Gabriel Calero	f21ef30d85	Restore back the fix for joystick texture corruption	2018-05-08 17:24:49 -03:00
Gabriel Calero	5e337e90a3	Deactivates display plugin when qt app goes to background	2018-05-08 16:55:04 -03:00
Gabriel Calero	da69c9d077	Make qt application not stop in background and remove separete thread	2018-05-08 15:45:33 -03:00
Gabriel Calero	66b975192d	Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login	2018-05-07 15:56:43 -03:00
Cristian Luis Duarte	de00f680fa	Android - Search - Domains local file not needed anymore	2018-05-04 18:51:02 -03:00
Cristian Luis Duarte	d4a6e845cd	Android - Search - Code style fixes	2018-05-04 18:37:22 -03:00
Gabriel Calero	868b58e66d	Un-expose Application from javascript. Restore displayplugin deactivation when goes to background	2018-05-04 18:01:01 -03:00
Gabriel Calero	5558bb784a	Splash screen with High Fidelity logo	2018-05-02 16:59:26 -03:00
Cristian Luis Duarte	afc929b07a	Android - Make ripple effect visible by adding a delay	2018-05-02 16:31:45 -03:00
Gabriel Calero	0f08bd8fa1	Use a single AccountManager for android.	2018-05-02 12:11:11 -03:00
Cristian Luis Duarte	3601a2e2b5	Android Search - No keyboard popup when starting + search hint no clip on the right	2018-04-30 18:11:23 -03:00
Gabriel Calero	ce8bd13685	Cleanup android code	2018-04-27 18:58:09 -03:00
Gabriel Calero	c27f415fea	Fix dimensions in android privacy policy	2018-04-27 12:55:16 -03:00
Gabriel Calero	0d08bc6e7c	Fix dimensions in android login	2018-04-27 12:38:38 -03:00
Cristian Luis Duarte	fdc9df73c2	Android - Search - Dimensions fixes	2018-04-26 21:44:58 -03:00
Gabriel Calero	4954cf8386	Tweak search domains screen	2018-04-26 14:59:58 -03:00
Gabriel Calero	f9fc549e7d	Avoid switch from landscape to portrait during bootstrap	2018-04-26 11:49:28 -03:00
Cristian Luis Duarte	751f8f59d7	Android - Workaround for Joystick disappearing problem in Adreno devices + No excessive rotation in loading moment	2018-04-25 20:13:04 -03:00
Gabriel Calero	2673a06d6f	Tweak UI (status bar, action bar, privacy policy, login)	2018-04-25 17:47:05 -03:00
Gabriel Calero	11d2321467	New default avatar photo. Support relative url for profile picture. Refactor download profile picture as async task	2018-04-24 16:43:48 -03:00
Gabriel Calero	83399e4c6d	Fix privacy policy adding a missing (content) file	2018-04-24 14:32:38 -03:00
Gabriel Calero	51f9b763ff	Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login	2018-04-24 13:18:28 -03:00
Gabriel Calero	103e9f92fa	Add haptic feedback to back, view and mic buttons	2018-04-24 11:56:01 -03:00
Cristian Luis Duarte	52ef935acb	Android - Search - Ripple effect on items and rounded corners using CardView	2018-04-23 21:43:27 -03:00
Gabriel Calero	74e38882f7	Refactor using Android fragments. Complete drawer menu. Add Privacy Policy.	2018-04-23 17:01:34 -03:00
Cristian Luis Duarte	8e7d14a8e3	Android - Search - Search icon and clear button + UI background matches design	2018-04-23 13:16:27 -03:00
Cristian Luis Duarte	5499787385	Android - TMP PATCH - Do not deactivate DisplayPlugin as it makes the black screen problem	2018-04-20 19:26:53 -03:00
Cristian Luis Duarte	dc321e4cd7	Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto	2018-04-19 18:46:44 -03:00
Gabriel Calero	f2184bf456	Handle android back button. Remove unused resources. Fix compilation errors.	2018-04-19 17:31:25 -03:00
Cristian Luis Duarte	af785d6072	Android - Search - Cleanup tabs code and code in general. Show 'no places' message when no results from search.	2018-04-19 17:22:53 -03:00
Cristian Luis Duarte	8249d445c5	Android - Search - Remove unused buttons, add text background, search hint italic	2018-04-19 16:06:59 -03:00
Gabriel Calero	a0b5d9a78d	Rename openGotoActivity to openAndroidActivity	2018-04-19 14:33:38 -03:00
Cristian Luis Duarte	5be9959424	Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto	2018-04-19 12:11:29 -03:00
Cristian Luis Duarte	c71fa6add5	Android - Use images in domains list	2018-04-19 11:47:11 -03:00
Gabriel Calero	c8fe45eb8f	Remove debug statements and unused code. Put JNI code in a separated file.	2018-04-19 11:41:59 -03:00
Cristian Luis Duarte	e784d45b24	Android Search - Enter goes to what was typed in the search field (uses it as an address)	2018-04-18 21:40:37 -03:00
Cristian Luis Duarte	0ae564b9b6	Android - Home screen has search. First implementation that retrieves 10 pages of concurrency from the user_stories API and allows filtering	2018-04-18 21:24:58 -03:00
Cristian Luis Duarte	9c44be3557	Merge remote-tracking branch 'gcgithub/android_new_login' into android_places_goto	2018-04-18 16:55:08 -03:00
Gabriel Calero	472cc1b29a	Fix code spacing	2018-04-18 16:44:49 -03:00
Cristian Luis Duarte	1c31a519ba	Android Home screen access user_stories API to get domains - first implementation without filtering	2018-04-18 16:03:17 -03:00
Gabriel Calero	120de92c9e	Add login activity	2018-04-18 15:52:02 -03:00
Cristian Luis Duarte	b26bf30904	Android - Make HomeActivity responsible for opening Interface avoiding blank-screen crashes when entering domains more than once	2018-04-13 17:51:29 -03:00
Cristian Luis Duarte	2e1f2f4214	Android Go To, minor visual adjustments	2018-04-13 14:30:55 -03:00
Gabriel Calero	a073cba4d4	Set the current address as default in the Go To screen	2018-04-13 12:35:33 -03:00
Cristian Luis Duarte	6b1e22c226	Android Go To - Set inputType as textUri	2018-04-12 20:53:17 -03:00
Cristian Luis Duarte	ffb38eb490	Add hifi scheme for scheme-less addresses	2018-04-12 20:45:35 -03:00
Cristian Luis Duarte	20acfdfb82	First Android Go To implementation (from the Home screen)	2018-04-12 20:31:36 -03:00
Cristian Luis Duarte	dc3914d6eb	Android - new (empty) activity GotoActivity	2018-04-12 19:23:42 -03:00
Cristian Luis Duarte	0f39ab0bb9	Android GotoAcitivity is now HomeActivity (leaving the place for the upcoming 'Go To activity' itself	2018-04-12 17:47:58 -03:00
Cristian Luis Duarte	a7328f0934	Fix View not attached to windown manager crash when starting the app in landscape mode on Pixel XL	2018-04-12 15:55:20 -03:00
Gabriel Calero	865e3a05f1	Move jump button to the right. Adjust position of buttons	2018-04-11 19:33:43 -03:00
Gabriel Calero	e85f5c97dc	Remove bottom bar. Apply new design for android	2018-04-09 11:41:00 -03:00
Gabriel Calero	99d8f822b2	Fix crash selecting domain for second time. Stop rendering while Goto activity is started	2018-04-04 19:24:26 -03:00
Gabriel Calero	085dd5aeec	Fix build	2018-04-03 15:47:57 -03:00
Gabriel Calero	2ff13270ed	Go back to GoTo screen	2018-04-02 12:22:21 -03:00
Gabriel Calero	ebe110d3ad	Add Your Last Location to the domains list	2018-03-27 16:47:10 -03:00
Gabriel Calero	a9f44fb8ed	Customize SearchView in GoTo activity	2018-03-27 12:29:14 -03:00
Gabriel Calero	7be11fc697	Align UI of Go To activity	2018-03-26 19:44:26 -03:00
Gabriel Calero	0afdb674dc	Fix and add domains in GoTo screen	2018-03-23 18:50:06 -03:00
Gabriel Calero	527c81e501	Preload Qt libraries to make lighter the task performed by QtActivity.onCreate	2018-03-23 16:46:34 -03:00
Gabriel Calero	11bfc1ca74	Add Goto as splash screen in android	2018-03-21 17:40:14 -03:00
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
Bradley Austin Davis	a776c415eb	Fix gradle dependencies	2017-12-11 13:35:56 -08:00
Bradley Austin Davis	9df9cf7a47	Adding more libs, ifdefs for android incompatible code	2017-12-11 13:18:23 -08:00
Brad Davis	0379ebad63	Updating android toolchain for QML	2017-12-07 11:19:31 -08:00
Brad Davis	101d6763cc	PR feedback	2017-11-29 09:11:52 -08:00
Bradley Austin Davis	e4220aa44e	Fixing warnings in android build	2017-11-28 14:32:30 -08:00
Bradley Austin Davis	a30395e945	Tweaking android cmake	2017-11-28 13:46:01 -08:00
Bradley Austin Davis	137118c7fd	Conditionally rename the APK for Jenkins	2017-11-28 12:35:10 -08:00
Bradley Austin Davis	72792552c8	Add BUILD_BRANCH to the parameters passed to cmake	2017-11-28 12:30:39 -08:00
Bradley Austin Davis	300e1835eb	Fix scribe permissions setting	2017-11-28 12:20:52 -08:00
Brad Davis	251ae81536	Adding verification to downloaded files for android	2017-11-28 11:32:41 -08:00
Brad Davis	8d6d1f67f1	Support RELEASE_TYPE and RELEASE_NUM for Android	2017-11-28 11:32:36 -08:00
Bradley Austin Davis	9293391297	Reduce number of gradle files	2017-11-28 11:32:35 -08:00
Bradley Austin Davis	ddc2548c53	Add polyvox, fix task copy bugs	2017-11-28 11:32:34 -08:00
Bradley Austin Davis	d6072f2bf2	Add bullet and draco to precompiled libraries	2017-11-28 11:32:34 -08:00
Bradley Austin Davis	113844384a	Update linux android Qt to 5.9.3	2017-11-28 11:32:33 -08:00
Brad Davis	e086bed021	Updating OSX to Qt 5.9.3	2017-11-28 11:32:33 -08:00
Brad Davis	8f43083ded	Enable windows builds	2017-11-28 11:32:32 -08:00
Bradley Austin Davis	6bdaf638cf	Support OSX build	2017-11-28 11:32:32 -08:00
Brad Davis	d769acd345	Updating Android toolchain	2017-11-28 11:32:32 -08:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00