Ryan Huffman
|
239877fc18
|
Remove _didFinish from BakeAssetTask
|
2017-12-08 17:47:57 -08:00 |
|
Ryan Huffman
|
50c47c785d
|
Fix BakeAssetTask not handling case where oven process is not found
|
2017-12-08 17:45:42 -08:00 |
|
Ryan Huffman
|
982607eedf
|
Remove unused variable from PathUtils
|
2017-12-08 15:40:33 -08:00 |
|
Ryan Huffman
|
4dd08d93f4
|
Cleanup dead code and unused var in BakerCLI
|
2017-12-07 10:54:39 -08:00 |
|
Ryan Huffman
|
94a58a2471
|
Remove baking dependency from assignment-client
|
2017-12-07 10:53:23 -08:00 |
|
Ryan Huffman
|
2eecb41337
|
Update metatype registration in assetBakeTask
|
2017-12-06 13:59:46 -08:00 |
|
Ryan Huffman
|
6b098bfc6a
|
Fix aborted baking in oven cli
|
2017-12-06 13:51:31 -08:00 |
|
Ryan Huffman
|
cb9a30413d
|
Rename removeTemporaryDis to removeTemporaryApplicationDirs
|
2017-12-06 12:50:20 -08:00 |
|
Ryan Huffman
|
f20aa2e680
|
Fix asset server baking not working on *nix
|
2017-12-06 11:49:34 -08:00 |
|
Ryan Huffman
|
bee666b522
|
Add error text reading to asset server baking
|
2017-12-06 11:49:34 -08:00 |
|
Ryan Huffman
|
de7e3e60cd
|
Add temp dir removal to asset server
|
2017-12-06 11:49:34 -08:00 |
|
Ryan Huffman
|
7eb93f4777
|
Add oven as dep to assignment-client
|
2017-12-06 11:49:34 -08:00 |
|
Ryan Huffman
|
f3fc5769e8
|
Move asset baking on asset server to separate process
|
2017-12-06 11:49:19 -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 |
|