Andrew Meadows
9d1fba3a3b
Merge pull request #10821 from ctrlaltdavid/21418
...
Don't execute body of controllers' plugin update methods if not enabled
2017-07-25 08:51:17 -07:00
utkarshgautamnyu
ce5ff23e70
made changes to size of content to dosplay 'choose file' button
2017-07-19 16:15:34 -07:00
David Rowe
07697c5083
Merge branch 'master' into 21418
...
# Conflicts:
# interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
# interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
Removed stray "Vive Controller Picks" configuration item which no longer exists.
2017-07-01 11:19:00 +12:00
David Rowe
be0e1a75a4
User-friendly SDL2 controller name
2017-06-29 10:03:58 +12:00
David Rowe
72d712ac76
Add "enabled" setting for Sixense; bail in update if note enabled
2017-06-26 16:43:06 +12:00
David Rowe
31714675c3
Remove unused Sixense preference and associated methods
2017-06-26 16:14:57 +12:00
David Rowe
361bc1ce03
Add "enabled" setting for SDL2 joystick; bail in update if not enabled
2017-06-26 16:00:18 +12:00
David Rowe
6e266dfbac
Merge branch 'master' into 21396
2017-06-24 09:19:12 +12:00
Brad Davis
d50c448151
Fix heap corruption coming out of running scripts dialog
2017-06-22 19:15:58 -07:00
David Rowe
6ff8aed5e3
Merge branch 'master' into 21396
2017-06-22 23:54:15 +12:00
Brad Hefta-Gaub
88a4f5c576
Merge pull request #10766 from humbletim/sort-running-scripts
...
Sort Running Scripts... list alphabetically
2017-06-21 13:08:47 -07:00
David Rowe
febd0eaf98
Add Leap Motion settings
2017-06-16 10:58:11 +12:00
Zach Pomerantz
bc44e7beaf
bring qml to standard
2017-06-14 10:25:41 -04: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
1a046b4d91
propagate title in Audio dialog qml
2017-06-13 14:42:48 -04:00
Zach Pomerantz
b37a0239b0
up to reverb (needs cherry-picking)
2017-06-12 18:00:52 -04:00
Bradley Austin Davis
1968ecbc8f
Simplify eventBridge mechanism exposing functionality to web pages
2017-06-12 14:46:37 -07:00
Zach Pomerantz
d8815d1dce
prep audio menu
2017-06-05 16:24:00 -04:00
Zach Pomerantz
7cb38d22c3
fix AudioBuffers to work in tablet
2017-06-05 15:06:47 -04:00
Howard Stearns
556dcd69ac
wording change regarding use of exact for floors
2017-06-03 15:48:48 -07:00
Zach Pomerantz
2b40ad4275
mv Audio... to Settings as dialog
2017-05-28 17:42:24 -04:00
Zach Pomerantz
8ca8c3aa69
mv AudioPreferencesDialog to AudioBuffers
2017-05-28 17:40:57 -04:00
Thijs Wenker
962d95ca46
add more precision to attachment scale in attachment dialog
2017-05-23 18:16:08 +02:00
humbletim
34cadfc876
sort RunningScripts by caseless filename
2017-05-04 11:22:30 -04:00
Brad Davis
8e12c1959d
Removing logspam on toggling scripts window
2017-05-03 09:53:32 -07:00
Zach Fox
7505b82189
Merge pull request #10046 from Triplelexx/21224
...
21224 - Allow people to save avatar bookmarks
2017-04-18 11:10:50 -07:00
Vladyslav Stelmakhovskyi
367555acdb
Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set
2017-04-04 16:35:21 +02:00
Vladyslav Stelmakhovskyi
332f9bb283
Fixed TabletMenuStack.qml:56: Error: Cannot assign [undefined] to QString. Fixed keyboardRaised undefined error
2017-04-04 16:22:40 +02:00
Triplelexx
50e35a220b
Merge remote-tracking branch 'upstream/master' into 21224
2017-03-30 01:25:27 +01: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
Vladyslav Stelmakhovskyi
fb0adae0b1
Scripts debug window in Tablet UI
2017-03-21 15:04:38 +01:00
David Rowe
89eb073855
Fix dialog height changing as drop-down value is changed
2017-03-16 19:28:12 +13:00
Vladyslav Stelmakhovskyi
856e15060d
Implemented Domain Connection statistics for Tablet UI
2017-03-15 21:05:13 +01:00
Seth Alves
563d59bda9
Merge pull request #9886 from vladest/tablet-ui-entity-statistics
...
Tablet ui entity statistics
2017-03-15 08:40:52 -08:00
Anthony J. Thibault
3a788d31de
Tablet Running Scripts dialog fixes
...
* The "Currrently Running" section is now visible by default, this includes the "Reload All" and "Remove All" buttons
* The entire dialog is flickable/scrollable. We need to do this because the entire dialog is too tall to fit on the tablet.
* The keyboard now appears when the filter edit text has focus.
The content is scrolled in such away that the focus edit field, and the tree view are above the keyboard.
2017-03-14 15:38:53 -07:00
Vladyslav Stelmakhovskyi
e2a4011b05
Coloring implemented
2017-03-14 19:10:41 +01:00
Vladyslav Stelmakhovskyi
56d4bfe077
Servers stats added. TODO: coloring
2017-03-14 18:38:49 +01:00
Vladyslav Stelmakhovskyi
d9ca8a826d
TabletEntityStatistics.qml refactored. Text now wrapped. TODO: coloring, server stats
2017-03-14 17:02:09 +01:00
Vladyslav Stelmakhovskyi
99c74cec41
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
2017-03-14 15:59:27 +01:00
David Rowe
7504c124e4
Make attachment model browser dialog modal
2017-03-14 13:34:06 +13: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
Vladyslav Stelmakhovskyi
9e9c64021c
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
2017-03-13 19:54:40 +01:00
Vladyslav Stelmakhovskyi
48db6201e5
Basic statistics showed. TODO: servers statistics, coloring, wrapping
2017-03-13 19:48:50 +01:00
Seth Alves
ffd4d1488c
Merge pull request #9866 from vladest/tablet-ui-lodtools
...
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
2017-03-13 08:59:06 -08:00
Vladyslav Stelmakhovskyi
49055cfa5c
Some statistics showed
2017-03-13 16:31:29 +01: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
0fc45799ed
Remove redundant keyboard handling code
2017-03-11 17:04:55 +13:00
David Rowe
ffbb04d3bc
Tablet and desktop versions of attachment model browser dialog
2017-03-11 15:38:21 +13:00
David Rowe
d261e48b9d
Use existing model browser dialog as base content
2017-03-11 14:33:03 +13:00
