1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 16:07:25 +08:00
Commit Graph

299 Commits

Author SHA1 Message Date
Dean Herbert
5aaa2511eb
Merge pull request #4374 from Joehuu/status-direct-list
Add beatmap status on direct list panels
2019-03-05 18:22:56 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
smoogipoo
d01ec59acb Fix sizings 2019-03-05 17:14:49 +09:00
smoogipoo
76aca738a9 Revert "Use same size labels from song select"
This reverts commit 7077e405ab.
2019-03-05 16:02:07 +09:00
Joehu
7077e405ab Use same size labels from song select 2019-03-01 15:48:58 -08:00
Joehu
e5bc927354 Add beatmap status on direct list panels 2019-02-28 19:38:05 -08:00
Jamie Taylor
8cf83e2f4a
Fix the check of beatmapset local availability 2019-02-28 16:14:50 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
0faf83f7d1 Fix nullref in tests 2019-02-27 23:30:13 +09:00
Dean Herbert
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
a5f1f9830b Fix potential schedule race case and regression in enum setting 2019-02-14 16:21:01 +09:00
Roman Kapustin
a289cb7c6a Handle beatmapset removal in DownloadTrackingComposite 2019-02-13 22:11:46 +03:00
Roman Kapustin
99046f16e8 Revert "Update direct download button state on beatmap import and removal"
This reverts commit 11234d3c60.
2019-02-13 22:04:49 +03:00
Roman Kapustin
11234d3c60 Update direct download button state on beatmap import and removal 2019-02-12 21:20:49 +03:00
Dean Herbert
c7cf3ef1cd Update licence headers 2019-01-31 19:17:42 +09:00
Dean Herbert
7c6512118e Fix importing progress bar not displaying 2019-01-31 19:15:17 +09:00
Dean Herbert
b89694a969 Fix "importing" state display 2019-01-31 19:09:04 +09:00
Dean Herbert
041e3bf823 Handle unbinding better 2019-01-31 19:08:54 +09:00
Dean Herbert
b69a19f810 Attach progress immediately 2019-01-31 19:08:45 +09:00
Dean Herbert
7f2fdac50e Update signatures 2019-01-31 18:47:30 +09:00
Dean Herbert
327a34f12a Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
2019-01-31 18:45:09 +09:00
Dean Herbert
a208874e74 Fix incorrect handling of download failures 2019-01-28 11:59:25 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
f489718e25 Fix non-matching filename 2019-01-18 14:35:32 +09:00
Dean Herbert
21e79f51b1 Remove necessity of BeatmapSetDownloader 2019-01-18 14:28:06 +09:00
Dean Herbert
b62630ecd2 Centralise download tracking logic so we can show it in multiple scenarios 2019-01-18 11:28:10 +09:00
smoogipoo
a8ad7d4670 Add silent import parameter 2018-11-30 18:27:13 +09:00
smoogipoo
a88b69ec43 Notify of existing imports 2018-11-28 20:19:35 +09:00
Dean Herbert
7755242a43
Merge branch 'master' into osuTK 2018-11-21 18:53:11 +09:00
smoogipoo
5ad96afea0 Fix crashes when importing/deleting from model managers 2018-11-20 18:09:23 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
ekrctb
b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
37f3035437 Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-20 18:39:48 +09:00
smoogipoo
7b8094d731 Move text size/padding out of constructor 2018-09-20 12:53:45 +09:00
smoogipoo
28f31540c4 Apply changes in-line with framework localisation changes 2018-09-19 14:07:46 +09:00
Dean Herbert
6c150c9ed7 Remove unnecessary override 2018-09-08 03:21:42 +09:00
Joehu
77455e4463 Fix direct list play button disappearing after preview/switch 2018-09-04 19:44:49 -07:00
smoogipoo
2a5b9f79ff Indent 2018-08-08 15:49:27 +09:00
Dean Herbert
6d6fea47ab Reduce animations of osu!direct list mode
The panels' content was flying around and felt really shocking. This fixes elements in place to provide a better experience.
2018-08-05 14:36:09 +09:00
Dean Herbert
95cca046fb Merge branch 'master' into open-downloaded-beatmas 2018-07-25 12:38:49 +02:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
5fe634a3b6 Click download button to load beatmap 2018-07-18 13:18:50 +09:00
Dean Herbert
4f1b7c8065
Merge branch 'master' into reduce-panel-width 2018-07-17 04:20:40 +09:00
Dean Herbert
730eb2daa2 Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions 2018-07-14 03:47:56 +09:00
Dean Herbert
fc3aff6689 Fix initial colour 2018-07-13 21:19:10 +09:00
Dean Herbert
ee2c7c50ad Tidy up button hierarchy 2018-07-13 16:28:18 +09:00
Dean Herbert
0676919496 Fix incorrect corner radius 2018-07-13 14:56:44 +09:00
naoey
6ea6a10def Reduce size of download button in list view to fit hover effect 2018-07-03 20:26:49 +05:30
naoey
2a0b1f3615 Update direct panel download button for new design
- Add a download failed event to BeatmapManager
- Make DownloadButton aware of all 3 possible download states
- Change button appearance based on each state
2018-07-03 20:18:09 +05:30
Dean Herbert
9fce4eaccf
Merge branch 'master' into di-backed-ruleset 2018-06-29 19:33:12 +09:00
Dean Herbert
b0a1b25983 Privatise game ruleset and access via DI
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
Dean Herbert
51600dd0ae Improve PlayButton's loading 2018-06-22 14:27:36 +09:00
Dean Herbert
4b2b1f51f9 Apply some code review 2018-06-22 12:33:30 +09:00
smoogipoo
40ed3fdd05 Fix possible incorrect order of events due to threaded load 2018-06-21 18:45:32 +09:00
smoogipoo
b2066c5d73 Rework preview tracks to reduce usage complexities 2018-06-21 18:40:27 +09:00
Dean Herbert
c74c059044
Merge branch 'master' into multiple_previews_different_overlays 2018-06-18 05:05:27 +09:00
Joehu
069d939e29 Remove "from" prefix from sources on direct panels 2018-06-14 21:53:01 -07:00
Roman Kapustin
8702a70524 Resolve merge conflicts in DirectOverlay 2018-06-08 21:03:16 +03:00
Roman Kapustin
1fdbd20471 Nullref quickfix in PlayButton 2018-06-07 14:50:21 +03:00
Roman Kapustin
3033294df1 Stop Preview on BeatmapSet change 2018-06-07 14:30:11 +03:00
DrabWeb
188272e15d Replace OnAlreadyDownloading with returning a bool from Download. 2018-06-06 03:18:42 -03:00
DrabWeb
61e1358410 Add OnAlreadyDownloading animations. 2018-06-04 21:07:17 -03:00
DrabWeb
c524289b24 Update DirectListPanel to properly handle hiding DownloadButton. 2018-06-04 21:01:15 -03:00
DrabWeb
01c5060bcf Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables 2018-06-04 20:30:54 -03:00
DrabWeb
9377ffb784 Update BeatmapSetOverlay to use BeatmapSetDownloader. 2018-06-04 20:27:34 -03:00
DrabWeb
698a42f145 BeatmapSetDownloadButton -> BeatmapSetDownloader
Allows it to integrate better with existing buttons, like HeaderButton.
2018-06-04 20:12:43 -03:00
DrabWeb
416384956d Use a protected Downloaded bindable instead of abstract methods. 2018-06-04 06:47:39 -03:00
DrabWeb
b332c22fe5 Update DirectPanel to use BeatmapSetDownloadButton. 2018-06-04 06:29:35 -03:00
Roman Kapustin
5bb6757cbd Remove unused previewTrackManager parameter 2018-06-02 13:03:17 +03:00
Roman Kapustin
70120aa14c Remove unused previewTrackManager variable 2018-06-02 12:28:16 +03:00
Roman Kapustin
330ce19041 Make PreviewTrack a component and use LoadComponentAsync 2018-06-01 23:36:25 +03:00
Roman Kapustin
88ac427ba6 PreviewTrack.Owner 2018-06-01 21:06:37 +03:00
Dean Herbert
9b7741b353 Avoid using update for fading logic 2018-06-01 22:19:11 +09:00
Dean Herbert
ae6f603d16
Merge branch 'master' into match-panel-with-web 2018-06-01 21:31:18 +09:00
Joehu
1095669a55 Match panel with web 2018-05-31 08:09:19 -07:00
DrabWeb
bdfb5752cd Update existing drawables to use UpdateableBeatmapSetCover. 2018-05-28 19:31:20 -03:00
Roman Kapustin
a24589f583 Cleanup external PlayButton.Playing usage 2018-05-25 22:35:15 +03:00
Roman Kapustin
498244a308 Introduce PreviewTrack class 2018-05-25 00:37:53 +03:00
UselessToucan
d6076eb591
Merge branch 'master' into multiple_previews_different_overlays 2018-05-24 20:51:54 +03:00
Roman Kapustin
95dd2125ee Load PlayButton.Preview asynchronously 2018-05-09 16:22:52 +03:00
Roman Kapustin
c492f62eda Use PreviewTrackManager in the PlayButton 2018-05-09 14:52:46 +03:00
Roman Kapustin
33e2b91ccc Decouple FilterControl.Ruleset from the game-wide ruleset bindable 2018-05-03 22:59:49 +03:00
TocoToucan
ca574f2345 Disable RulesetToggleButton whenever the ruleset can't be changed 2018-04-29 18:36:19 +03:00
TocoToucan
eda9f83836 Add activeBeatmapPreview variable for tracking beatmap preview playback 2018-04-29 15:32:22 +03:00
Dean Herbert
1be2571d33 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:08:45 +09:00
smoogipoo
ffbe6f2e37 Merge remote-tracking branch 'origin/master' into fix-rank-status
# Conflicts:
#	osu.Game/Beatmaps/RankStatus.cs
#	osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
#	osu.Game/Overlays/Direct/FilterControl.cs
#	osu.Game/Overlays/DirectOverlay.cs
2018-04-18 14:16:58 +09:00
Dean Herbert
fd54ae3c87 Simplify logic 2018-04-15 16:12:42 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
TocoToucan
9acea6eab0 Order beatmap difficulty icons correctly 2018-04-12 19:33:30 +03:00