1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-24 06:33:21 +08:00
Commit Graph

4345 Commits

Author SHA1 Message Date
Dean Herbert
138b83c9ea
Merge branch 'master' into customized-mods 2019-12-10 19:13:32 +09:00
Dean Herbert
efc3b7fc9f
Merge branch 'master' into fix-settings-bindable-logic 2019-12-10 18:30:27 +09:00
Dan Balasescu
bd6a08a21b
Merge branch 'master' into apply-to-track 2019-12-10 16:15:24 +09:00
Huo Yaoyuan
c3518a2b94 Enum constraint for enum dropdown. 2019-12-09 17:45:26 +08:00
Dean Herbert
c39d2f006c Merge branch 'master' into fix-settings-bindable-logic 2019-12-09 17:55:17 +09:00
Dean Herbert
eb074b7058 Allow mods to apply to track, not clock 2019-12-09 17:44:45 +09:00
Dean Herbert
003eef8595
Fix mod buttons being selected when drag scrolling overlay (#7099)
Fix mod buttons being selected when drag scrolling overlay
2019-12-09 12:24:48 +09:00
Dean Herbert
ad2ecf4dff
Fix key config search not clearing after pressing escape (#7105)
Fix key config search not clearing after pressing escape
2019-12-09 12:22:30 +09:00
Joehu
9974fff5cc Make sub panel back button inherit osu button 2019-12-08 10:51:25 -08:00
Joehu
5cf35869e9 Fix key config search not clearing after pressing escape 2019-12-08 10:40:39 -08:00
Lucas A
88ec0c1486 Add missing async content loading logic to NewsOverlay 2019-12-08 18:49:58 +01:00
Dean Herbert
c2a40c574d Split out if statement for readability 2019-12-09 02:13:47 +09:00
Joehu
e394b28799 Remove redundant transform 2019-12-08 09:12:32 -08:00
Joehu
463b6c0030 Remove whitespace 2019-12-08 09:04:34 -08:00
Joehu
8956768fe0 Fix mod buttons being selected when drag scrolling overlay 2019-12-08 08:55:45 -08:00
Andrei Zavatski
929be3e9e7 Highlight own score in BeatmapSetOverlay 2019-12-08 12:34:07 +03:00
Dean Herbert
347373a3ba Fix test failures 2019-12-06 19:04:55 +09:00
Dean Herbert
46d055604a Customize -> Customise 2019-12-06 18:59:45 +09:00
Dean Herbert
cf0413663d Merge branch 'settings-source' into customized-mods 2019-12-06 18:05:39 +09:00
Dean Herbert
901eb5d996 Fix incorrect trigger logic 2019-12-06 18:03:50 +09:00
Dean Herbert
9de032e35f Fix SettingsItem bindable logic 2019-12-06 17:10:06 +09:00
Dean Herbert
a5d5099868 Use SettingsSource for mod cusomisation 2019-12-06 17:09:48 +09:00
Dean Herbert
af35df4077 Add multiple mod testing and update test code style 2019-12-06 15:42:11 +09:00
Dean Herbert
170954bc6e Merge remote-tracking branch 'upstream/master' into customized-mods 2019-12-06 15:31:20 +09:00
Andrei Zavatski
33737d3d89 Move tests to TestSceneRankingsOverlay due to refactoring 2019-12-05 09:53:25 +03:00
Dean Herbert
6e9157d59c Standardise request/response handling 2019-12-05 14:29:48 +09:00
Dean Herbert
cd473f207a Use child set, not Clear/Add 2019-12-05 14:09:33 +09:00
Dean Herbert
5f9b9631ef Move scope/country restrictions into RankingsOverlay 2019-12-05 14:07:39 +09:00
Andrei Zavatski
f8f144b6c0 Remove pointless ScheduledDelegate 2019-12-05 05:20:22 +03:00
Andrei Zavatski
48732e49b9 Improve async logic 2019-12-05 04:20:13 +03:00
Andrei Zavatski
0560a6637c Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor 2019-12-05 04:11:45 +03:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info 2019-12-04 11:47:27 +09:00
Dan Balasescu
242e1b0b2e
Merge branch 'master' into add-missing-long-running 2019-12-04 11:29:25 +09:00
Dean Herbert
f0d49d0cdf Decouple APILegacyScoreInfo from ScoreInfo 2019-12-03 15:31:11 +09:00
Andrei Zavatski
0ac4675546 Implement IEquatable<Country> 2019-12-01 03:52:41 +03:00
Andrei Zavatski
c451542915 Rankings overlay basic implementation 2019-11-30 03:01:07 +03:00
Dean Herbert
c49aeb08c4 Add API methods to perform requests out-of-queue 2019-11-29 20:03:14 +09:00
Dean Herbert
5dbc32f49b Fix MedalIcon usage 2019-11-29 16:19:57 +09:00
Dean Herbert
e678fe7a77 Move potentially expensive load to BDL 2019-11-29 15:35:33 +09:00
Dean Herbert
2663e5d756 Add some more missing LongRunningLoad flags 2019-11-29 13:52:23 +09:00
Andrei Zavatski
83e3ad9e69 Make Rankings a ctor variable 2019-11-28 20:09:05 +03:00
Dean Herbert
aa9776d51a seal and compact rows 2019-11-28 19:07:43 +09:00
Andrei Zavatski
8077c86d13 CI fixes 2019-11-27 23:58:31 +03:00
Andrei Zavatski
800bda7e81 Refactor tables to avoid code duplication 2019-11-27 23:35:02 +03:00
Andrei Zavatski
c546df8a80 Refactor API logic 2019-11-27 21:56:22 +03:00
Andrei Zavatski
2135a7fd7b Don't use repetitive headers in each class 2019-11-27 21:46:41 +03:00
Andrei Zavatski
4cf5968026 Simplify place calculation 2019-11-27 21:39:38 +03:00
Andrei Zavatski
14c471fe5d Move Rankings property below ctor 2019-11-27 21:37:34 +03:00
Andrei Zavatski
bb3152ac8b Use string.empty for empty headers 2019-11-27 21:35:03 +03:00
Dean Herbert
e1302d84dd Use string.Empty 2019-11-28 00:26:10 +09:00
Dean Herbert
4221a0126c
Merge branch 'master' into rankings-tables 2019-11-27 23:26:54 +09:00
Dean Herbert
01a37771bc
Merge branch 'master' into customized-mods 2019-11-27 19:44:32 +09:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
1fd5ed3c0f Change login placeholder text to ask for username 2019-11-25 21:35:25 +09:00
Dan Balasescu
92c4e8e4f6
Merge pull request #6911 from peppy/fix-spritetext-usage
Fix usage of SpriteText instead of OsuSpriteText
2019-11-25 12:30:45 +09:00
Dean Herbert
22bdc8435d
Increase padding on mod section title (#6916)
Increase padding on mod section title
2019-11-25 12:28:38 +09:00
Dan Balasescu
9f93727a80
Merge branch 'master' into fix-spritetext-usage 2019-11-25 12:15:05 +09:00
Dan Balasescu
ffd2ba5d7d
Merge branch 'master' into beatmap-overlay-no-supporter-filter 2019-11-25 11:51:10 +09:00
Dean Herbert
b85189f855 Merge remote-tracking branch 'upstream/master' into fix-spritetext-usage 2019-11-25 11:31:12 +09:00
Dean Herbert
45514ff660 Apply fixes 2019-11-25 11:30:55 +09:00
Berkan Diler
fccdbffa93 Use MathF instead of Math- functions when possible
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Andrei Zavatski
96533631fc Simplify if/else statement 2019-11-24 01:29:11 +03:00
Andrei Zavatski
29b05e2939 Fix getScores can be fired twice on user change 2019-11-24 00:01:49 +03:00
Andrei Zavatski
2e161f7e99 Hook up the rest of the logic 2019-11-22 22:25:58 +03:00
Andrei Zavatski
aede1b183a Make ScopeSelector always visible 2019-11-22 22:04:58 +03:00
Andrei Zavatski
d6c9387beb Implement NotSupporterPlaceholder 2019-11-22 21:55:21 +03:00
Albie Spriddell
4cb09df754 increase padding 2019-11-22 18:23:48 +00:00
Dean Herbert
d0002cc1c2 Update performance logging setting 2019-11-22 19:50:30 +09:00
Dean Herbert
c2e85a2057 Apply CornerExponent fixes 2019-11-22 19:49:20 +09:00
Dean Herbert
b026197859 Add spacing 2019-11-22 18:23:48 +09:00
Dean Herbert
dad2e5c678 Improve legibility of NoScroesPlaceholder 2019-11-22 18:10:44 +09:00
Dean Herbert
16bdf4e6bd Update english to be more readable 2019-11-22 18:07:56 +09:00
Dean Herbert
0cc1698b6d Rename incorrectly named container 2019-11-22 18:05:12 +09:00
Andrei Zavatski
da425c93fa Fix beatmap switch doesn't trigger scores update 2019-11-22 05:08:50 +03:00
Andrei Zavatski
dee9ffc694 Merge master with conflicts resolved 2019-11-22 04:59:46 +03:00
Dean Herbert
e170cd2892 Move private methods below 2019-11-22 10:29:16 +09:00
Dean Herbert
ced0ad404e
Merge branch 'master' into beatmap-mod-selector 2019-11-22 10:17:40 +09:00
Dean Herbert
5da5abdb05
Merge branch 'master' into prev-button-revamp 2019-11-22 02:57:22 +09:00
Dean Herbert
ab42fac43a Improve naming 2019-11-22 02:38:31 +09:00
Andrei Zavatski
0f1a3d97c8 Naming adjustments 2019-11-21 20:34:19 +03:00
Dean Herbert
a97d760afa Merge remote-tracking branch 'upstream/master' into menu-background-modes 2019-11-22 02:23:02 +09:00
Andrei Zavatski
c7c8527f5f Remove OnHighlightedChanged function 2019-11-21 20:22:15 +03:00
Andrei Zavatski
e22a71c6b8 Add visual difference between hovered and selected states 2019-11-21 19:42:07 +03:00
Andrei Zavatski
23fc7b1987 Implement updateHighlighted method 2019-11-21 19:02:24 +03:00
Andrei Zavatski
984ec11a78 Make Ruleset a bindable 2019-11-21 18:56:48 +03:00
Andrei Zavatski
737c2bd1c8 Remove pointless const 2019-11-21 18:50:29 +03:00
Andrei Zavatski
458496206c Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-21 18:49:37 +03:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Dean Herbert
0d4854ac09
Add News Overlay skeleton and header (#5726)
Add News Overlay skeleton and header

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-22 00:14:31 +09:00
Dean Herbert
1a6b5e8714
Implement TotalCommentsCounter component for CommentsContainer (#6867)
Implement TotalCommentsCounter component for CommentsContainer
2019-11-21 23:45:23 +09:00
Dean Herbert
76722534ec
Fix cancel button animating when entering a dialog (#6825)
Fix cancel button animating when entering a dialog

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 23:22:17 +09:00
Dean Herbert
f173961def
Add some extra search keywords to settings (#6893)
Add some extra search keywords to settings

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 22:51:20 +09:00
Dean Herbert
d7cb23a909 Remove redundant keyword 2019-11-21 22:51:00 +09:00
Dean Herbert
8b1fb2d5a1 Standardise keyword specifications 2019-11-21 22:35:15 +09:00
Andrei Zavatski
f066d8434c Apply suggestions 2019-11-21 00:26:39 +03:00
Andrei Zavatski
6b3010535f Simplify Keywords usage for SettingsSubsection 2019-11-20 21:03:31 +03:00
Andrei Zavatski
f3d9abc84a Capitalize Bar for consistency 2019-11-20 19:57:02 +03:00
Andrei Zavatski
7d8252183e CI fix 2019-11-20 19:42:57 +03:00
Andrei Zavatski
e820ddd3e8 Implement settings keywords 2019-11-20 19:27:34 +03:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Huo Yaoyuan
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Huo Yaoyuan
b1b234c6fb Use paramref. 2019-11-17 20:49:36 +08:00
Andrei Zavatski
509440ea14 TotalCommentsCounter implementation 2019-11-16 18:02:34 +03:00
Andrei Zavatski
f2862e95e0 CI fix 2019-11-15 12:15:51 +03:00
Andrei Zavatski
e51fd00d58 CI fix 2019-11-15 12:09:31 +03:00
Andrei Zavatski
18f77008db Update dependency 2019-11-15 12:04:01 +03:00
Andrei Zavatski
9fd225bda7 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-mod-selector-new 2019-11-15 11:58:05 +03:00
Andrei Zavatski
2592a0489b Use existing ModNoMod 2019-11-15 11:57:40 +03:00
Andrei Zavatski
1218d41b50 Make Ruleset a property 2019-11-15 11:52:49 +03:00
Andrei Zavatski
b7efc276f1 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-15 11:42:32 +03:00
Dean Herbert
813aebca1d Remove unintentional dependency 2019-11-15 14:51:01 +09:00
Dean Herbert
6d06b444ba Allow screen to specify whether to apply audio rate adjustments from mods 2019-11-15 13:47:14 +09:00
Dan Balasescu
cd9902cc9f
Merge branch 'master' into commit-on-focus-lost 2019-11-15 08:58:59 +09:00
Huo Yaoyuan
0998afdbdb Use ReferenceEquals instead of SequenceEqual. 2019-11-14 19:38:08 +08:00
Dean Herbert
bf567e6df5 Make settings textboxes commit on focus lost 2019-11-14 14:19:55 +09:00
Andrei Zavatski
2d3fadc1a8 Don't update mod filter visibility on every beatmap change 2019-11-14 00:38:37 +03:00
Andrei Zavatski
633c497602 Hide content if beatmap has no leaderboard 2019-11-13 17:36:08 +03:00
Huo Yaoyuan
87d40cf8d0 Resolve equals usages. 2019-11-13 22:35:50 +08:00
Andrei Zavatski
d1853ea55b Fix incorrect formatting for switch/case 2019-11-13 17:29:50 +03:00
Andrei Zavatski
8005ee73af Trim whitespace 2019-11-13 17:23:46 +03:00
Andrei Zavatski
3f6140db6d Improve loading animation 2019-11-13 17:18:58 +03:00
Andrei Zavatski
4e90daf212 Implement NoScoresPlaceholder 2019-11-13 16:39:33 +03:00
Andrei Zavatski
2dbee5da79 Update dependency 2019-11-13 16:06:37 +03:00
Andrei Zavatski
6715b25ddd Apply suggestions 2019-11-13 16:04:15 +03:00
Dean Herbert
f11ad7535d
Merge branch 'master' into rankings-tables 2019-11-13 15:39:13 +09:00
Dean Herbert
230de261c8
Merge branch 'master' into fix-popup-dialog-button 2019-11-13 15:39:08 +09:00
Dean Herbert
0292cea2c4
Merge branch 'master' into beatmap-mod-selector 2019-11-13 15:39:08 +09:00
Dean Herbert
367d12aef9
Merge branch 'master' into beatmap-overlay-mod-selector-new 2019-11-13 15:39:06 +09:00
Dean Herbert
ce60f8262c
Merge branch 'master' into sharpen 2019-11-13 15:38:59 +09:00
Dean Herbert
c751328665 Disable button when not logged in 2019-11-13 12:13:33 +09:00
Andrei Zavatski
5f609b48da Use local bindable for api.LocalUser 2019-11-13 00:29:28 +03:00
Andrei Zavatski
99ec84ed38 Update dependency 2019-11-13 00:26:19 +03:00
Andrei Zavatski
2719be7769 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-mod-selector-new 2019-11-13 00:24:40 +03:00
Andrei Zavatski
27f721eec2 Use = instead of += for OnSelectionChanged Action 2019-11-13 00:24:13 +03:00
Andrei Zavatski
3903e59f2f Add null check for notification overlay 2019-11-13 00:01:13 +03:00
Andrei Zavatski
dfd5c88075 Typo fix 2019-11-13 00:00:08 +03:00
Ganendra Afrasya
8276428efc Add IsPresent check when dialog popping out 2019-11-12 20:48:26 +07:00
Dean Herbert
da819261e0 Shrink and darken loading layer to better suit button 2019-11-12 21:38:16 +09:00
Dean Herbert
5110ae82a1 Tidy up implementation 2019-11-12 21:38:08 +09:00
Huo Yaoyuan
42a98c5d87 Use constants. 2019-11-12 20:07:01 +08:00
Huo Yaoyuan
ca52d09e81 Enforce expression body for typical simple ones. 2019-11-12 19:56:37 +08:00
Huo Yaoyuan
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
Huo Yaoyuan
bbeab6fa76 Use auto property. 2019-11-12 19:53:25 +08:00
Dean Herbert
58df6930b2 Get error message from server 2019-11-12 19:34:20 +09:00
Dean Herbert
f04d7f733f Merge remote-tracking branch 'upstream/master' into favourite-beatmap 2019-11-12 19:19:29 +09:00
Dean Herbert
a83c3523ae
Merge branch 'master' into rankings-tables 2019-11-12 18:59:43 +09:00
Andrei Zavatski
a69a4643c9 Simplify LINQ expressions 2019-11-12 08:45:21 +03:00
Andrei Zavatski
fa01e11a6e Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-12 08:25:42 +03:00
Dean Herbert
4516da223d
Merge branch 'master' into fix-mod-section-overflow 2019-11-12 11:35:01 +09:00
Andrei Zavatski
0578f91a76 Small logic adjustments 2019-11-11 19:06:46 +03:00