Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-07 08:19:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63707 commits 70 branches 57 tags 1.2 GiB
Commit graph

317 commits

Author SHA1 Message Date
vladest
b947504849 Merge conflicts 2018-01-22 21:42:32 +01:00
Zach Fox
1dde640a40 -_- 2018-01-19 16:06:01 -08:00
vladest
e7a035f954 Fix indent 2018-01-19 23:01:41 +01:00
vladest
c235deb6f0 Merge branch 'master' into move_to_qqc2 2018-01-19 23:01:04 +01:00
Zach Fox
c6429f4f33 Path towards pixel perfection 2018-01-18 17:05:36 -08:00
Zach Fox
d25ef074e1 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-11 12:35:18 -08:00
vladest
b5f3631c21 Merge branch 'master' into move_to_qqc2 2018-01-11 18:54:40 +01:00
Zach Fox
22631065e4 Serious flow state 2018-01-10 15:09:15 -08:00
SamGondelman
c46531296f move key logic from onClicked to onReleased 2018-01-09 18:28:54 -08:00
vladest
09c3f93c74 Switch moved 2017-12-31 15:17:44 +01:00
vladest
c953251cfe TextField moved. Fixed sound on hovering check box 2017-12-30 19:55:52 +01:00
vladest
f5f19ea67f Move RadioButton 2017-12-28 15:53:16 +01:00
vladest
2fbd0a41b1 Move Slider 2017-12-28 15:39:22 +01:00
vladest
5877eeea0b cleanup 2017-12-19 21:35:11 +01:00
vladest
1cf82b7725 SpinBox now works 2017-12-19 21:28:28 +01:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
vladest
b52163cb24 Intitial SpinBox port 2017-12-04 20:54:35 +01:00
vladest
3e118c58a1 Moved RadiButton and Slider 2017-12-04 12:51:57 +01:00
vladest
0f4329be69 Added keyboard support. Cleanup 2017-12-03 22:45:57 +01:00
vladest
f2d7e2f607 Merge branch 'master' into move_to_qqc2 2017-12-02 22:41:19 +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
vladest
ac7a5ebc94 ComboBox: fix closing popup. Started to implement keyboard support 2017-11-30 10:39:01 +01:00
vladest
7283f0127b return back square background for scroll bars 2017-11-28 22:21:52 +01:00
vladest
94937374c5 Make selection not visible under rounded scrollbar 2017-11-28 21:33:13 +01:00
vladest
80eb203008 More precise handle placing. some logging added 2017-11-28 20:20:58 +01:00
vladest
da5090fd49 Implemented more close to QQC2 ideology 2017-11-27 19:43:17 +01:00
vladest
3f0de940a4 Merge branch 'master' into move_to_qqc2 2017-11-26 10:18:44 +01:00
vladest
6136a4cea6 Rounded background 2017-11-25 10:03:56 +01:00
vladest
73a557a8a4 Added Scroll Bar for Trees. Fixed some anchoring issues. Fixed headerless views 2017-11-24 15:58:27 +01:00
vladest
b69b580a68 Use ScrollBar from QQC2 which is supports both mouse and touch events 2017-11-23 23:08:43 +01:00
vladest
4e38b3bace Started working on ComboBox. Add background for scroll bar 2017-11-20 20:35:41 +01:00
Dante Ruiz
76935c1457 fixing merge conflict 2017-11-20 09:51:10 -08:00
vladest
50ed9e2b2a Port CheckBox to QQC2 2017-11-19 22:03:38 +01:00
vladest
6b640bd028 Resolve merge conflicts 2017-11-19 20:52:39 +01:00
Brad Hefta-Gaub
ff8ca6da4c
Merge pull request #11303 from vladest/webbrowser_updates 
Webbrowser updates
 2017-11-19 11:11:09 -08:00
vladest
cfacf3b47d Port web glyph button to QQC2 2017-11-16 21:58:09 +01:00
vladest
b4f6c25f4d Implement QQC1-compatible Action component 2017-11-16 19:04:35 +01:00
SamGondelman
7eb22b372f merge with master 2017-11-15 14:35:30 -08:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
vladest
0e53afc346 Merge branch 'master' into move_to_qqc2 2017-11-15 20:53:14 +01:00
Brad Davis
1167be4102 Reverting tablet API rename, cleaning up duplicated code 2017-11-15 11:52:55 -08:00
vladest
2852375285 Make QueryDioalogs buttons works 2017-11-15 20:32:28 +01:00
vladest
6b732804eb Button as QQC2 2017-11-13 21:15:31 +01:00
vladest
0c13c2b6e2 Remove unused QQC1 imports 2017-11-13 16:37:28 +01:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
beholder
0bc95998c4 a few more adjustments based on discussion with Mukul 2017-11-10 21:20:00 +03:00
beholder
4d11f9a434 increase font pixel size for 'collapse keyboard' to 34px 2017-11-10 21:20:00 +03:00
beholder
db3ed81513 adjust to changed requirements: 
1. The keyboard collapse button is moved to the lower right, replacing the keys there
2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift
3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right
 2017-11-10 21:20:00 +03:00
beholder
a9fe3596cf 4684 Add collapse button on the virtual keyboard 2017-11-10 21:20:00 +03:00
SamGondelman
7d420f5242 isLeftHand, isRightHand, isMouse 2017-11-06 12:29:21 -08:00