Sam Gateau
|
987246afb8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into light
|
2017-12-04 19:11:42 -08:00 |
|
samcake
|
de410b6833
|
I need a color editor
|
2017-12-04 17:29:01 -08: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 |
|
samcake
|
9fceaad38b
|
Merging with master
|
2017-12-04 14:20:10 -08: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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
750d505f9b
|
fix issues in model import sizing caused by recent refactor
|
2017-11-30 17:51:59 -08:00 |
|
Zach Fox
|
24e5994f20
|
The nuclear option is a bad option.
|
2017-11-30 15:55:09 -08:00 |
|
Zach Fox
|
009d3a18a3
|
Call reset() on Ledger and Wallet before creating new wallet
|
2017-11-30 15:40:20 -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 |
|
vladest
|
a3d406d8d1
|
Merge branch 'master' into fix_tablet_scrollbars
|
2017-11-30 11:40:50 +01:00 |
|
vladest
|
dfeefe53b8
|
Make scroll bar handle centered on shaft. Width chaned on par with entities list html view
|
2017-11-30 11:40:02 +01:00 |
|
Zach Fox
|
7490744fb7
|
Merge pull request #11882 from howard-stearns/the-lost-ECDSA
The lost ecdsa
|
2017-11-29 15:46:22 -08:00 |
|
howard-stearns
|
57ec73bb13
|
spacing
|
2017-11-29 14:37:20 -08:00 |
|
howard-stearns
|
115bc27557
|
back to stable, rather than staging
|
2017-11-29 13:39:58 -08:00 |
|
Dante Ruiz
|
82fb58ed96
|
remove debug statement
|
2017-11-29 10:58:10 -08:00 |
|
Dante Ruiz
|
eba8a6e17b
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose
|
2017-11-29 10:50:37 -08:00 |
|
howard-stearns
|
fb038c17ee
|
for now, point this PR at staging so that it can be tested as built by
jenkins
|
2017-11-29 09:54:34 -08:00 |
|
howard-stearns
|
55589312f1
|
new padding/initialization that matters on linux server
|
2017-11-29 09:53:48 -08:00 |
|
Brad Davis
|
101d6763cc
|
PR feedback
|
2017-11-29 09:11:52 -08:00 |
|
Zach Fox
|
3c892920e3
|
Prevent seeding text from flashing
|
2017-11-28 17:00:15 -08:00 |
|
howard-stearns
|
281b4cfd88
|
Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA
|
2017-11-28 16:59:44 -08:00 |
|
Anthony Thibault
|
16ca1a9ec6
|
Merge pull request #11888 from hyperlogic/bug-fix/vive-no-head
Head tracking bug fix for vive HMD users
|
2017-11-28 16:30:26 -08:00 |
|
Zach Fox
|
5dc8715879
|
Bugfix
|
2017-11-28 16:14:17 -08:00 |
|
Zach Fox
|
489d11d5fd
|
Remove logging
|
2017-11-28 16:01:58 -08:00 |
|
Zach Fox
|
3e5a2addd2
|
Use same logic for Recent Activity
|
2017-11-28 16:00:46 -08:00 |
|
Zach Fox
|
e769d2fbc3
|
Don't refresh Inventory or Recent Activity if data hasn't changed
|
2017-11-28 15:44:42 -08:00 |
|
Bradley Austin Davis
|
e4220aa44e
|
Fixing warnings in android build
|
2017-11-28 14:32:30 -08:00 |
|
David Back
|
1904daf623
|
Merge pull request #11869 from dback2/mirrorissues
prevent spectator cam from updating secondary cam aspect ratio when it's in use by mirrors
|
2017-11-28 14:05:47 -08:00 |
|
David Rowe
|
b9ad15b19e
|
Add missing line3d overlay property getters
|
2017-11-29 11:03:16 +13:00 |
|
Bradley Austin Davis
|
5febbc32f5
|
CMake header cleanup
|
2017-11-28 13:54:46 -08:00 |
|
Bradley Austin Davis
|
a30395e945
|
Tweaking android cmake
|
2017-11-28 13:46:01 -08:00 |
|
David Rowe
|
3956b3b953
|
Fix missing line3d overlay property setter overrides of base class
|
2017-11-29 10:41:51 +13:00 |
|
David Rowe
|
76c934f012
|
Add missing line3d overlay property setters
|
2017-11-29 10:41:21 +13:00 |
|
vladest
|
7283f0127b
|
return back square background for scroll bars
|
2017-11-28 22:21:52 +01:00 |
|
Dante Ruiz
|
9a5f0dea95
|
better solution
|
2017-11-28 13:16:47 -08:00 |
|
Bradley Austin Davis
|
137118c7fd
|
Conditionally rename the APK for Jenkins
|
2017-11-28 12:35:10 -08:00 |
|
vladest
|
94937374c5
|
Make selection not visible under rounded scrollbar
|
2017-11-28 21:33:13 +01:00 |
|