Commit graph

441 commits

Author SHA1 Message Date
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