Preston Bezos
34e9acc0b5
better fix for the toolbar remnant
2019-06-12 14:31:43 -07:00
Zach Fox
fade8f9c04
It works!
2019-06-12 12:47:48 -07:00
Zach Fox
51c2cc793a
Tinkering with toolbar visibility signal - not quite working
2019-06-12 10:26:32 -07:00
Preston Bezos
a0753f6393
removed ctrl+b and ctrl+n as shortcuts
2019-06-07 15:41:44 -07:00
Brad Davis
a6f23f48d6
Merge branch 'feature/quest_custom_plugins' into feature/quest
2019-02-12 09:53:12 -08:00
danteruiz
d71fb2a100
moved missed QtWebEngine references to +webengines
2019-02-07 14:57:25 -08:00
Brad Davis
b1e4e17f47
Santa Cruz
2019-01-28 15:52:36 -08:00
Wayne Chen
4e6f162e01
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-07 10:12:46 -08:00
Alexander Ivash
fe43c733f8
FB19400 during shutdown -- TypeError: Cannot read property 'buttons'
2018-11-17 22:56:59 +05:30
Wayne Chen
c85b840db0
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-14 14:47:56 -08:00
Seth Alves
1593c1185a
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
2018-11-14 12:29:09 -08:00
John Conklin II
79e67ad45f
Merge pull request #14238 from ElderOrb/FB19400
...
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
2018-11-13 15:07:21 -08:00
Zach Fox
1ab1cb95d8
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-08 09:57:10 -08:00
Wayne Chen
51586625e7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-07 12:02:38 -08:00
Zach Fox
e80468e423
Remove URL logging from JS and QML
2018-11-06 15:09:24 -08:00
Alexander Ivash
27bb8a0de7
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
Wayne Chen
f62c8ae87a
overlay HMD implementation
2018-10-31 15:26:49 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles"
2018-10-23 10:58:28 -07:00
Alexander Ivash
5d8a253785
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
...
note: change also resolve a lot of other shutdown errors from QML (related to null parent)
2018-10-19 18:57:07 +03:00
Alexander Ivash
740123b853
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-10-18 21:05:20 +03:00
vladest
60d53359bb
Fix Toolbar vertical position
2018-04-19 11:39:58 +02:00
vladest
7b21b36d3c
Disable menu button in Toolbar mode
2018-04-18 22:19:54 +02:00
vladest
cacb9359c2
Toolbar at bottom
2018-04-18 20:57:28 +02:00
vladest
096b56395e
Fix crash on startup
2018-03-27 18:22:56 +02:00
vladest
c235deb6f0
Merge branch 'master' into move_to_qqc2
2018-01-19 23:01:04 +01:00
David Rowe
1fa31d3c10
Remove old ToolWindow code
2018-01-13 10:27:43 +13:00
vladest
2fbd0a41b1
Move Slider
2017-12-28 15:39:22 +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
dbd6ec0dff
Port Edit.qml to QQC2 as well as some tablet preferences compinents
2017-11-17 20:46:21 +01:00
Brad Davis
1167be4102
Reverting tablet API rename, cleaning up duplicated code
2017-11-15 11:52:55 -08:00
Brad Davis
d71fd151c5
Fixing button model exposure
2017-11-13 16:45:27 -08:00
vladest
55eed37698
Start working on autocompletion
2017-08-29 20:47:09 +02:00
Bradley Austin Davis
995fe11c05
Migrate to single QML engine
2017-06-05 15:14:44 -07:00
Anthony J. Thibault
332dfa098f
Fix for disappearing toolbar after reload all scripts
2017-03-29 14:10:26 -07:00
Anthony J. Thibault
8ccca86dee
Settings for Tablet Becomes Toolbar
2017-02-16 15:57:36 -08:00
Dante Ruiz
784548bb25
removed hud
2017-01-12 22:07:20 +00:00
howard-stearns
47aa1e4f8e
add pal to defaultScripts
2017-01-05 12:23:17 -08:00
David Rowe
1f3045ad30
Merge branch 'master' into 21089
...
Conflicts:
interface/src/Application.cpp
2016-12-13 14:05:24 +13:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
David Rowe
84795439ea
Display Clara.io download information
2016-11-10 16:29:48 +13:00
David Rowe
d33ac21aaa
Merge branch 'master' into 21089
2016-11-08 08:23:10 +13:00
David Rowe
d1e54a9217
Fix Clara download failing if move mouse after initiating download
2016-11-04 10:49:16 +13:00
howard-stearns
3a072b5bf9
tell desktop about preference changes
2016-11-03 12:17:28 -07:00
howard-stearns
f3d4821579
constrain toolbar based on setting. (ui for settings to come.)
2016-11-03 10:39:53 -07:00
howard-stearns
90ebbb79c1
centered toolbar
2016-11-02 15:37:53 -07:00
David Rowe
667a777695
Use Clara.io API for FBX downloads
2016-11-01 23:43:15 +13:00
David Rowe
e0ef24a460
Set auto adding for Clara downloads
2016-10-30 15:35:20 +13:00
David Rowe
12747d26e0
Add parameter that enables automatically adding download model to world
2016-10-30 13:58:17 +13:00
Howard Stearns
0eee6f8abd
Merge pull request #8844 from huffman/fix/hud-position
...
Update default system toolbar position
2016-10-20 16:07:20 -07:00
Ryan Huffman
3ad039cadc
Update default system toolbar position
2016-10-18 13:57:03 -07:00