Commit graph

66684 commits

Author SHA1 Message Date
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
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
744fa808e3 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-04-17 13:11:02 -03:00
Gabriel Calero
e3b94b163c Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-16 14:55:16 -03:00
Sam Gateau
3ac4a1db2d
Merge pull request #12850 from SimonWalton-HiFi/early-trace
Enable Interface tracing from earliest execution point
2018-04-16 10:24:55 -07:00
Ken Cooke
3630198c27
Merge pull request #12886 from kencooke/audio-gverb-deadcode
Remove dead code
2018-04-16 08:20:38 -07:00
Seth Alves
7f285c5f90
Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal
Fix unprotected tree traversals
2018-04-14 14:33:25 -07:00
Sam Gondelman
7c65c9c444
Merge pull request #12888 from SamGondelman/statsAssert
Rollback some recent QML changes on Android
2018-04-13 16:35:28 -07:00
John Conklin II
6def70791e
Merge pull request #12864 from sethalves/backtrace-annotations
switch to backtrace's newer crashpad blob
2018-04-13 15:34:05 -07:00
SamGondelman
8005547d03 rollback some qml changes on android 2018-04-13 14:28:00 -07:00
Anthony Thibault
f2c38a77a6
Merge pull request #12877 from hyperlogic/bug-fix/avatar-recording-mtu-overflow
Fix for avatar recording playback on avatars with many joints
2018-04-13 14:26:32 -07: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
John Conklin II
08ca30cf43
Merge pull request #12870 from druiz17/fix-grab-js
fix grab.js unable to grab other entities
2018-04-13 12:17:46 -07:00
John Conklin II
008c7be369
Merge pull request #12787 from druiz17/fix-offscreen-windows
hide desktop windows when switching into HMD mode
2018-04-13 12:17:15 -07:00
Melissa Brown
fd7b3b75f9
Merge pull request #12884 from Atlante45/fix/build-instructions
Update docs with correct qt version
2018-04-13 11:12:06 -07:00
Ken Cooke
ee6e9ee81e Remove dead code left over from Gverb 2018-04-13 10:36:13 -07: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
Ken Cooke
a5feb07bdf
Merge pull request #12863 from kencooke/audio-gainadj-stereo
Support per-avatar gain adjustment on stereo input streams
2018-04-13 06:52:54 -07:00
Seth Alves
3830f65df5
Merge pull request #12875 from druiz17/update-baking-tools
Update baking script to include skyboxes.
2018-04-12 19:46:46 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate
Migrate materials from userData to materialData
2018-04-12 18:24:33 -07:00
John Conklin II
fc487ea322
Merge pull request #12831 from ctrlaltdavid/21829
Model overlay fixes
2018-04-12 17:04:55 -07:00
Simon Walton
76468f7f26 Use existing DISABLE_WATCHDOG global to turn off thread entirely 2018-04-12 16:58:13 -07: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
John Conklin II
ec10fcb7b7
Merge pull request #12868 from SamGondelman/missingAlpha
Fix for missing alpha on server restart
2018-04-12 16:42:34 -07:00
Cristian Luis Duarte
20acfdfb82 First Android Go To implementation (from the Home screen) 2018-04-12 20:31:36 -03:00
John Conklin II
5322195eee
Merge pull request #12867 from ctrlaltdavid/21836-a
Fix location.protocol value for serverless domains
2018-04-12 16:28:31 -07:00
Clement
157ca8cd68 Update docs with correct qt version 2018-04-12 16:21:26 -07:00
John Conklin II
3d90f93cf1
Merge pull request #12812 from SamGondelman/compression
Support ETC2/EAC compressed textures
2018-04-12 16:04:08 -07:00
John Conklin II
67a8e6c82e
Merge pull request #12824 from SamGondelman/matFix
Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch
2018-04-12 15:30:11 -07:00
John Conklin II
9123c05eb3
Merge pull request #12859 from samcake/one
Fix a bug when switching shadow on/off in front of mirror
2018-04-12 15:25:05 -07:00
Cristian Luis Duarte
fe3c6cf8d6 Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_goto_splash 2018-04-12 19:23:59 -03:00
Cristian Luis Duarte
dc3914d6eb Android - new (empty) activity GotoActivity 2018-04-12 19:23:42 -03:00
Anthony J. Thibault
da319b9af6 Changed version constants into a enum class, to fix macosx warnings. 2018-04-12 15:09:01 -07:00
Gabriel Calero
bd4a7ce4fa Hide jump button while moving. Fix jump button right alignment in pixel 2018-04-12 19:02:03 -03:00
John Conklin II
40ae2913eb
Merge pull request #12847 from SamGondelman/clientMat
Fix client-only materials on non-avatars
2018-04-12 14:53:34 -07:00
Stephen Birarda
e2e0a50dd2
Merge pull request #12879 from highfidelity/RC66
RC66 merge back to master
2018-04-12 14:12:59 -07:00
Gabriel Calero
aaaa17be7b Merge branch 'android_goto_splash' of https://github.com/gcalero/hifi into android_goto_splash 2018-04-12 18:00:05 -03:00
Gabriel Calero
476e1cf7ae Adjust UI with pixel perfect precision. Support devices with on-screen bars. 2018-04-12 17:59:38 -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