Brad Davis
3e552e5739
Fix warnings
2018-02-26 09:53:35 -08:00
Bradley Austin Davis
12d1885dff
Merge pull request #12428 from gcalero/android_ui_fixes
...
Android ui fixes
2018-02-22 18:28:18 -08:00
Brad Davis
e0e7fb04f2
Fix merge issues
2018-02-22 18:08:56 -08:00
Brad Davis
aeb29db37d
Merge remote-tracking branch 'upstream/stable' into android_stable
2018-02-22 17:35:00 -08:00
Brad Davis
4e2d3f23a6
Fix tonemapping on forward render pipeline / GLES
2018-02-22 15:38:15 -08:00
Gabriel Calero
925fe477e8
Merge remote-tracking branch 'github/android' into android_ui_fixes
2018-02-22 19:36:56 -03:00
Brad Davis
49dea19b26
Fix BGR/RGB bug on GLES
2018-02-22 14:11:05 -08:00
John Conklin II
43afd257b6
Merge pull request #12361 from highfidelity/RC64
...
Beta Release 64 - includes up to Developer Release 7818
2018-02-22 13:22:47 -08:00
John Conklin II
e1ed0977e8
Merge pull request #12469 from jherico/RC64_stable
...
Merge from stable back into RC64
2018-02-22 10:58:38 -08:00
Brad Davis
2f34fb2e42
Merge remote-tracking branch 'upstream/stable' into HEAD
2018-02-22 10:20:10 -08:00
Gabriel Calero
2d4bb3bad3
Change color to QML debug info
2018-02-21 20:23:54 -03:00
Gabriel Calero
f2ce3d0268
Fix focus hack. Add QML debug info
2018-02-21 20:10:03 -03:00
Cristian Luis Duarte
6411d1b35b
Android - Avoid overlapping between hint and input in Go To by clearing text when closing the window
2018-02-21 16:52:57 -03:00
Cristian Luis Duarte
00958965bc
Android- Center login dialog in both big (Pixel XL, Huawei Mate 9 Pro) and smaller screens (Pixel)
2018-02-20 19:25:41 -03:00
Gabriel Calero
bd9d8ac4f9
Tune radar styles
2018-02-20 19:07:41 -03:00
Gabriel Calero
5e3ad3fe9a
Disable VPAD on bottom bar tapping and modes bar tapping
2018-02-20 17:20:48 -03:00
Gabriel Calero
4839a8c720
Remove Forgot labels in login dialog
2018-02-20 12:59:06 -03:00
Gabriel Calero
c19664e3ca
Remove the shrink cap in radar mode
2018-02-20 12:01:10 -03:00
Gabriel Calero
12770142fa
Add bubble button to android bottombar
2018-02-19 16:59:34 -03:00
Gabriel Calero
94a8aad712
Avoid keyboard appearing on startup
2018-02-19 16:52:51 -03:00
Gabriel Calero
b34fb3a57f
Merge remote-tracking branch 'gcalero-github/android_ui_fixes' into android_ui_fixes
2018-02-19 16:14:07 -03:00
Gabriel Calero
779e45aae7
Restore avatar overlays
2018-02-19 16:12:41 -03:00
Cristian Luis Duarte
5f1fc37684
Android - Support display with smaller resolution than 1440p for Go To window
2018-02-16 18:29:22 -03:00
Brad Davis
458b944d2d
Use pikachu for android builds
2018-02-16 09:29:31 -08:00
Brad Davis
fe9b1de908
Fix PR builds
2018-02-16 09:28:58 -08:00
Gabriel Calero
72e02d6207
Restore default precision qualifier (needed for pixel)
2018-02-16 09:14:20 -08:00
Gabriel Calero
3effb6097b
Add precision qualifier in fragment shaders for struct fields
2018-02-16 09:14:14 -08:00
Ryan Downe Karpf
a621cb3c2c
Merge pull request #12417 from hyperlogic/bug-fix/rc64-scramlbed-avaatrs
...
RC64: Bug fix for Scramlbed Avaatrs
2018-02-16 08:41:28 -08:00
Ryan Downe Karpf
bc8ea1be17
Merge pull request #12421 from druiz17/RC64
...
don't update avatar entities if the avatars ID is AVATAR_SELF_ID
2018-02-16 08:41:10 -08:00
Dante Ruiz
52f576e6f6
don't update avatar entities if the avatars ID is AVATAR_SELF_ID
2018-02-15 15:48:29 -08:00
Anthony J. Thibault
cee0bbf8a5
Revert "FBX node IDs aren't alphanumerically ordered per logical structure"
...
This reverts commit a7ec4501e6http://doc.qt.io/qt-5/qset.html
This was bug was causing scrambled avatars, because both the transmitter and receiver of the AvatarData packets
make the strong assumption that the joint orders are same. When they are not the avatar's appear scrambled.
(cherry picked from commit f07b1fa4c5
2018-02-15 13:26:39 -08:00
Gabriel Calero
82f9416b3f
Restore default precision qualifier (needed for pixel)
2018-02-15 17:39:01 -03:00
Gabriel Calero
1b08ce6ac2
Set default location to pikachu/160.45,-2.45,159.106 for non-stable branches
2018-02-15 15:31:02 -03:00
John Conklin II
db399a47eb
Merge pull request #12405 from ElderOrb/FB12297
...
Fix for privacy screen not displayed during wallet creation on step 3, while user entering password for the wallet
2018-02-15 09:47:45 -08:00
Gabriel Calero
28c7ed761e
Add precision qualifier in fragment shaders for struct fields
2018-02-15 12:17:13 -03:00
Alexander Ivash
611c67bf2f
FB12297 - HMD: Disabled preview mode only occurs during step 2 of the wallet setup wizard
2018-02-15 02:00:51 +03:00
Cristian Luis Duarte
b4fbeacc5d
Merge remote-tracking branch 'hifi/android' into android_bottombar_features
2018-02-14 17:38:01 -03:00
Cristian Luis Duarte
674af54a82
Android - Scale up Sign In and Sign Up windows.
2018-02-14 17:02:03 -03:00
Gabriel Calero
99f6c80b2a
Temporary remove ToneMappingDeferred
2018-02-13 10:00:31 -08:00
John Conklin II
92b60fdd9c
Merge pull request #12383 from highfidelity/RC63.4
...
HOTFIX 63.4
2018-02-12 14:57:24 -08:00
Brad Davis
1f2760c4b7
Merge remote-tracking branch 'gcalero/android_ui_bottombar3' into android
2018-02-12 12:39:40 -08:00
Gabriel Calero
4079a54bd3
Merge remote-tracking branch 'github/android' into android_bottombar_features
2018-02-12 17:32:08 -03:00
Brad Davis
bac80292a7
Merge remote-tracking branch 'gcalero/android_audio_fixes' into android
2018-02-12 12:13:34 -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
samcake
bc51f3643d
Adding a check for item existence before calling the update on the render::Item
2018-02-12 10:21:50 -08:00
Bradley Austin Davis
f6fbac25b0
Prevent deadlock crashes when building shaders at startup
2018-02-12 09:49:28 -08:00
Bradley Austin Davis
4bb329696a
Don't trigger a backtrace exception on quitting while in HMD
2018-02-12 08:49:20 -08:00
Bradley Austin Davis
288443d74b
Fix for deadlock triggering while loading QML engine
2018-02-12 08:49:10 -08:00
Gabriel Calero
a2f6548d1d
Make slot declarations non-conditional
2018-02-12 13:45:56 -03:00
