Alexander Ivash
|
ee856266c7
|
allow updating existing avatars
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
b4c4ab88f0
|
update logging
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
fdd7644cba
|
use numeric animation for avatar bookmark & page indicator
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
3c78ba0060
|
resolve constant switching between hover/no-hover for page indicator
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
afc09c13b2
|
specify updated shadow params from Mukul
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
99affb22f5
|
show spinner during avatar thumbnails loading
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
567298b59b
|
shadow for wearables indicator (based on mockups)
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
6efcea2c27
|
adjust settings layout according to mockups, update style9
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
b7614684de
|
add check for duplicate names into 'create favorites dialog', style accordingly to mockups
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
a26248e1d2
|
switch to regexp-based method of extracting marketplaceId from url
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
1778e59142
|
blue version of TextStyle3 should only be used for avatar name under favorites
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
a4a1ac5d12
|
The height of the “Take it off” button should be the same as “save” button
“m” and “deg” should align with “Position” and “Rotation” text
The step size in degrees should be 1 degree
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
17acb5e106
|
when the user clicks on it should take the user to the marketplace info page of the avatar
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
9f7fd3faa2
|
add slight animation on hover
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
462d2d5d80
|
fix 'card moves rapidly between hover and non-hover'
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
73ec34825b
|
add proper application icon
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
459a1906a5
|
make highlight border width 4 per request from Mukul
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
bad7890c83
|
extract avatar name from url if empty
|
2018-07-06 21:00:54 +03:00 |
|
Alexander Ivash
|
c765730c5a
|
use avatarUrl instead of avatarThumbnailUrl for comparison, as thumbnail url is calculated
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
3520285079
|
remove debug code
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
e740f494ce
|
styling settings slider, adjust height of edit fields
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
764dc6d156
|
add link to 'external avatar' dialog
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
235b0e9f4d
|
change icon for 'guy-in-circle'
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
91e1714b0e
|
external avatars support
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
856c95b52a
|
move avatarapp-specific images into appropriate subfolder
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
0efb5437e8
|
remove sample avatar thumbnails
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
3ac44376b2
|
bind Settings page to a backend
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
1cc086f9c6
|
cleanup and bugfixing
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
74bfea59cc
|
reply => data
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
bcb373618f
|
navigation to market / my purchases from message dialog links
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
4ce8e29d97
|
navigate to BodyMart / AvatarIsland on 'get avatars' / 'get wearables'
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
3baa1a588f
|
bound 'displayName' to backend, adjust font
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
10f2fe5fe6
|
implement adding bookmark
improve comparision of attachments/wearables
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
18a3901d29
|
update hifi-glyphs.ttf font file
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
fe8bb3c8ea
|
simplify code a bit
explicite store attachments in model
use models for comparison instead JS Objects
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
47ffcf8c42
|
change logic for determining if current avatar is bookmarked & move to model
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
512e72d6d1
|
integrate deleting favorite avatars with backend
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
6ff397e9e0
|
move all messagebox-es into dedicated component
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
d1bf80b50c
|
update UI based on the latest zeplin mockups
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
a88a851f15
|
allow specifying fontSize for uit-controls Button, expose impliciTextWidth to allow adjust-to-content type of sizing
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
5ebe26887d
|
updated text styles based on the latest zeplin specs
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
51c8248463
|
introduce reverting avatar wearables on cancel
|
2018-07-06 21:00:53 +03:00 |
|
Alexander Ivash
|
9914a1d523
|
AdjustWearables: implement deleting/refreshing wearables/wearable
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
b6769f9678
|
avatar selection & wearables adjustments work-on-progress
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
57568d120e
|
attempt to produce thumbnail url from marketId (works only partially), move model population code to model
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
566074c86f
|
use slider from ui-toolkit (per request from Mukul)
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
de81f30407
|
page indicators styling
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
fe2ebe63e8
|
glyph font update to version 1.32
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
4fa72eab6d
|
show real wearables from avatar in combobox
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
245ab7a309
|
explicitely specify 'getMoreAvatars', otherwise QML starts complaining about not-existing property
|
2018-07-06 21:00:52 +03:00 |
|
Dante Ruiz
|
ce3015662e
|
backend integration from Dante
* adding some functionality to avatar bookmarks
* saving work
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
5007c259bb
|
query real avatar favorites (but use fake urls for now)
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
6059ef2904
|
a few updates to adjust wearables & settings pages
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
4bb517f620
|
reimplement 'text input with pencil' based on QQC2 TextField
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
00b54c3f46
|
disable hover effect for selected avatar
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
7723d0f306
|
turn all input controls to uit-based
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
cdc9a325eb
|
use standard radiobuttons with light color scheme
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
d3848ea0c5
|
spelling issue fix
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
34693a8562
|
use correct overlay for avatars in management state
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
3acde99587
|
hide 'get all avatars' while in 'manage' state
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
f8917a835a
|
hide page indicator when only one page
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
1916df6c81
|
specify border radius for 'get more avatars'
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
8a5abb32a7
|
rework avatar selection logic based on changed requirements: selecte avatar always goes to the beginning of the list, selected page auto-switches to the first one
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
bdacd1b792
|
left-to-right layout in favorites grid
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
10e5f03f5e
|
move selected avatar to the beginning of the page
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
e0a8d90141
|
adjust link icon size
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
3d4fb2d368
|
fix spelling error
|
2018-07-06 21:00:52 +03:00 |
|
Alexander Ivash
|
4d2a37aff2
|
show add to favorites on clicking star
|
2018-07-06 21:00:51 +03:00 |
|
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 |
|
David Back
|
e29873ad66
|
prevent right-click strafe with ctrl
|
2018-07-06 10:52:53 -07:00 |
|
David Back
|
473166a6e7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into deselectInput
|
2018-07-06 10:26:57 -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 |
|
David Back
|
4763ccf1ec
|
Merge branch 'master' of https://github.com/highfidelity/hifi into deselectInput
|
2018-07-05 14:53:21 -07: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 |
|
Wayne Chen
|
cfa54c2905
|
adding updated keyboard mapping .jpg to repo
|
2018-07-03 16:28:19 -07:00 |
|
David Back
|
263506174e
|
Ctrl rules for e,q,a,d
|
2018-07-03 15:09:35 -07: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 |
|
amantley
|
7f5f762208
|
fixing merge conflict
|
2018-07-02 15:54:21 -07:00 |
|
amantley
|
ed279e7331
|
added tweaks to the avatar animation json that speed up the transitions to better match the new step detection
|
2018-07-02 15:46:58 -07: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
|
aeddf2ed67
|
Restore resources
|
2018-06-29 15:15:54 -03:00 |
|
Gabriel Calero
|
5186b7d60f
|
Merge branch 'web_overlay_android' of https://github.com/gcalero/hifi into web_overlay_android
|
2018-06-29 15:14:49 -03: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
|
32419127a1
|
Delete hand.svg
|
2018-06-29 14:08:13 -03:00 |
|
Gabriel
|
8af91ca0d4
|
Delete Cairo-SemiBold.ttf
|
2018-06-29 14:07:48 -03: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 |
|
John Conklin II
|
d023d6adef
|
Merge pull request #13321 from danteruiz/tablet-imporvments
Tablet improvements
|
2018-06-14 12:38:20 -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 |
|
Dante Ruiz
|
60e46481b2
|
emissive maps
|
2018-06-13 10:41:02 -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 |
|
Dante Ruiz
|
759c29ab10
|
updating the model
|
2018-06-12 10:53:38 -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 |
|
Dante Ruiz
|
6685fbbfc4
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 13:56:54 -07: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 |
|
Dante Ruiz
|
ba86c9753d
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 09:13:14 -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 |
|
Dante Ruiz
|
5843c24309
|
adding perfectly straight model and adjusting ovelray
|
2018-06-08 13:56:00 -07:00 |
|
howard-stearns
|
3ade31bdf6
|
always show edition
|
2018-06-08 12:57:40 -07:00 |
|
howard-stearns
|
dd0f3c64ec
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-08 12:12:21 -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 |
|
David Back
|
e8aece4c11
|
Merge pull request #13315 from dback2/avatarFeet
Fix default avatar feet
|
2018-06-08 10:00:43 -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 |
|
druiz17
|
8c83bd29a3
|
making requested changes
|
2018-06-07 14:04:39 -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 |
|
David Back
|
a246c9f0d1
|
fix fbx and textures
|
2018-06-06 15:47:29 -07:00 |
|
howard-stearns
|
8185d1b5f5
|
cleanup and consistently don't getNextPage at beginning
|
2018-06-06 15:24:54 -07:00 |
|
Dante Ruiz
|
d57d087752
|
update tablet model again
|
2018-06-06 12:48:20 -07:00 |
|
David Back
|
c294dd4ac7
|
fix path and name
|
2018-06-06 12:32:47 -07:00 |
|
David Back
|
afd4b5a8ab
|
update default avatar to fix non-flat feet
|
2018-06-06 11:48:04 -07:00 |
|
Dante Ruiz
|
25305ab57f
|
updating texture
|
2018-06-06 11:31:39 -07:00 |
|
Dante Ruiz
|
995cfeb3c5
|
cleaning code
|
2018-06-06 10:42:12 -07:00 |
|
Dante Ruiz
|
59c50b7f26
|
remove highlight overlay in favor of materialEntity
|
2018-06-06 08:38:58 -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 |
|
Dante Ruiz
|
b275bbe5a7
|
saving changes
|
2018-06-05 15:44:17 -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 |
|