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 |
|
Clément Brisset
|
a5e671e0fd
|
Merge pull request #11931 from highfidelity/stable
stable -> master
|
2017-12-05 11:58:23 -08:00 |
|
Zach Fox
|
c80039ea87
|
Merge pull request #11929 from zfox23/commerce_fixGraySecurityImage1
Fix gray/incorrect security image after relog
|
2017-12-05 11:21:06 -08:00 |
|
Zach Fox
|
1507620fd5
|
Merge pull request #11921 from ElderOrb/FB10024
10024 Wallet: TextField Focus Problems
|
2017-12-05 10:52:08 -08:00 |
|
Zach Fox
|
d59c9bd73a
|
Fix gray/incorrect security image after relog
|
2017-12-05 10:27:40 -08:00 |
|
Ryan Downe Karpf
|
f2c49b3231
|
Merge pull request #11887 from highfidelity/RC60
Beta Release 60 - Includes up to Developer Release 7493
|
2017-12-05 11:37:52 -05:00 |
|
NissimHadar
|
ec1c4c37fa
|
Merge pull request #11912 from ElderOrb/FB9461
9461 Keyboard for create appear then disappears immediately (HMD)
|
2017-12-04 16:49:25 -06:00 |
|
Alexander Ivash
|
f7328f05fb
|
remove keyboard-hiding logic as keyboard hides should be handled by focus change listener in 'onFocusObjectChanged' in the OffscreenQmlSurface
|
2017-12-05 00:51:42 +03:00 |
|
Zach Fox
|
4c96fc2d9d
|
Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation
Call reset() on Wallet before creating new wallet
|
2017-12-04 13:05:36 -08:00 |
|
Alexander Ivash
|
8a5904373b
|
remove 'collapse keyboard' hack as now there is dedicated 'collapse keyboard' button
|
2017-12-05 00:04:46 +03:00 |
|
Alexander Ivash
|
c67ff3b5d8
|
10024 Wallet: TextField Focus Problems
note: removed excessive MouseArea-s
|
2017-12-05 00:03:48 +03:00 |
|
Brad Hefta-Gaub
|
33adb0d76d
|
Merge pull request #11868 from ctrlaltdavid/21615
Add "size" as synonym for "dimensions" in model overlay property setter
|
2017-12-03 18:10:30 -08:00 |
|
Brad Hefta-Gaub
|
06cf194ec7
|
Merge pull request #11910 from ctrlaltdavid/21626
Fix erroneous 2D overlay unhandled property messages for bounds property
|
2017-12-03 18:09:17 -08:00 |
|
Brad Hefta-Gaub
|
218b4635b2
|
Merge pull request #11904 from druiz17/fix-equipping
Fix adjusting equipped entities
|
2017-12-02 18:31:00 -08:00 |
|
Brad Hefta-Gaub
|
314265fa86
|
Merge pull request #11891 from ctrlaltdavid/21625
Add missing line3d overlay property getters and setters
|
2017-12-02 12:52:44 -08:00 |
|
Brad Hefta-Gaub
|
ce68b720c2
|
Merge pull request #11886 from druiz17/fix-vive-head-pose
Register the Vive inputDevice if no controllers are available
|
2017-12-02 12:52:31 -08:00 |
|
Brad Hefta-Gaub
|
3f705a7baf
|
Merge pull request #11858 from vladest/fix_tablet_scrollbars
Use ScrollBars from QQC2, which supports mouse and touch events
|
2017-12-02 12:51:14 -08:00 |
|
Brad Hefta-Gaub
|
ec33aa9c4b
|
Merge pull request #11880 from ElderOrb/FB7991
7991 Change Instances of Edit Mode to Create Mode
|
2017-12-02 12:50:48 -08:00 |
|
Brad Hefta-Gaub
|
b2c5154cb6
|
Merge pull request #11909 from ZappoMan/rc60FixModelImportSizing
fix issues in model import sizing caused by recent refactor
|
2017-12-02 09:30:57 -08:00 |
|
Anthony Thibault
|
fe16cc3fab
|
Merge pull request #11902 from luiscuenca/onloadFix
Fixes create list and web and QML audio sync
|
2017-12-01 16:05:07 -08:00 |
|
luiscuenca
|
fefedc11c8
|
mac fix
|
2017-12-01 15:17:23 -07:00 |
|
Howard Stearns
|
e2efe062fe
|
Merge pull request #11893 from zfox23/commerce_sameInfoDontRefresh
Don't refresh Inventory or Recent Activity if data hasn't changed
|
2017-12-01 13:57:34 -08:00 |
|
luiscuenca
|
d271f61987
|
Proper fix
|
2017-12-01 14:37:59 -07:00 |
|
Brad Hefta-Gaub
|
dd6af08084
|
Merge pull request #11908 from ZappoMan/fixModelImportSizing
fix issues in model import sizing caused by recent refactor
|
2017-12-01 12:28:14 -08:00 |
|
Zach Fox
|
3fb1df88cb
|
Merge pull request #11913 from zfox23/commerce_fixMonthLol_RC60
Fix month display in commerce... RC60 PR
|
2017-12-01 10:49:57 -08:00 |
|
Zach Fox
|
b8f7ba9aa6
|
Fix month display in commerce...
|
2017-12-01 10:45:36 -08:00 |
|
Zach Fox
|
52ca9a6c76
|
Merge pull request #11911 from zfox23/commerce_fixMonthLol
Fix month display in commerce...
|
2017-12-01 10:44:19 -08:00 |
|
Alexander Ivash
|
48b50e33dd
|
9461 Keyboard for create appear then disappears immediately (HMD)
|
2017-12-01 20:29:35 +03:00 |
|
Zach Fox
|
ebb2e50d01
|
Fix month display in commerce...
|
2017-12-01 09:29:19 -08:00 |
|
David Rowe
|
fd76c7a88b
|
Fix erroneous 2D overlay unhandled property messages for bounds property
|
2017-12-01 17:40:34 +13:00 |
|
ZappoMan
|
d1017d81bd
|
fix issues in model import sizing caused by recent refactor
|
2017-11-30 18:08:32 -08:00 |
|
ZappoMan
|
750d505f9b
|
fix issues in model import sizing caused by recent refactor
|
2017-11-30 17:51:59 -08:00 |
|
luiscuenca
|
83e370d9de
|
add shared pointer
|
2017-11-30 17:40:49 -07:00 |
|
Zach Fox
|
24e5994f20
|
The nuclear option is a bad option.
|
2017-11-30 15:55:09 -08:00 |
|
luiscuenca
|
5d1f2a04c1
|
restate deleted lines
|
2017-11-30 16:43:38 -07:00 |
|
Zach Fox
|
009d3a18a3
|
Call reset() on Ledger and Wallet before creating new wallet
|
2017-11-30 15:40:20 -08:00 |
|
luiscuenca
|
98e8361690
|
Fix and rebuild
|
2017-11-30 16:07:43 -07:00 |
|
Dante Ruiz
|
eaa049863d
|
Merge branch 'RC60' of github.com:highfidelity/hifi into fix-equipping
|
2017-11-30 14:49:24 -08:00 |
|
Dante Ruiz
|
db374b8c6d
|
fixing adjusting equipped entities
|
2017-11-30 14:49:06 -08:00 |
|
luiscuenca
|
9cd2dc921a
|
back to for loop
|
2017-11-30 15:31:29 -07:00 |
|
luiscuenca
|
0729579266
|
fix for loop
|
2017-11-30 15:21:43 -07:00 |
|
luiscuenca
|
58e829dbda
|
Delete leftover line
|
2017-11-30 15:11:38 -07:00 |
|
luiscuenca
|
e02e810399
|
Audio Handler fix
|
2017-11-30 15:06:02 -07:00 |
|
Dante Ruiz
|
785eedfb1c
|
Merge pull request #11896 from druiz17/fix-hud-hmd-rc60
fix laser interaction on HUD in HMD mode
|
2017-11-30 11:48:39 -08:00 |
|
Bradley Austin Davis
|
59aea9c401
|
Merge pull request #11862 from jherico/android_nov
Make buildable APK from Gradle
|
2017-11-30 11:23:29 -08:00 |
|
Zach Fox
|
b0dda3de33
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sameInfoDontRefresh
|
2017-11-30 10:49:20 -08:00 |
|