Andrei Zavatski
d20c48d151
Resolve possible UserVotes issues
2020-01-30 00:53:05 +03:00
Andrei Zavatski
d1ead83c6c
Merge remote-tracking branch 'refs/remotes/ppy/master' into no-comments-placeholder
2020-01-30 00:48:43 +03:00
Dean Herbert
7f59576f13
Fix percentage-formatted displays containing a space ( #7664 )
...
Fix percentage-formatted displays containing a space
2020-01-29 20:37:32 +09:00
Dean Herbert
9f0f09a844
Add a reverse setting for Winding mods ( #7222 )
...
Add a reverse setting for Winding mods
2020-01-29 20:29:32 +09:00
Andrei Zavatski
de6a71ffb7
Merge remote-tracking branch 'refs/remotes/ppy/master' into no-comments-placeholder
2020-01-29 14:06:52 +03:00
smoogipoo
76af8bea5d
Fix percentage-formatted displays containing a space
2020-01-29 19:51:24 +09:00
Dan Balasescu
30da9981d6
Merge branch 'master' into profile-scores-update-new
2020-01-29 19:40:44 +09:00
smoogipoo
7f946047f9
Adjust styling to closer match osu-web
2020-01-29 19:25:31 +09:00
smoogipoo
d908bc2693
Remove unnecessary extra spritetext
2020-01-29 18:44:30 +09:00
Dan Balasescu
db3e360229
Merge branch 'master' into fix-carousel-missing-import
2020-01-29 18:06:27 +09:00
Dan Balasescu
77b1bf3ee2
Merge pull request #7648 from peppy/keyboard-composition-tools
...
Allow selecting composition tools using 1-4 keys
2020-01-29 17:29:11 +09:00
Dean Herbert
77c06b1c6e
Fix beatmap carousel potentially missing beatmap imports
2020-01-29 17:09:12 +09:00
Dan Balasescu
37c7fe30fa
Merge branch 'master' into keyboard-composition-tools
2020-01-29 16:52:47 +09:00
Dan Balasescu
66b8d38d42
Merge branch 'master' into selection-composition-conformity
2020-01-29 16:52:45 +09:00
Dan Balasescu
73f94c0be3
Merge pull request #7643 from peppy/distance-snap-grid-correct-colouring
...
Distance snap grid correct colouring
2020-01-29 16:52:34 +09:00
Dan Balasescu
37036b855b
Merge pull request #7654 from peppy/reset-test-storage
...
Add a method to recycle test storage between runs
2020-01-29 16:37:37 +09:00
Dan Balasescu
e553a9b9e0
Merge branch 'master' into distance-snap-grid-correct-colouring
2020-01-29 16:09:35 +09:00
Dan Balasescu
63501c188a
Merge pull request #7644 from peppy/standardise-zoom-levels
...
Standardise editor timeline zoom across maps of all lengths
2020-01-29 16:04:25 +09:00
Dan Balasescu
9954b67bda
Merge branch 'master' into reset-test-storage
2020-01-29 15:52:52 +09:00
Dean Herbert
849e453c35
Merge remote-tracking branch 'upstream/master' into reset-test-storage
2020-01-29 15:49:05 +09:00
smoogipoo
ec015d750b
Merge remote-tracking branch 'origin/master' into reverse-winding
2020-01-29 15:38:06 +09:00
smoogipoo
17294b1b09
Make wind down max value 200%
2020-01-29 15:34:36 +09:00
Dan Balasescu
018c005c71
Merge branch 'master' into distance-snap-grid-correct-colouring
2020-01-29 15:33:07 +09:00
Dan Balasescu
0d6fd0a54a
Merge branch 'master' into standardise-zoom-levels
2020-01-29 15:32:57 +09:00
Dan Balasescu
65ac412ff8
Merge branch 'master' into fix-beat-snap
2020-01-29 15:32:27 +09:00
smoogipoo
391681b7af
Separate calculation to follow other examples
2020-01-29 15:16:48 +09:00
Dean Herbert
7d05840ee0
Merge branch 'master' into select-tool
2020-01-29 15:04:22 +09:00
Dan Balasescu
ea2ee53ee3
Merge branch 'master' into timline-beat-lines
2020-01-29 14:44:07 +09:00
smoogipoo
9a47428bfd
Remove out of date comment
2020-01-29 14:40:42 +09:00
Dan Balasescu
abe0041b65
Merge branch 'master' into select-tool
2020-01-29 14:29:12 +09:00
Dan Balasescu
4d43833db4
Merge branch 'master' into timline-beat-lines
2020-01-29 14:12:00 +09:00
Dan Balasescu
b10143fdf2
Merge branch 'master' into fix-key-count-mod-affect
2020-01-29 14:11:59 +09:00
Andrei Zavatski
5fcda01346
Cleanup pass
2020-01-29 06:58:53 +03:00
Dean Herbert
aa597c1934
Copy documentation across to SettingsSlider
2020-01-29 12:55:07 +09:00
Dean Herbert
f21142ae50
Merge remote-tracking branch 'upstream/master' into slider-tooltip
2020-01-29 12:50:44 +09:00
Dean Herbert
cfc4eaff59
Fix display being incorrect when MaxValue is not 1
2020-01-29 12:50:21 +09:00
Andrei Zavatski
dc10e58b4f
Add tests for CommentsPage
2020-01-29 06:44:39 +03:00
Andrei Zavatski
e7964023ae
Implement CommentsPage class
2020-01-29 06:22:08 +03:00
Andrei Zavatski
c5e0c77bca
Refactor NoCommentsPlaceholder
2020-01-29 06:08:11 +03:00
Andrei Zavatski
b947e89a6b
Add placeholder for no comments case in CommentsContainer
2020-01-28 16:53:22 +03:00
Dean Herbert
0e0c730095
Add a method to recycle test storage between runs
2020-01-28 19:44:32 +09:00
unknown
894642d588
add xmldoc and formatting
2020-01-28 18:04:00 +08:00
Dean Herbert
12ff51f686
Fix key count being incorrectly adjusted by hard/easy mods
2020-01-28 17:21:50 +09:00
Andrei Zavatski
5a2fd18bdd
Allow better async support for CommentsContainer
2020-01-28 10:21:27 +03:00
Andrei Zavatski
4e884fc6f4
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-recolour
2020-01-28 10:15:10 +03:00
Dean Herbert
41f55dba91
Merge pull request #7637 from EVAST9919/overlay-header-background
...
Refactor background creation in OverlayHeader
2020-01-28 16:06:31 +09:00
Dean Herbert
40379a5e22
Use foreach
2020-01-28 16:04:13 +09:00
Dean Herbert
dbb89cfde7
Merge remote-tracking branch 'upstream/master' into timline-beat-lines
2020-01-28 16:03:50 +09:00
Dean Herbert
f48c7db827
Use Drawable.Empty instead of container
2020-01-28 15:41:09 +09:00
Dean Herbert
8e2159e4eb
Ensure selection tool correctly matches selection state
...
- When a selection is made (via the timeline) the selection tool should become the select tool.
- When the selection tool is changed to anything *but* the select tool, the selection should be cleared.
2020-01-28 15:13:12 +09:00