1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 19:27:26 +08:00
Commit Graph

20385 Commits

Author SHA1 Message Date
David Zhao
3e4ebd3c7a
Merge branch 'master' into shift-delete 2019-07-23 13:25:12 +09:00
David Zhao
e628e44d8e
update comment 2019-07-23 13:25:03 +09:00
Dean Herbert
452b2c8027
Separate GlowingSpriteText from LeaderboardScore into it's own… (#5418)
Separate GlowingSpriteText from LeaderboardScore into it's own class

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-23 12:08:30 +09:00
Dean Herbert
cf1ec5692a
Simplify line move logic in ToolbarRulesetSelector (#5433)
Simplify line move logic in ToolbarRulesetSelector
2019-07-23 11:41:20 +09:00
Dean Herbert
9e34582c17
Merge branch 'master' into separate-glowing-text-from-leaderboardscore 2019-07-23 11:31:47 +09:00
Andrei Zavatski
ffcc1c62af simplify moving condition 2019-07-22 23:22:39 +03:00
iiSaLMaN
32e9547ce9 Trim whitespace 2019-07-22 23:16:54 +03:00
iiSaLMaN
081355e3d1 Use IHasText and simplify properties 2019-07-22 23:12:09 +03:00
Dean Herbert
3fde4efaee
Update MostPlayedBeatmaps section in line with the web version (#4879)
Update MostPlayedBeatmaps section in line with the web version

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-23 01:16:14 +09:00
Andrei Zavatski
ee6fed5b33 Use fixed height 2019-07-22 18:17:49 +03:00
Dean Herbert
2f111e6cf4 Fix incorrect corner radius 2019-07-22 23:57:26 +09:00
Dean Herbert
4dc9309a7e
Merge branch 'master' into underscored_link 2019-07-22 23:46:57 +09:00
Dean Herbert
0330c3e14e
Retrieve the actual favourite value for beatmaps (#5426)
Retrieve the actual favourite value for beatmaps

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-22 22:32:49 +09:00
Dean Herbert
cdf75b4098 Public before private 2019-07-22 22:14:09 +09:00
Andrei Zavatski
075ca3d8ea CI fix 2019-07-22 14:47:35 +03:00
Andrei Zavatski
3e95cb9145 Use bindable and disable button 2019-07-22 14:35:18 +03:00
Andrei Zavatski
2a17ed5e18 Merge remote-tracking branch 'refs/remotes/ppy/master' into favourite-beatmap 2019-07-22 14:32:37 +03:00
Dan Balasescu
7083a1d01c
Merge pull request #5412 from peppy/fix-triangles-crash
Fix TriangleDrawNode crash when required triangles is zero
2019-07-22 20:03:56 +09:00
Dean Herbert
7d3939a838
Merge branch 'master' into fix-triangles-crash 2019-07-22 19:17:51 +09:00
Dean Herbert
07a0df7c4f Fix bracket precedence 2019-07-22 18:29:04 +09:00
Dean Herbert
a05a6bbb77
Set "Title" as the default grouping/sorting modes in song select (#5396)
Set "Title" as the default grouping/sorting modes in song select
2019-07-22 18:06:23 +09:00
Dean Herbert
c78f65f0ee
Centralise osu! circle radius specification (#5422)
Centralise osu! circle radius specification

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-22 16:08:50 +09:00
Dan Balasescu
e7bab14e18
Merge branch 'master' into centralise-radius-specification 2019-07-22 15:58:11 +09:00
Dean Herbert
6d889c8a37 Revert unintended change 2019-07-22 15:43:27 +09:00
Dean Herbert
3994cb4472
Fix WorkingBeatmap disposal potentially null-refing (#5423)
Fix WorkingBeatmap disposal potentially null-refing
2019-07-22 15:16:24 +09:00
smoogipoo
a631aac664 Fix workingbeatmap's disposal potentially null-refing 2019-07-22 15:01:01 +09:00
Dean Herbert
e50b70d615 Centralise osu! circle radius specification 2019-07-22 14:40:02 +09:00
Andrei Zavatski
de8ac9a428 Simple implementation 2019-07-21 21:41:07 +03:00
iiSaLMaN
affd0b2878 Fix build issues 2019-07-21 12:34:52 +03:00
iiSaLMaN
57fc5cbda8 Fix CI issues 2019-07-21 12:29:06 +03:00
iiSaLMaN
87fb22352c glowingText -> blurredText 2019-07-21 12:28:55 +03:00
iiSaLMaN
9d7f6abbdd Remove unnecessary field 2019-07-21 12:18:31 +03:00
iiSaLMaN
ed0ef90613 Separate glowing sprite text into it's own class 2019-07-21 12:14:55 +03:00
Dean Herbert
38d39be678
Check if the current leaderboard scope requires API (#5415)
Check if the current leaderboard scope requires API

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-21 15:48:00 +09:00
Dean Herbert
e76b3e2b40 User property instead of method 2019-07-21 10:42:40 +09:00
iiSaLMaN
842417cf42 Check if selected scope requires API 2019-07-21 03:07:27 +03:00
Dean Herbert
2ff7979d29
Fix loading animation is no longer present for scores in Beatma… (#5401)
Fix loading animation is no longer present for scores in BeatmapSetOverlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-20 23:10:29 +09:00
Dean Herbert
4c592a5e65 Fix TriangleDrawNode crash when aimcount is zero 2019-07-20 22:52:07 +09:00
Dean Herbert
2a94b68ecb Simplify logic 2019-07-20 22:50:17 +09:00
Dean Herbert
2df279f902
Merge branch 'master' into loading-fix 2019-07-20 22:46:09 +09:00
Dean Herbert
3b27398f22
Merge pull request #5403 from peppy/triangle-memory-reudction
Reduce Triangle drawnode overhead by ~90%
2019-07-20 00:09:05 +09:00
Dean Herbert
5696d79423 Use TriangleBatch 2019-07-19 23:47:48 +09:00
Dean Herbert
eebfdd8865 Update framework 2019-07-19 23:43:25 +09:00
Dean Herbert
f08d722083 Merge remote-tracking branch 'upstream/master' into triangle-memory-reudction 2019-07-19 23:43:17 +09:00
Dean Herbert
9da565da5f
Use limit value for some requests (#5365)
Use limit value for some requests

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-19 16:14:54 +09:00
smoogipoo
066bee3535 Simplify offset calculation 2019-07-19 16:02:33 +09:00
smoogipoo
2a66cf36d5 Merge remote-tracking branch 'Joehuu/master' into requests-limit-usage 2019-07-19 15:33:18 +09:00
smoogipoo
99ab77b926 Add PaginatedWebRequest to handle request pagination 2019-07-19 15:33:09 +09:00
Dean Herbert
024f136d82 Reduce buffer count by one 2019-07-19 14:24:11 +09:00
Dean Herbert
95f36c36c4 Late-initialize vertex batch for safety 2019-07-19 01:52:53 +09:00