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

210 commits

Author SHA1 Message Date
Zach Fox
a9197509d8 Merge pull request #10965 from CainFoool/avatar-scaler 
WL 21422 - Add a scale slider for avatar size
 2017-07-14 10:30:33 -07:00
Cain Kilgore
4f8d958831 Some code cleaning, added comment for reasoning of specifying min and max in the qml 2017-07-14 00:56:42 +01:00
Cain Kilgore
f91a8c0f53 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler 2017-07-13 21:25:39 +01:00
Cain Kilgore
521babb6bd Avatar Scaler - should be PR Ready. 2017-07-13 19:18:51 +01:00
Zach Fox
dbb48cd1aa Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-07 16:03:04 -07:00
Dante Ruiz
258c21838e finished calibration-ui updates 2017-07-06 17:32:40 +01:00
Dante Ruiz
6c15dffb9d added new glyph 2017-07-06 00:45:59 +01:00
Zach Fox
f6583a1b87 Use correct text color for checkboxes 2017-07-05 14:46:59 -07:00
Zach Fox
5d8d2fd83e Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-27 16:47:44 -07:00
Zach Fox
a1dfbc91da Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-22 10:27:52 -07:00
Vladyslav Stelmakhovskyi
30714d5d25 Make background with default color. Fix few warnings 2017-06-22 16:47:40 +02:00
Zach Fox
af3c249ae5 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-21 17:16:10 -07:00
Dante Ruiz
729065749f fixed merge conficts 2017-06-21 16:59:53 +01:00
Zach Pomerantz
1f7e1e8287 add level to active input selection 2017-06-20 17:04:54 -07:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Zach Fox
7a76c9cf7f Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 14:59:23 -07:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Dante Ruiz
067fc9bb98 fixed merge conflict 2017-06-12 16:45:34 +01:00
Zach Fox
d1719fade6 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-07 09:46:04 -07:00
Zach Fox
b50cf6cee6 Quick feedback from Alan 2017-06-06 14:50:01 -07:00
Zach Fox
ca05e3d0b6 Improvements to switch; switch settings persist 2017-06-06 14:17:38 -07:00
Zach Fox
afb7e72b25 Separator; Switch.qml updates; etc 2017-06-06 13:51:07 -07:00
Dante Ruiz
bb7c424d47 get ui working 2017-06-06 21:09:09 +01:00
Zach Fox
557d1c65a3 Another checkpoint; added Switch.qml 2017-06-06 11:59:23 -07:00
Dante Ruiz
19b134b0ac base ui working 2017-06-06 00:32:20 +01:00
Bradley Austin Davis
995fe11c05 Migrate to single QML engine 2017-06-05 15:14:44 -07:00
David Rowe
bc4af86b57 Display spinner in Web controls when they're loading an HTTP page 2017-05-23 15:40:35 +12:00
Lexx
af95741a7e Merge branch 'master' into 21224 2017-04-04 18:24:49 +01:00
David Kelly
4d6886d1f4 cr feedback, plus changed 'People' to 'Connections' in a couple places 2017-04-03 17:03:14 -07:00
David Kelly
4629accc9c style updates 2017-04-03 15:35:53 -07:00
Zach Fox
05c34fb3ee Move some things around so ComboBox works (and layout improves) 2017-03-30 15:19:19 -07:00
Triplelexx
50e35a220b Merge remote-tracking branch 'upstream/master' into 21224 2017-03-30 01:25:27 +01:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master" 
This reverts commit b5ba4a109d.
 2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
Zach Fox
fce2049630 Trivial removal of commented code 2017-03-27 16:45:03 -07:00
humbletim
5d5d947ddb updates per discussion with triplelexx 2017-03-25 04:01:02 -04:00
humbletim
630afb716f consolidate QML->C++ triggering workaround to help compartmentalize the problem for later fixin' 2017-03-25 03:01:35 -04:00
David Rowe
4dd7667fd7 Merge branch 'tablet-ui' into 21209 
# Conflicts:
#	interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-14 08:50:01 +13:00
Zach Fox
beb848373b Update from zfox23/PALv2 branch 2017-03-13 10:15:06 -07:00
Vladyslav Stelmakhovskyi
81bc56f124 Fixed slider groove size calculation. Added LOD Tools to Tablet UI 2017-03-11 14:44:33 +01:00
David Rowe
6a8d0b1064 Refactor some tablet dialog headers 2017-03-11 16:55:22 +13:00
David Rowe
327e3c9973 Don't expand height of higlighted row 2017-03-11 15:46:43 +13:00
David Rowe
25364c0628 Make dropdown scrollbar wider 2017-03-11 12:59:15 +13:00
David Rowe
713c50f2e8 Fix attachments dialog joint dropdown in tablet 2017-03-11 12:52:22 +13:00
David Rowe
189eee01a6 Refactor TabletComboBox.qml into ComboBox.qml 2017-03-11 11:02:09 +13:00
David Rowe
b539c55c02 Scroll and snap to attachment with focus 2017-03-10 14:33:51 +13:00
Dante Ruiz
16d3f22e77 remove uncommented code 2017-02-28 21:39:33 +00:00
Dante Ruiz
f0f2b8c4da fix comboBox and PushOntoStack 2017-02-28 21:30:25 +00:00