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

211 Commits

Author SHA1 Message Date
smoogipoo
5e72ed0d12 Fix potential nullref 2019-07-23 15:35:12 +09:00
Andrei Zavatski
ffcc1c62af simplify moving condition 2019-07-22 23:22:39 +03:00
Dean Herbert
d4c1005c7e Fix incorrect comparison in line updating logic 2019-07-15 15:53:19 +09:00
smoogipoo
f6f547a91b Fix ruleset selector line not moving on first display 2019-06-27 18:25:38 +09:00
smoogipoo
6ce86e6083 General refactoring 2019-06-26 17:52:25 +09:00
Andrei Zavatski
b7d15982d7 Remove useless parentheses 2019-06-24 23:30:35 +03:00
Andrei Zavatski
4a05c560cf Remove unwanted class and move the bind logic outside the RulesetSelector 2019-06-24 23:13:28 +03:00
Andrei Zavatski
35db20a337 Remove useless bindable check 2019-06-24 02:01:00 +03:00
Andrei Zavatski
60ff497add Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 01:06:54 +03:00
Andrei Zavatski
413c2158e2 Simplify bindables usage 2019-06-18 01:11:05 +03:00
Andrei Zavatski
c95e3da3ec Implement a BindableRulesetSelector 2019-06-18 00:23:00 +03:00
KingLuigi4932
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
EVAST9919
e5a6d920cd Implement an abstract RulesetSelector class 2019-06-12 23:23:01 +03:00
EVAST9919
8d8615773c Fix selection is being possible even in disabled state 2019-06-12 20:54:19 +03:00
EVAST9919
3150b5cfb4 Naming adjustments 2019-06-12 20:51:21 +03:00
EVAST9919
065b4cd055 Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-12 20:35:51 +03:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
EVAST9919
27163c9996 Fix crashes in some cases
When we want to switch ruleset from outside of the selector, but it's
blocked (multiplayer is a good example)
2019-06-10 09:18:48 +03:00
EVAST9919
ec8c09dd39 Fix unability to mannualy switch ruleset 2019-06-10 04:36:34 +03:00
EVAST9919
9b8540d818 Add a testcase 2019-06-10 03:35:00 +03:00
EVAST9919
62eadf21c9 Remove useless line 2019-06-08 18:38:52 +03:00
EVAST9919
06dfa42a5a Refactor 2019-06-08 18:27:40 +03:00
EVAST9919
210437042f Remove useless update calls in ToolbarRulesetSelector 2019-06-07 02:39:36 +03:00
Dean Herbert
0fc43afd34 Merge branch 'master' into HoutarouOreki-changelog-overlay 2019-05-14 17:35:14 +09:00
Dean Herbert
7553e2da25 Fix incorrect DI reference and update naming of SettingsOverlay classes 2019-05-14 10:45:05 +09:00
Dean Herbert
50c440de8d Add toolbar button 2019-05-13 17:01:17 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Joseph Madamba
9a32e12435
Merge branch 'master' into fix-login-overlay-behavior 2019-03-28 22:28:56 -07:00
Joehu
53f3dacdfb Fix login overlay behavior 2019-03-27 22:01:06 -07:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
smoogipoo
09b5cf4891 Move sizing to ctor 2019-03-08 15:14:07 +09:00
Dean Herbert
075ea70124 Move more toolbar to async load 2019-03-08 12:15:27 +09:00
Joehu
f4a6612d48 Fade out taskbar tooltip after clicking 2019-02-28 15:43:04 -08: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
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
dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo
f47ac35522 Add click to avatar 2018-12-22 14:23:53 +09:00