Thijs Wenker
|
eea95161ab
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows
|
2018-07-06 20:06:50 +02:00 |
|
Thijs Wenker
|
eed1f66e71
|
Merge branch 'feat/create/interactive-window' into feat/create/native-windows
|
2018-07-06 20:01:48 +02:00 |
|
John Conklin II
|
7aaf17a3c8
|
Merge pull request #13496 from thoys/feat/interactive-window
InteractiveWindow scripting API
|
2018-07-06 10:58:12 -07:00 |
|
Seth Alves
|
c0e1e9c23a
|
Merge pull request #13353 from vladest/address_dialog_focus_fix
Remove extra textfield fro address bar input
|
2018-07-06 09:00:00 -07:00 |
|
Thijs Wenker
|
1b63dfa20a
|
- OSX fixes (right camera after coming from native window, disappearing content)
- Fix show() to show the window after it was minimized
|
2018-07-06 17:50:48 +02:00 |
|
Thijs Wenker
|
2b8372c959
|
Merge branch 'feat/create/interactive-window' into feat/create/native-windows
|
2018-07-05 17:59:11 +02:00 |
|
Thijs Wenker
|
3a32472b0b
|
added test / more docs
|
2018-07-04 02:49:20 +02:00 |
|
Thijs Wenker
|
c583c07d9c
|
Merge branch 'feat/create/interactive-window' into feat/create/native-windows
# Conflicts:
# scripts/system/libraries/entityList.js
# scripts/system/particle_explorer/particleExplorerTool.js
|
2018-07-03 18:47:38 +02:00 |
|
Thijs Wenker
|
3f6793b462
|
- center default native window
- close button destroys window by default unless Desktop.CLOSE_BUTTON_HIDES flag is set
|
2018-07-03 18:42:39 +02:00 |
|
Thijs Wenker
|
d886bc2d9c
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/create/interactive-window
|
2018-07-03 18:19:48 +02:00 |
|
Thijs Wenker
|
3a6ab3562f
|
Merge branch 'feat/create/interactive-window' into feat/create/native-windows
|
2018-07-03 16:51:24 +02:00 |
|
Thijs Wenker
|
7390983721
|
introduce scriptable presentationMode instead of automatic mode switching windows
|
2018-07-03 16:49:49 +02:00 |
|
Dante Ruiz
|
603ab87c47
|
fix configuration page
|
2018-07-02 14:38:16 -07:00 |
|
Dante Ruiz
|
e2757e80ea
|
Merge pull request #13512 from wayne-chen/passwordFieldLoginFix-case-14261
Hitting Enter Key in Password Field To Login
|
2018-07-02 12:55:44 -07:00 |
|
John Conklin II
|
844bd3f48d
|
Merge pull request #13518 from zfox23/MS16390_buyFail
Fix MS16390: Correctly update UI when Buy endpoint fails
|
2018-07-02 12:36:19 -07:00 |
|
John Conklin II
|
58a9bdc86f
|
Merge pull request #13511 from r3tk0n/mouse_menu2
Fix SpinnerSliderPreference Class, Update Mouse Sensitivity Menu
|
2018-07-02 12:33:35 -07:00 |
|
Zach Fox
|
c95b359aa7
|
Fix MS16390: Correctly update UI when Buy endpoint fails
|
2018-07-02 10:23:53 -07:00 |
|
Wayne Chen
|
99a64f31d7
|
Adding Enter/Return for sign up dialog in pw field
|
2018-06-29 16:21:03 -07:00 |
|
Wayne Chen
|
2c32dc1cf5
|
adding enter key event for logging in in pw textfield
|
2018-06-29 16:13:02 -07:00 |
|
r3tk0n
|
9b59dc5809
|
Changed SpinnerSliderPreference.qml to general-case UI element as originally intended,
updated PreferencesDialog.cpp's Avatar Scale slider to hard-coded bounds [0.25, 4.0].
|
2018-06-29 15:22:57 -07:00 |
|
vladest
|
27906bcdc8
|
Turn on focus hacks again
|
2018-06-29 21:16:14 +02:00 |
|
vladest
|
0f1312ab9b
|
Merge branch 'master' into address_dialog_focus_fix
|
2018-06-29 19:41:26 +02:00 |
|
Thijs Wenker
|
8ade709c1f
|
Merge branch 'feat/create/interactive-window' into feat/create/native-windows
|
2018-06-28 19:14:46 +02:00 |
|
Thijs Wenker
|
7fe9365a76
|
create app - native windows
|
2018-06-28 19:12:03 +02:00 |
|
Thijs Wenker
|
5029767493
|
InteractiveWindow scripting API
|
2018-06-28 19:04:08 +02:00 |
|
John Conklin II
|
040978830a
|
Merge pull request #13413 from Atlante45/fix/audio-starve
Fix audio device sometimes being on the wrong thread
|
2018-06-28 09:59:00 -07:00 |
|
r3tk0n
|
f36ba49fbd
|
Update TabletGeneralPreferences.qml
Fixed a typo
|
2018-06-27 16:30:38 -07:00 |
|
r3tk0n
|
d6684e5ef7
|
Re-add mouse sensitivity option to tablet.
|
2018-06-27 16:23:40 -07:00 |
|
r3tk0n
|
c80ab0d237
|
Re-added mouse sensitivity settings to General Preferences dialog.
|
2018-06-27 16:10:07 -07:00 |
|
Dante Ruiz
|
a906fbaf56
|
fix login links
|
2018-06-26 10:20:22 -07:00 |
|
Howard Stearns
|
5fe7b874a4
|
Merge pull request #13455 from howard-stearns/test-wearables
16089: test wearables for wear before gifting and wearing
|
2018-06-25 16:44:53 -07:00 |
|
Zach Fox
|
3ceb9ddee9
|
Merge pull request #13444 from zfox23/MS16074_16076_banklinks
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
|
2018-06-25 13:47:08 -07:00 |
|
howard-stearns
|
43cba68cd2
|
test wearables for wear before gifting and wearing
|
2018-06-25 13:40:45 -07:00 |
|
Zach Fox
|
6fce6431a3
|
Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home
|
2018-06-22 16:09:49 -07:00 |
|
Zach Fox
|
25f22326a8
|
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
|
2018-06-22 15:43:16 -07:00 |
|
Zach Fox
|
fa3fae09b2
|
Merge pull request #13416 from zfox23/MS15154_removeButtonFocusState
Fix MS15154: Remove focused button color
|
2018-06-19 13:10:11 -07:00 |
|
Zach Fox
|
a4d47a0248
|
Merge pull request #13408 from zfox23/MS16012_emptyHistoryFix
Fix MS16012: Correct the criteria used to determine empty txn history
|
2018-06-19 12:01:51 -07:00 |
|
Zach Fox
|
97e4d2eb46
|
Merge pull request #13404 from zfox23/MS15545_fixWebBackButton
Fix MS15545: Fix PAL/GoTo WebView's Back Button
|
2018-06-19 11:25:27 -07:00 |
|
Zach Fox
|
d056fa6c93
|
Fix MS15154: Remove focused button color
|
2018-06-19 09:56:24 -07:00 |
|
Atlante45
|
4a4c0d132e
|
Make stereo interface async
|
2018-06-18 17:26:29 -07:00 |
|
Zach Fox
|
ad1da3e225
|
Fix MS16012: Correct the criteria used to determine empty txn history
|
2018-06-18 14:26:46 -07:00 |
|
Zach Fox
|
f307f1d97a
|
Fix MS15545: Fix PAL/GoTo WebView's Back Button
|
2018-06-18 10:19:00 -07:00 |
|
vladest
|
41dad71634
|
Merge branch 'master' into address_dialog_focus_fix
|
2018-06-17 12:27:03 +02:00 |
|
howard-stearns
|
97fa22b69b
|
fix concurrency drillDown
|
2018-06-15 16:57:21 -07:00 |
|
John Conklin II
|
2655dd77b6
|
Merge pull request #13368 from zfox23/MS15501_CreateModelKeyboard
MS15501: Fix keyboard in Create -> Model in HMD
|
2018-06-15 15:34:02 -07:00 |
|
Anthony Thibault
|
f2d6d0ee56
|
Merge pull request #13351 from ctrlaltdavid/21891
Fix Avatar > Attachments joint and spinboxes
|
2018-06-14 11:31:04 -07:00 |
|
John Conklin II
|
7057e00583
|
Merge pull request #13298 from danteruiz/fix-vive-configuration-page
Controller Confguration Page fixes
|
2018-06-14 11:07:26 -07:00 |
|
vladest
|
aa23728bca
|
Merge branch 'master' into address_dialog_focus_fix
|
2018-06-14 19:26:43 +02:00 |
|
John Conklin II
|
b43d5287e2
|
Merge pull request #13286 from ElderOrb/spinbox-bugs
Introduce test 'controls gallery' application for controls testing & few spinbox fixes
|
2018-06-14 10:21:17 -07:00 |
|
Dante Ruiz
|
dc28e8f03f
|
fixing error
|
2018-06-13 18:24:06 -07:00 |
|