1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 10:42:54 +08:00
Commit Graph

26484 Commits

Author SHA1 Message Date
Dan Balasescu
45a5957ad7
Merge branch 'master' into fix-index-transfer 2020-02-20 13:55:48 +09:00
Dean Herbert
a890afcac2
Merge pull request #7875 from smoogipoo/fix-async-playlist-enumeration
Fix music playlist being enumerated asynchronously
2020-02-20 09:06:28 +09:00
Dean Herbert
3457d341b2
Merge branch 'master' into fix-async-playlist-enumeration 2020-02-19 23:38:39 +09:00
Dean Herbert
1938dd04cf Fix indices in beatmap not being transferred to children (and being off by one) 2020-02-19 16:43:17 +09:00
Dan Balasescu
02f3e78b14
Merge pull request #7893 from EVAST9919/rankings-refactor
Various RankingsOverlay fixes
2020-02-19 11:20:04 +09:00
Dan Balasescu
255e01564f
Merge branch 'master' into rankings-refactor 2020-02-19 10:28:13 +09:00
Dan Balasescu
67a568e67f
Merge pull request #7892 from EVAST9919/beatmap-listing-search-section
Implement BeatmapListingSearchSection component
2020-02-19 10:24:18 +09:00
Andrei Zavatski
e9003346d4 Add missing blank line 2020-02-18 21:28:38 +03:00
Andrei Zavatski
5347119a85 Various RankingsOverlay fixes 2020-02-18 21:26:25 +03:00
Andrei Zavatski
37003e11b9 Make fields readonly 2020-02-18 18:04:39 +03:00
Andrei Zavatski
bb22243903 TestScene improvements 2020-02-18 17:47:44 +03:00
Andrei Zavatski
b6423dd92e Small textbox adjustments 2020-02-18 17:40:12 +03:00
Andrei Zavatski
7228900361 Implement BeatmapListingSearchSection component 2020-02-18 17:25:12 +03:00
Dean Herbert
6a5c69e544
Merge pull request #7891 from peppy/fix-playlist-selected-state
Fix playlist items potentially not updating to the correct selected state
2020-02-18 21:38:44 +09:00
Dan Balasescu
a195886e1b
Merge branch 'master' into fix-playlist-selected-state 2020-02-18 21:17:03 +09:00
Dean Herbert
035ddb9284
Merge branch 'master' into fix-async-playlist-enumeration 2020-02-18 19:26:32 +09:00
Dean Herbert
8d7a356469
Merge pull request #7874 from smoogipoo/bindable-list-events
Update with framework-side bindable list changes
2020-02-18 19:24:30 +09:00
Dean Herbert
2f4c252fc0 Fix playlist items potentially not updating to the correct selected state 2020-02-18 19:19:04 +09:00
Dean Herbert
a1bfb18ce0 Fix accessing incorrect items list in event 2020-02-18 19:00:02 +09:00
Dean Herbert
b7849dd91a Update framework 2020-02-18 18:47:21 +09:00
Dean Herbert
b18f9e195e Merge branch 'master' into bindable-list-events 2020-02-18 18:47:06 +09:00
Dan Balasescu
5c3280f5ff
Merge pull request #7820 from EVAST9919/italic-rankings-stuff
Update design of username and country name in RankingsOverlay
2020-02-18 16:30:38 +09:00
Dan Balasescu
9e816e3479
Merge branch 'master' into italic-rankings-stuff 2020-02-18 16:05:18 +09:00
Dean Herbert
e27fcb3203
Merge pull request #7888 from peppy/fix-catch-skin-change
Fix osu!catch fruit exploding/dropping multiple timed is skin is changed during explode animation
2020-02-18 14:07:33 +09:00
Dean Herbert
181774e569
Merge pull request #7889 from smoogipoo/fix-ogg-samples
Fix ogg beatmap/skin samples not loading
2020-02-18 14:07:12 +09:00
Dean Herbert
65320ace47 Merge branch 'master' into fix-catch-skin-change 2020-02-18 13:41:00 +09:00
Dean Herbert
79f3249d37 Fix typo in method 2020-02-18 13:40:50 +09:00
Dean Herbert
c49637dfb7
Merge pull request #7879 from peppy/catch-skin-test-updates
Update osu!catch test scenes to show skinnable versions
2020-02-18 13:31:11 +09:00
Dean Herbert
5aebcfa74c
Merge pull request #7871 from peppy/show-skinnable-sizes
Show skinnable test skin names and autosized component sizes
2020-02-18 13:26:42 +09:00
smoogipoo
ee13632375 Fix ogg beatmap/skin samples not loading 2020-02-18 13:21:55 +09:00
Dean Herbert
b4887f9120 Fix dropping fruit as well (with tidying along the way) 2020-02-18 12:24:22 +09:00
Dean Herbert
c51e5a8c1d Fix osu!catch fruit exploding multiple timed is skin is changed during explode animation 2020-02-18 12:11:30 +09:00
Dan Balasescu
5e5a6acca8
Merge branch 'master' into show-skinnable-sizes 2020-02-18 11:03:22 +09:00
Dan Balasescu
b07799ce2f
Merge pull request #7870 from peppy/move-skinnable-test
Move SkinnableTestScene to main project for consumption by other rulesets
2020-02-18 11:03:12 +09:00
Dan Balasescu
23faace177
Merge pull request #7864 from EVAST9919/new-direct-sort
Implement BeatmapListingSortTabControl component
2020-02-18 10:51:03 +09:00
Dan Balasescu
292520c03a
Merge branch 'master' into move-skinnable-test 2020-02-18 10:20:10 +09:00
Dan Balasescu
75e0668b4e
Merge branch 'master' into new-direct-sort 2020-02-18 10:17:26 +09:00
Dan Balasescu
b41e10e001
Merge pull request #7858 from EVAST9919/new-betmap-search-filter
Implement BeatmapSearchFilter component
2020-02-18 10:17:21 +09:00
Dan Balasescu
cd3e8b65f2
Merge branch 'master' into new-betmap-search-filter 2020-02-18 09:55:36 +09:00
Dan Balasescu
1eea01f3d4
Merge pull request #7885 from peppy/requirements-move
Restructure readme to better define prerequisites that are required for development only
2020-02-18 09:45:57 +09:00
Dan Balasescu
a4891c13e4
Fix typo
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-02-18 09:17:04 +09:00
Andrei Zavatski
316c6b2a94 Simplify RulesetInfo string presentation 2020-02-18 01:17:12 +03:00
Andrei Zavatski
410686c8b9 Use dropdown in BeatmapSearchFilterRow 2020-02-18 01:04:25 +03:00
Andrei Zavatski
ae942388a2 Move OsuTabDropdown to it's own file 2020-02-17 23:56:35 +03:00
Andrei Zavatski
ea99b613c9 Use GridContainer for layout 2020-02-17 23:41:07 +03:00
Andrei Zavatski
c69818925b Merge remote-tracking branch 'refs/remotes/ppy/master' into new-betmap-search-filter 2020-02-17 23:35:12 +03:00
Andrei Zavatski
bce9e7a356 Remove too much nesting for OverlaySortTabControl class 2020-02-17 22:32:58 +03:00
Andrei Zavatski
519548c99f Remove not necessary icon margin changes 2020-02-17 22:06:46 +03:00
Andrei Zavatski
19872d9e24 Simplify test scene 2020-02-17 22:05:10 +03:00
Andrei Zavatski
20dc1a7dcd Merge remote-tracking branch 'refs/remotes/ppy/master' into new-direct-sort 2020-02-17 21:57:19 +03:00