Dean Herbert
92a5fbe948
Merge branch 'master' into star-filtering
2020-01-24 23:28:36 +09:00
smoogipoo
d1684a3c92
Duplicate keywords for better UX
2020-01-24 19:50:16 +09:00
smoogipoo
75d0fd0bab
Rename class
2020-01-24 19:43:23 +09:00
smoogipoo
bb390b4470
Add test
2020-01-24 19:40:20 +09:00
smoogipoo
45a25214ab
Make upper and lower bounds inclusive
2020-01-24 19:39:21 +09:00
Dan Balasescu
9be3d7a161
Merge pull request #7591 from peppy/improve-song-select-uiscale
...
Improve song select display on ultrawide displays (or when UI scale is set low)
2020-01-24 19:14:46 +09:00
smoogipoo
ed66ee3ba6
Allow 10.0 stars to be selectable
2020-01-24 19:12:56 +09:00
smoogipoo
2643b6fca3
Add additional keywods
2020-01-24 19:12:48 +09:00
smoogipoo
62fa619ad4
Display "no limit" for maximum stars
2020-01-24 19:08:14 +09:00
smoogipoo
9e0e7be8d0
Modernise filter implementation
2020-01-24 18:57:17 +09:00
Andrei Zavatski
d9af43da4c
Remove unused usings
2020-01-24 12:55:51 +03:00
Andrei Zavatski
619c2d6d9c
Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation
2020-01-24 12:44:13 +03:00
Andrei Zavatski
59ff3aa800
Fix tests
2020-01-24 12:42:48 +03:00
Andrei Zavatski
e03a085d70
Make overlay elements use OverlayColourProvider
2020-01-24 12:33:34 +03:00
smoogipoo
12cc97ca31
Merge remote-tracking branch 'origin/master' into star-filtering
...
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
# osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
# osu.Game/Screens/Select/FilterControl.cs
# osu.Game/Screens/Select/FilterCriteria.cs
2020-01-24 18:30:52 +09:00
Dan Balasescu
d4306fed85
Merge pull request #7589 from peppy/timeline-maybe
...
Expand editor timeline functionality
2020-01-24 18:24:41 +09:00
Andrei Zavatski
db4cd51d02
Implement OverlayColourProvider
2020-01-24 12:24:35 +03:00
Andrei Zavatski
792436890b
Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation
2020-01-24 12:24:06 +03:00
Dan Balasescu
368587fc06
Merge branch 'master' into timeline-maybe
2020-01-24 18:08:29 +09:00
smoogipoo
027778acc1
Fix slider circles not being selected by default
2020-01-24 17:51:24 +09:00
smoogipoo
811ddb02a4
General refactoring
2020-01-24 17:50:36 +09:00
smoogipoo
6fc6a376ee
Fix incorrect slider selection point
2020-01-24 17:50:09 +09:00
Dean Herbert
56f74e6123
Merge pull request #7596 from peppy/fix-main-menu-input-regression
...
Fix regressed input handling order
2020-01-24 17:32:55 +09:00
smoogipoo
28727bbafd
Fix crash when deselecting via ctrl+click
2020-01-24 17:30:37 +09:00
Dean Herbert
f9e93e2a6a
Fix regressed input handling order
2020-01-24 17:15:05 +09:00
Dean Herbert
159c8087fb
Merge pull request #7492 from EVAST9919/main-menu-song-ticker
...
Implement SongTicker component in main menu
2020-01-24 16:55:35 +09:00
Andrei Zavatski
1d549a0c8a
Remove unused using
2020-01-24 10:46:27 +03:00
Dean Herbert
827f48c29b
Adjust fade
2020-01-24 16:32:39 +09:00
Dean Herbert
7495cfa0a9
Add a test scene
...
You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene You have to have a test scene
2020-01-24 16:32:31 +09:00
Andrei Zavatski
738980e3f7
Refactor OsuTabControl.AccentColour
2020-01-24 10:31:47 +03:00
Dean Herbert
6f44f8a1ad
Ensure only run once when not current screen
2020-01-24 16:27:49 +09:00
Dean Herbert
f9a54dfb1d
Tidy up implementation and show on returning with new song
2020-01-24 16:27:37 +09:00
Andrei Zavatski
34ffbcf2ae
Adjust xmldoc
2020-01-24 10:24:44 +03:00
Andrei Zavatski
2b941a0d52
Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers
2020-01-24 10:18:45 +03:00
Dean Herbert
3f6fa93365
Merge remote-tracking branch 'upstream/master' into main-menu-song-ticker
2020-01-24 16:08:34 +09:00
Dean Herbert
f5a3de3187
Merge remote-tracking branch 'upstream/master' into improve-song-select-uiscale
2020-01-24 15:44:40 +09:00
Dean Herbert
fdde4a6858
Tidy up song select hierarchy to be more readable
2020-01-24 15:44:31 +09:00
Dean Herbert
c0a233e8bb
Align background wedge with carousel
2020-01-24 15:00:10 +09:00
Dean Herbert
b06e4d89b8
Merge pull request #5247 from Aergwyn/collapse-graph-option
...
Add setting to show the song difficulty graph
2020-01-24 14:59:59 +09:00
Dean Herbert
2187dbd0c2
Rename steps in test for clarity
2020-01-24 14:37:37 +09:00
Dean Herbert
997b49f6dc
Change display to always show progress bar, only hiding seeking handle instead
2020-01-24 14:21:22 +09:00
Dean Herbert
da65fff48e
Merge remote-tracking branch 'upstream/master' into collapse-graph-option
2020-01-24 13:55:42 +09:00
Dean Herbert
ea2271c905
Merge branch 'master' into timeline-maybe
2020-01-24 13:39:51 +09:00
Dean Herbert
0e9ab8c76b
Rename test scene to match
2020-01-24 13:39:47 +09:00
Dan Balasescu
9f8e3c21e0
Merge pull request #7594 from peppy/fix-editor-rate-pollution
...
Fix editor rate adjustment polluting global beatmap rate
2020-01-24 13:36:47 +09:00
Dean Herbert
e4702ffe9e
Fix editor rate adjustment polluting global beatmap rate
2020-01-24 13:10:02 +09:00
Dean Herbert
8122bdf2d8
Merge pull request #7317 from EVAST9919/colour-score-meter
...
Implement ColourHitErrorMeter
2020-01-24 12:28:03 +09:00
Dean Herbert
eb5abcab8c
Rename and simplify circle logic
2020-01-24 12:01:40 +09:00
Dean Herbert
851b891285
Fix incorrect insert logic
2020-01-24 12:01:14 +09:00
Dean Herbert
c390348eab
Merge remote-tracking branch 'upstream/master' into colour-score-meter
2020-01-24 11:45:33 +09:00
