Alexander Ivash
|
bd48ff9ee6
|
remove link glyph rotation
|
2018-07-06 21:00:51 +03:00 |
|
Alexander Ivash
|
c54b2c8f26
|
adjust avatar thumbnail image radius
|
2018-07-06 21:00:51 +03:00 |
|
Alexander Ivash
|
bd719286d8
|
move highlight under the green wearable indicator, use internal highlight of ShadowImage instead of extra Rectangle
|
2018-07-06 21:00:51 +03:00 |
|
Alexander Ivash
|
8a8f599583
|
rounded avatar images
|
2018-07-06 21:00:51 +03:00 |
|
Alexander Ivash
|
1ddfc87396
|
wip on avatarapp
|
2018-07-06 21:00:51 +03: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 |
|
Sam
|
58f004352a
|
Added per pixel GPU stats
|
2018-07-04 17:15:12 +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 |
|
Gabriel Calero
|
a6d093d8c9
|
Merge remote-tracking branch 'upstream/master' into web_overlay_android
|
2018-06-29 15:09:32 -03:00 |
|
vladest
|
0f1312ab9b
|
Merge branch 'master' into address_dialog_focus_fix
|
2018-06-29 19:41:26 +02:00 |
|
Gabriel Calero
|
2112af4400
|
Apply desing to android web entities and overlays
|
2018-06-28 17:46:33 -03: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 |
|
Gabriel Calero
|
48cdd6d64c
|
Fix web entities for android
|
2018-06-26 12:30:03 -03: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 |
|
Gabriel Calero
|
0a70e844bf
|
Merge remote-tracking branch 'upstream/master' into web_overlay_android
|
2018-06-25 17:41:51 -03:00 |
|
howard-stearns
|
43cba68cd2
|
test wearables for wear before gifting and wearing
|
2018-06-25 13:40:45 -07:00 |
|
Gabriel Calero
|
fedc0a9e61
|
Support web3d overlays in android
|
2018-06-25 16:37:03 -03: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 |
|
Dante Ruiz
|
eb01b50e6f
|
making code review changes
|
2018-06-13 17:58:10 -07:00 |
|
Zach Fox
|
6b59b5b53c
|
MS15501: Fix keyboard in Create -> Model in HMD
|
2018-06-13 13:23:43 -07:00 |
|
vladest
|
010309ba31
|
Add focus change logging. Switch off all focus hacks
|
2018-06-13 14:51:29 +02:00 |
|
vladest
|
75ce8e56df
|
Merge branch 'master' into address_dialog_focus_fix
|
2018-06-13 11:47:29 +02:00 |
|
howard-stearns
|
05d3f92867
|
drillDownToPlace and iStacked based on server data.
|
2018-06-12 13:18:44 -07:00 |
|
vladest
|
11129eddde
|
Remove extra textfield fro address ber input
|
2018-06-12 18:48:41 +02:00 |
|
David Rowe
|
537665c22a
|
Fix spinbox not validating the second time an invalid value is entered
|
2018-06-12 17:35:53 +12:00 |
|
Stephen Birarda
|
10e34000aa
|
Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains
Domain-unreachable message remaining on slow connects
|
2018-06-11 10:46:55 -07:00 |
|
David Rowe
|
11178d80f7
|
Fix avatar attachment spinbox min/max values
|
2018-06-11 16:24:45 +12:00 |
|
David Rowe
|
0161015746
|
Fix setting avatar attachment joint
|
2018-06-11 15:31:42 +12:00 |
|
howard-stearns
|
020d622302
|
don't depend on matching handlers with overlapping requests
|
2018-06-09 17:34:49 -07:00 |
|
howard-stearns
|
421edbfa1e
|
PSFListModel isa ListModel instead of hasa
|
2018-06-09 16:03:45 -07:00 |
|
howard-stearns
|
d68415c47c
|
code feedback
|
2018-06-08 16:47:06 -07:00 |
|
howard-stearns
|
f0d486a6a5
|
remove the unused client-side stuff from model
|
2018-06-08 15:48:39 -07:00 |
|
howard-stearns
|
d9daa3495a
|
remove comments / dead code
|
2018-06-08 15:36:10 -07:00 |
|
howard-stearns
|
36a0adf553
|
strip snapshot stacking code - we'll do it on server or not at all
|
2018-06-08 14:24:24 -07:00 |
|
howard-stearns
|
3ade31bdf6
|
always show edition
|
2018-06-08 12:57:40 -07:00 |
|
Zach Fox
|
9f0864944c
|
Fix Friending in Connections tab - READ FIXME
|
2018-06-08 11:37:02 -07:00 |
|
Dante Ruiz
|
5d570f030f
|
fixing calibration
|
2018-06-08 11:18:52 -07:00 |
|
howard-stearns
|
21ed081eae
|
proper name for updated type filter of inventory endpoint
|
2018-06-08 09:52:11 -07:00 |
|
howard-stearns
|
64e466ee7d
|
snapshot stacks
|
2018-06-07 21:10:40 -07:00 |
|
howard-stearns
|
595a0d8733
|
restore lost code
|
2018-06-07 19:24:05 -07:00 |
|
howard-stearns
|
348d5fc359
|
inventory text filter
|
2018-06-07 17:01:48 -07:00 |
|
howard-stearns
|
2761688d39
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 16:14:57 -07:00 |
|
howard-stearns
|
8b08505116
|
using filter/sort endpoint parameters
|
2018-06-07 16:14:18 -07:00 |
|
Zach Fox
|
f9b6e3e2ac
|
Merge pull request #13300 from zfox23/MS15582_PurchasesButtonClicks
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
|
2018-06-07 15:10:00 -07:00 |
|
howard-stearns
|
890c97e7cb
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 12:24:27 -07:00 |
|
David Back
|
ae5d056ca0
|
Merge pull request #13292 from dback2/fileChooser
File Dialog Fixes
|
2018-06-07 09:38:56 -07:00 |
|
howard-stearns
|
8185d1b5f5
|
cleanup and consistently don't getNextPage at beginning
|
2018-06-06 15:24:54 -07:00 |
|
howard-stearns
|
335aeaeb38
|
purchases cleanup, wearables, and edition numbers when multiples seen.
|
2018-06-05 17:06:08 -07:00 |
|
howard-stearns
|
6aa551b35c
|
Don't getNextPage when at beginning (even if that is also the end).
|
2018-06-05 17:04:29 -07:00 |
|
howard-stearns
|
ce41b83bad
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-05 15:30:04 -07:00 |
|
Zach Fox
|
2932ce177d
|
Fix MS15500: Ensure Connection usernames show up in PAL
|
2018-06-05 10:57:25 -07:00 |
|
howard-stearns
|
f72f8c762b
|
goto client-side filtering (preliminary)
|
2018-06-04 16:52:20 -07:00 |
|
Zach Fox
|
c5ef5cfccb
|
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
|
2018-06-04 16:13:18 -07:00 |
|
Dante Ruiz
|
f5e2a6834b
|
fixing some issues
|
2018-06-04 16:09:31 -07:00 |
|
David Back
|
6b7d9586d1
|
apply fixes to other file dialogs and fix tablet dialog buttons
|
2018-06-04 15:56:10 -07:00 |
|
Dante Ruiz
|
48c0b7379a
|
fix vive configuration page
|
2018-06-04 15:16:11 -07:00 |
|
howard-stearns
|
5a1b56d573
|
checkpoint with goto feeds working (but without filtering)
|
2018-06-04 13:11:06 -07:00 |
|
howard-stearns
|
e40fc20cb6
|
fix some bugs that had been introduced by various out-of-team prs.
|
2018-06-04 13:00:08 -07:00 |
|
Alexander Ivash
|
9bf3759e8d
|
allow control spinbox with mouse wheel
|
2018-06-04 21:27:00 +03:00 |
|
Alexander Ivash
|
826d853edf
|
fix blinking 'up' indicator on pressing 'down'
|
2018-06-04 21:26:59 +03:00 |
|
Alexander Ivash
|
56466e61d3
|
fix binding loops disallowing to increment/decrement spinbox value under certain conditions
|
2018-06-04 21:26:57 +03:00 |
|
Alexander Ivash
|
8d213efa75
|
introduce test 'controls gallery' application for controls testing
|
2018-06-04 21:26:56 +03:00 |
|
David Back
|
074892591d
|
fix auto-selecting subdir and not showing Choose when no row selected
|
2018-06-04 11:13:03 -07:00 |
|
howard-stearns
|
29b09d64e6
|
checkpoint with PAL working.
|
2018-06-01 13:33:45 -07:00 |
|
Simon Walton
|
7d1d7f7bcd
|
Closing the open tablet dialog - try harder
|
2018-05-31 18:31:53 -07:00 |
|
howard-stearns
|
e8e12eef8f
|
checkpoint
|
2018-05-31 14:42:52 -07:00 |
|
howard-stearns
|
b0d3729d4d
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-05-30 17:09:57 -07:00 |
|
howard-stearns
|
bdd38cef7a
|
checkpoint
|
2018-05-30 17:09:13 -07:00 |
|
Wayne Chen
|
81eea5d8d1
|
Merge pull request #13213 from wayne-chen/filebrowser-case-14515
Adding showHidden properties to file dialogs to allow for showing hidden files/folders
|
2018-05-30 10:43:58 -07:00 |
|
howard-stearns
|
a84829392f
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-05-29 16:14:22 -07:00 |
|
howard-stearns
|
17be460adf
|
checkpoint
|
2018-05-25 16:37:06 -07:00 |
|
howard-stearns
|
d30d84f1bd
|
checkpoint that has two ways to do filtering
|
2018-05-25 15:30:27 -07:00 |
|
John Conklin II
|
eeed3ae82d
|
Merge pull request #13211 from druiz17/login-fix
Fixing Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password"
|
2018-05-25 11:33:29 -07:00 |
|
howard-stearns
|
235971f8bf
|
checkpoint
|
2018-05-24 15:23:45 -07:00 |
|
Wayne Chen
|
345138f4ff
|
Changing showHidden property to be always true
|
2018-05-23 10:30:08 -07:00 |
|
Wayne Chen
|
e3414c320e
|
changing property to alias to reflect folderListModel
|
2018-05-22 11:03:31 -07:00 |
|
Wayne Chen
|
1774b401c8
|
allowing file dialogs to show hidden files/folders via showHidden property
|
2018-05-22 10:24:04 -07:00 |
|
Alexander Ivash
|
d659696b60
|
FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links
|
2018-05-21 13:29:41 -07:00 |
|
howard-stearns
|
d385a255c4
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-05-18 16:53:08 -07:00 |
|
Dante Ruiz
|
3b59af3ed7
|
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
|
2018-05-18 16:42:31 -07:00 |
|
Dante Ruiz
|
60dd7e49ab
|
making requested changes
|
2018-05-18 16:41:39 -07:00 |
|
Brad Davis
|
ae07036f20
|
Add ideal resource texture memory stat
|
2018-05-18 09:23:53 -07:00 |
|
vladest
|
95cd9476c3
|
Fixed modality in Desktop
|
2018-05-17 16:11:28 +02:00 |
|
Dante Ruiz
|
2a6204ca8d
|
remove option for mouse sensivtity
|
2018-05-16 15:47:55 -07:00 |
|
Zach Fox
|
bc590f556a
|
Get first page
|
2018-05-16 14:43:43 -07:00 |
|
Zach Fox
|
585957409d
|
Merge pull request #13141 from zfox23/spectatorCameraImprovements
Spectator Camera V2
|
2018-05-16 13:38:07 -07:00 |
|
Zach Fox
|
97bb014734
|
Almost working for Purchases!
|
2018-05-16 13:20:23 -07:00 |
|
Zach Fox
|
0021af8714
|
Merge in in-progress changes from old commerce_paginationAndFiltering branch
|
2018-05-16 12:28:52 -07:00 |
|
Zach Fox
|
154d70866f
|
It's working
|
2018-05-16 12:17:17 -07:00 |
|
Zach Fox
|
79f8232c14
|
Merge branch 'master' of github.com:highfidelity/hifi into PSFListModel
|
2018-05-16 11:11:24 -07:00 |
|
Dante Ruiz
|
37c51a7246
|
Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates
|
2018-05-16 10:41:40 -07:00 |
|
Dante Ruiz
|
e676348c4f
|
fixing some menu reog bugs
|
2018-05-16 10:40:28 -07:00 |
|
vladest
|
72838f6d34
|
Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons
|
2018-05-16 17:06:31 +02:00 |
|
vladest
|
5127cb0ea6
|
Merge branch 'master' into menu-updates
|
2018-05-16 14:37:00 +02:00 |
|
John Conklin II
|
a6cda2166a
|
Merge pull request #13158 from highfidelity/stable
RC67.1 stable mergeback to master
|
2018-05-15 14:01:06 -07:00 |
|
vladest
|
7ea6181520
|
Merge branch 'master' into menu-updates
|
2018-05-15 21:54:45 +02:00 |
|
Zach Fox
|
ccab2dd641
|
Starting the work
|
2018-05-15 11:48:33 -07:00 |
|
vladest
|
e2a8ee2a4c
|
Fixed About date format. Increased space between logo and build info
|
2018-05-15 20:02:29 +02:00 |
|
vladest
|
a6ef459723
|
Open browser within Interface
|
2018-05-15 16:07:32 +02:00 |
|
vladest
|
fee3cc0aca
|
Implemented backend for About dialog
|
2018-05-15 15:49:20 +02:00 |
|
vladest
|
58f04121b7
|
Correct link colors
|
2018-05-15 06:22:10 +02:00 |
|
Dante Ruiz
|
82422edb59
|
fixinig the controller settings page and have menu option on by default
|
2018-05-14 18:51:39 -07:00 |
|
Zach Fox
|
e607c68bea
|
Thanks Mukul!
|
2018-05-14 16:48:40 -07:00 |
|
vladest
|
2a3004079e
|
About UI
|
2018-05-14 23:22:06 +02:00 |
|
Zach Fox
|
83cae54601
|
Show 'invalidated' label for valid = false
|
2018-05-14 13:34:20 -07:00 |
|
Zach Fox
|
2a1c2ba7b1
|
PurchasedItem logic
|
2018-05-14 09:54:05 -07:00 |
|
Zach Fox
|
81ebb681bb
|
Show invalidated items in My Purchases
|
2018-05-14 09:35:34 -07:00 |
|
vladest
|
f8ebe7e669
|
remoed no more used LOD dialogs. Fixed Slider properties min and max settings
|
2018-05-12 16:01:43 +02:00 |
|
vladest
|
0a67fc3b36
|
Merge conflicts
|
2018-05-12 11:24:35 +02:00 |
|
Dante Ruiz
|
4eba727849
|
fix qml crash on start up
|
2018-05-11 10:47:41 -07:00 |
|
Dante Ruiz
|
9e9852d67b
|
Merge pull request #12989 from Triplelexx/21774_file_browser
Worklist #21774: Fix Windows.browseAssets() bugs
|
2018-05-11 08:50:17 -07:00 |
|
Anthony J. Thibault
|
0ac12fa317
|
Bug fix for Vive Tracker Calibration Settings
This issue was inadvertently introduced by the name change of the Vive display plugin.
|
2018-05-10 17:56:54 -07:00 |
|
Triplelexx
|
a061e84ad7
|
remove unused commented code
|
2018-05-10 19:40:02 +01:00 |
|
vladest
|
62aa2df836
|
Merge branch 'master' into menu-updates
|
2018-05-10 10:36:38 +02:00 |
|
Zach Fox
|
22c26c348d
|
MS14937: Fix Replace button for content sets during Checkout
|
2018-05-08 16:37:11 -07:00 |
|
Zach Fox
|
540f200b99
|
MS14937: Fix Replace button for content sets during Checkout
|
2018-05-08 16:34:28 -07:00 |
|
Stephen Birarda
|
4165ab3667
|
Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master
|
2018-05-08 14:08:21 -07:00 |
|
John Conklin II
|
bec015db5c
|
Merge pull request #13116 from ElderOrb/FB14818
Fix for 'Login page for steam is blank'
|
2018-05-07 11:26:39 -07:00 |
|
John Conklin II
|
286bed25bd
|
Merge pull request #13106 from zfox23/RC67_MS14758
RC67: MS14758: Fix avatar reset when gifting worn avatar
|
2018-05-07 10:10:41 -07:00 |
|
Alexander Ivash
|
b4cfea2fbc
|
FB14818 Login page for steam is blank
|
2018-05-06 17:17:06 +03:00 |
|
vladest
|
c7ab1f3dbf
|
Merge branch 'master' into menu-updates
|
2018-05-05 20:48:40 +02:00 |
|
vladest
|
5a5bfcfe02
|
Merge branch 'master' into menu-updates
|
2018-05-05 07:11:39 +02:00 |
|
Zach Fox
|
4ebed7605c
|
MS14758: Fix avatar reset when gifting worn avatar
|
2018-05-04 16:04:05 -07:00 |
|
John Conklin II
|
b314d496ec
|
Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode
MS14699: Prevent Wallet passcode from being sticky in certain cases
|
2018-05-04 15:22:41 -07:00 |
|
Zach Fox
|
53fe0bc616
|
MS14699: Prevent Wallet passcode from being sticky in certain cases
|
2018-05-04 14:08:21 -07:00 |
|
Zach Fox
|
e48d39ec38
|
MS14758: Fix avatar reset when gifting worn avatar
|
2018-05-04 10:10:48 -07:00 |
|
Gabriel Calero
|
c15ef56d90
|
Merge remote-tracking branch 'upstream/master' into android_goto_splash
|
2018-05-02 14:38:10 -03:00 |
|
vladest
|
53350b471b
|
Merge branch 'master' into menu-updates
|
2018-05-02 19:02:11 +02:00 |
|
vladest
|
ea66e04ab8
|
Removed unwanted code
|
2018-05-02 18:58:40 +02:00 |
|
vladest
|
aef62d09c7
|
Merge branch 'master' into menu-updates
|
2018-05-01 21:47:46 +02:00 |
|
John Conklin II
|
250aa3ab43
|
Merge pull request #13027 from jherico/fix/web_crash2
Some fixes for QML surfaces
|
2018-05-01 12:39:46 -07:00 |
|
vladest
|
617b49fe14
|
Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode
|
2018-05-01 21:22:48 +02:00 |
|
Zach Fox
|
9b80c500e3
|
Merge pull request #13039 from zfox23/sideloadAppJson
Enable sideloading .app.json Apps from local disk
|
2018-04-30 11:14:24 -07:00 |
|
John Conklin II
|
b6afaccdf3
|
Merge pull request #13041 from RebeccaStankus/newModelDialog-Fix
New model dialog fix
|
2018-04-30 10:08:54 -07:00 |
|
vladest
|
a16b2c0d20
|
Restore preferences dialogs buttons spacing
|
2018-04-29 12:38:37 +02:00 |
|
vladest
|
be22f49c32
|
Merge branch 'master' into menu-updates
|
2018-04-28 20:22:28 +02:00 |
|
Brad Davis
|
8e42bb8c87
|
Restore the stop functionality for a browser view when it's being destroyed
|
2018-04-27 17:35:38 -07:00 |
|
RebeccaStankus
|
269a7f0e15
|
Changed maximum line count for warning message
|
2018-04-27 14:34:08 -07:00 |
|
Zach Fox
|
dbd7d7e2b4
|
Small cleanup
|
2018-04-27 14:19:58 -07:00 |
|
Zach Fox
|
ea716f2a1e
|
Enable sideloading .app.json Apps from local disk
|
2018-04-27 14:08:53 -07:00 |
|
Zach Fox
|
c0fe504713
|
Merge pull request #13030 from zfox23/finalize_14295_14559
Finalize work on MS14295 and MS14559
|
2018-04-27 13:49:02 -07:00 |
|
Zach Fox
|
684d2b08ba
|
Finalize work on MS14295 and MS14559
|
2018-04-27 12:03:54 -07:00 |
|
Howard Stearns
|
f8ad36afd0
|
Merge pull request #13028 from zfox23/updateCommerceFor67
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
|
2018-04-27 11:55:40 -07:00 |
|
Zach Fox
|
bbc15cdc63
|
Finalize work on MS14295 and MS14559
|
2018-04-27 11:04:46 -07:00 |
|
Zach Fox
|
c163ae63b8
|
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
|
2018-04-27 10:28:59 -07:00 |
|
Zach Fox
|
0f36fb113d
|
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
|
2018-04-27 10:20:55 -07:00 |
|
Brad Hefta-Gaub
|
e4f5eb9cca
|
Merge pull request #13020 from zfox23/MS14295_GiftsUIFixes
MS14295: Fix lingering Gifts UI Bugs
|
2018-04-27 07:30:14 -07:00 |
|
Zach Fox
|
e3b14bf478
|
MS14295: Fix lingering Gifts UI Bugs
|
2018-04-26 15:57:37 -07:00 |
|
Zach Fox
|
fc324f67bd
|
MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC
|
2018-04-26 15:09:53 -07:00 |
|
vladest
|
3296ae0db8
|
Merge branch 'master' into menu-updates
|
2018-04-26 22:21:40 +02:00 |
|
Triplelexx
|
bd6b6c9423
|
fix content within 128 columns
|
2018-04-25 12:57:46 +01:00 |
|
Triplelexx
|
bd72350287
|
describe magic number
|
2018-04-25 12:47:55 +01:00 |
|
Triplelexx
|
99ad51189c
|
fix browse asset filtering
added support for list of filters using formatting consistent with other implementations, e.g: (*.png *.wav)
|
2018-04-24 23:03:56 +01:00 |
|
John Conklin II
|
236e75b6c6
|
Merge pull request #12903 from druiz17/add-more-hmd-data
Get the correct device name connect to OpenVr
|
2018-04-24 13:29:41 -07:00 |
|
vladest
|
60115752ad
|
Fixed saving after editing
|
2018-04-21 20:18:24 +02:00 |
|
vladest
|
2b716f051c
|
Merge branch 'master' into menu-updates
|
2018-04-20 19:34:15 +02:00 |
|
vladest
|
0e28e41107
|
Fix various issues with SpinBox-es and Sliders
|
2018-04-20 19:15:29 +02:00 |
|
vladest
|
b8577bd791
|
Merge branch 'master' into fix_spinbox
|
2018-04-20 18:09:16 +02:00 |
|
Gabriel Calero
|
adfbaac18f
|
Merge remote-tracking branch 'upstream/master' into android_goto_splash
|
2018-04-19 19:40:00 -03:00 |
|