1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 03:02:53 +08:00
Commit Graph

656 Commits

Author SHA1 Message Date
smoogipoo
11a6c9bdcc Revert unnecessary change 2020-08-06 16:24:14 +09:00
smoogipoo
5c05fe3988 Expose track from MusicController 2020-08-06 16:24:14 +09:00
smoogipoo
6e42b8219c Move track to MusicController, compiles 2020-08-06 16:24:14 +09:00
Dean Herbert
8147e67f53 Use static instances in all fallback ControlPoint lookups to reduce allocations 2020-07-18 11:53:04 +09:00
Dean Herbert
f2735a7797 Use new empty ChannelAmplitudes spec 2020-06-23 21:30:37 +09:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +09:00
Fukashi13
6416ace70d fixed indent 2020-05-15 14:31:05 +02:00
Fukashi13
c55eb83351 last section gets selected when scrolling to bottom of list 2020-05-15 14:03:45 +02:00
Fukashi13
097fcfd9ad
Update osu.Game/Graphics/Containers/SectionsContainer.cs
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-15 00:06:58 +02:00
Fukashi13
e390d70b70 bestMatch changes on entering section with screen top border 2020-05-14 14:33:12 +02:00
alex
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
smoogipoo
69fb984e71 Remove EquivalentTo() and Equals() 2020-04-17 17:04:09 +09:00
Dean Herbert
0be2dc9b2d Tidy up SectionsContainer class layout/ordering 2020-04-13 20:13:48 +09:00
Andrei Zavatski
b741e359cd Use OverlayScrollContainer for overlays 2020-04-13 12:23:28 +03:00
Dean Herbert
07462120e4 Split break tracking into its own component 2020-03-26 15:30:23 +09:00
voidedWarranties
48282dea8b Remove individual setting to disable videos, fix tests 2020-03-07 22:08:38 -08:00
smoogipoo
334ec7bbd4 Apply further framework changes 2020-02-26 15:06:30 +09:00
smoogipoo
ec73e8f0c7 Allow different sizing modes for OverlinedParticipants 2020-02-19 17:40:38 +09:00
smoogipoo
1909ea2bd3 Add a way to hide the drag handle 2020-02-14 16:09:19 +09:00
smoogipoo
eb75d26c8f Extract common rearrangeable list design 2020-02-14 15:36:16 +09:00
Dean Herbert
c1f52ef594 Refactor BeatSyncContainer to handle zero length tracks 2020-02-09 21:25:28 +09:00
Dean Herbert
7c62cc3ac3 Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework 2020-01-22 22:57:52 +09:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
smoogipoo
bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
Revel
a86fb2113e fix tooltip capitalization 2020-01-14 14:26:54 -05:00
Dean Herbert
619fe29871 Make reverse arrow animate faster via divisor specification
Adds MinimumBeatLength to BeatSyncedContainer to make sure things don't get out of hand.
2020-01-14 01:39:45 +09:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
Dean Herbert
e33de0c2e4 Fix ScrollContainer crashes 2020-01-07 15:14:09 +08:00
smoogipoo
2a128340d0 Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats 2019-12-18 17:58:37 +09:00
smoogipoo
d65e37d795 Fix typo 2019-12-18 17:58:29 +09:00
Dean Herbert
735b7a8455
Merge pull request #6940 from aspriddell/cinema-mod
Add "Cinema" mod
2019-12-17 14:33:12 +09:00
Dean Herbert
f8ffa67693 Add test and isolate ignore bindable from EnableUserDim 2019-12-17 13:21:23 +09:00
Dean Herbert
5761d763ec
Allow changing volume using alt when hovering scroll containers (#7213)
Allow changing volume using alt when hovering scroll containers

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-17 13:20:31 +09:00
Dean Herbert
b5db927d93 Merge branch 'master' into cinema-mod 2019-12-17 12:56:06 +09:00
Dean Herbert
a85653ebec Add comment 2019-12-17 12:24:59 +09:00
Dean Herbert
795416c066 Move first beat offset to BeatSyncedContainer 2019-12-17 12:06:09 +09:00
Dean Herbert
72404bff9a Add support for simple triple time 2019-12-16 19:16:54 +09:00
Dean Herbert
0f9ff32cdc Fix beat playing while paused 2019-12-16 18:51:22 +09:00
Huo Yaoyuan
c457571da6 Use index and range expressions 2019-12-15 20:17:35 +08:00
Joehu
a04f4b76bb Allow changing volume using alt when hovering scroll containers 2019-12-14 11:39:59 -08:00
Dean Herbert
5e634c1183 Move test values to constants 2019-12-12 20:51:58 +09:00
Salman Ahmed
4f6b85e5ea Add test ensuring correct break lightening behaviour 2019-12-12 00:32:39 +03:00
Albie
2ca722423b remove uneccesary using statement 2019-12-11 18:58:14 +00:00
Albie
caa9286a90 update tests, change binding and reduce lines in cinema mod 2019-12-11 17:39:40 +00:00
Albie
83b2e0525e further fixes, not perfect yet 2019-12-11 07:02:51 +00:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod 2019-12-10 17:06:53 +00:00
Albie
6c1ae3bc8a add tests 2019-12-10 16:59:31 +00:00
Salman Ahmed
bb078c2afc Lighten user-dim container if on break time 2019-12-10 15:13:44 +03:00
Joehu
74176a6954 Remove redundant ternary expression 2019-12-01 12:54:37 -08:00
Joehu
3b88afd069 Fix overlays closing when dragging from in/out or out/in 2019-12-01 12:02:47 -08:00
Albie
7864899249
Merge branch 'master' into cinema-mod 2019-11-28 16:42:01 +00:00
Dean Herbert
2865f32052 Fix nullref on clicking links in tests 2019-11-28 00:13:44 +09:00
Albie
b8e5796af5 add forced video/storyboard and disabled dim for mod inside new interface 2019-11-24 07:37:06 +00:00
Berkan Diler
66a3837ff4 Fix CI 2019-11-20 14:25:44 +01: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
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
d400e4a5f6 Add shared constant for parallax amount 2019-11-07 09:30:50 +09:00
Dean Herbert
ee4839b7e7 Reduce delay on parallax 2019-11-06 18:09:36 +09:00
Dean Herbert
898520935e Move link handling code to OsuGame
This allows for future calls from arguments / associations
2019-11-01 11:40:51 +09:00
Dean Herbert
8baf569f59 Remove necessity of AutoGenerated flag 2019-10-25 19:58:42 +09:00
Dean Herbert
e987db37ec Add grouping of ControlPoints 2019-10-25 19:52:02 +09:00
Dean Herbert
b30c84778f Update WaveContainer to support framework changes 2019-10-18 16:13:01 +09:00
HDragonHR
faf8fe132e Change bindable int to float 2019-10-02 12:26:46 +08:00
Dean Herbert
50d4206c45 Fix exit scenarios 2019-09-19 20:17:58 +09:00
Dean Herbert
177a789d79 Add setting to adjust hold-to-confirm activation time 2019-09-19 14:06:25 +09:00
Andrei Zavatski
437e121056 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video 2019-09-13 13:39:58 +03:00
Joehu
e0bf579b18 Properly fix dialog overlay playing double samples on show/hide 2019-09-11 15:35:47 -07:00
Dean Herbert
55a071e8ba Use BindValueChanged 2019-09-11 19:12:55 +09:00
Dean Herbert
be66c0e912 Fix potential of toggle between load and LoadComplete 2019-09-11 19:06:31 +09:00
Dean Herbert
2c09efa23b Handle changes to OverlayActivationMode 2019-09-11 17:34:28 +09:00
Dean Herbert
825a34ecd3 Early return to avoid other potential fail cases 2019-09-11 17:34:03 +09:00
Dean Herbert
f53410a42a Merge remote-tracking branch 'upstream/master' into re-order-events 2019-09-11 16:48:44 +09:00
Dean Herbert
95baae5088 Fix dragging from inside to outside an overlay incorrectly hiding 2019-09-06 18:27:54 +09:00
smoogipoo
eab06995d0 Add some whitespace 2019-09-03 11:37:56 +09:00
jorolf
3b769128a8 Add a 60bpm beat when no beatmap is playing 2019-09-03 00:57:29 +02:00
Andrei Zavatski
94512fea8e Apply naming suggestions 2019-08-31 16:20:33 +03:00
Andrei Zavatski
fa3591e5ec Add setting to turn on/off the video 2019-08-31 00:42:20 +03:00
Dean Herbert
03a4acaf4c Fix drags outside of overlay container bounds not hiding overlay 2019-08-29 12:07:58 +09:00
Andrei Zavatski
727a6abaf7 Simplify caching 2019-08-21 12:16:30 +03:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Dean Herbert
d732d276b1 Make activation delay customisable 2019-08-16 13:21:41 +09:00
Dean Herbert
ef5ed915e5 Reduce delay for hold-to-confirm controls 2019-08-15 17:14:00 +09:00
iiSaLMaN
565034e658 Remove unnecessary using directive 2019-08-08 22:14:51 +03:00
iiSaLMaN
0fcc6c1676 Add DimLevel property 2019-08-08 22:13:48 +03:00
iiSaLMaN
a3d90da7d4 Remove unnecessary check 2019-08-08 17:29:52 +03:00
iiSaLMaN
88b9942b2a Move EnableUserDim check to defualt value of ShowDimContent 2019-08-08 17:07:06 +03:00
iiSaLMaN
d5b26b86da Fix storyboard not showing on disabled user dim 2019-08-07 22:18:10 +03:00
David Zhao
ac0abe0692 Use newly exposed UpdateState 2019-08-06 14:21:34 +09:00
David Zhao
28825d4077 Merge remote-tracking branch 'upstream/master' into re-order-events 2019-08-06 14:00:35 +09:00
Dean Herbert
cec26a270e Fix using right mouse button to drag at song select seeking incorrectly with many beatmaps loaded
Closes #5195
2019-07-30 07:04:16 +09:00
David Zhao
4b5fb84888
Rewrite comment 2019-07-29 11:02:44 +09:00
David Zhao
1b0f7b0459 more detailed explanation 2019-07-26 19:05:55 +09:00
David Zhao
6e09d857fd Fix ValueChanged events being called out of order 2019-07-26 19:00:07 +09:00
Dean Herbert
8b67f88d16 Don't expose dimmable container creation in player 2019-07-12 12:04:45 +09:00
Dean Herbert
46f7bb885b Move classes to local namespaces
Also renames test scene to more appropriate name.
2019-07-12 11:50:06 +09:00
Dean Herbert
b5ca7faca4 Move default value for EnableUserDim to base class 2019-07-12 11:40:38 +09:00
Dean Herbert
0d9f978857 Don't expose DimContainer 2019-07-12 11:38:15 +09:00
David Zhao
932243cfd4 public before private 2019-07-11 14:14:00 +09:00
David Zhao
ac170a6957 add comment and cleanup 2019-07-11 14:00:25 +09:00
David Zhao
321266e96f Make UserDimContainer abstract 2019-07-11 13:17:28 +09:00
David Zhao
7929104b8a move default into StoryboardContainer, fix load bug, remove comment 2019-07-10 12:24:05 +09:00
David Zhao
5bb21ecae0 remove storyboard region 2019-07-09 16:50:37 +09:00
David Zhao
1b5fadf93f move comment to more relevant location 2019-07-09 16:38:12 +09:00
David Zhao
89cb8a0cac Move storyboard initialization to new StoryboardContainer 2019-07-09 16:23:59 +09:00
Dean Herbert
e1d0d26669 Add a note about local optimisation that may not be required in the future 2019-07-03 00:21:16 +09:00
Dean Herbert
93511266e5 Fix waves not displaying at all 2019-07-02 22:33:33 +09:00
Dean Herbert
d27a0db45c Enforce StartHidden on relevant overlays 2019-07-02 15:23:47 +09:00
Dean Herbert
2645967dc4 Fix wave-based overlays always being present before initial display 2019-07-02 15:17:35 +09:00
Dean Herbert
bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
Dean Herbert
00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +09:00
Arphox
07e17518e9 Fix all "Maintainability" CodeFactor issues 2019-06-11 10:28:16 +02:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
Dean Herbert
60b70c0f45 Use lambda for simple functions 2019-06-07 14:11:21 +09:00
Dean Herbert
64d5aa318f Apply rebased changes 2019-06-07 11:45:58 +09:00
Dean Herbert
2538f32fae Merge branch 'osu-clickable-container' into OsuHoverContainer 2019-06-05 10:34:20 +09:00
Arphox
900cd5c484 Restore original values in FadeColour method call 2019-06-04 21:37:10 +02:00
Arphox
5f4d7437bc Fix the issue
When Enabled's value has been changed to true, it will now check if it is currently howered, and if yes, it will fade in correctly.
2019-06-04 21:30:49 +02:00
Dean Herbert
80a66b8b3a Merge remote-tracking branch 'upstream/master' into audio-refactor-update 2019-06-04 12:08:21 +09:00
Dean Herbert
3ef17a54f6 Fix sizing of OsuAnimatedButton and OsuClickableContainer
Was incorrect under some combinations of relative and autosize usage.
2019-06-03 13:53:24 +09:00
EVAST9919
fe9e53e383 Add a testcase 2019-05-30 23:07:04 +03:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
Dan Balasescu
2024cdf16d
Merge branch 'master' into hover-container-disabled-hover-effect 2019-05-21 17:04:50 +09:00
Dean Herbert
5ed1540a12 Handle unhover state change better 2019-05-21 15:02:31 +09:00
Dean Herbert
89e62c3d30 Only play OsuHoverContainer hover effect if action is present 2019-05-21 14:07:40 +09:00
Dean Herbert
bc962bf8f0 Move TooltipText to OsuClickableContainer 2019-05-21 13:51:38 +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
Dean Herbert
fa340a9eff
Merge branch 'master' into profile-header-update 2019-04-27 23:48:23 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
smoogipoo
3b0d4c1bad Merge branch 'turn-on-warnings' into profile-header-update 2019-04-25 17:43:10 +09:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
smoogipoo
4106da2430 Rename facade + cleanup usage 2019-04-17 17:05:33 +09:00
smoogipoo
3a1587fa53 Throw exception when not relatively positioned 2019-04-17 17:04:11 +09:00
smoogipoo
9f92b3a8ba Add xmldoc 2019-04-17 16:34:53 +09:00
jorolf
c1db635933 Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-04-09 20:42:39 +02: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
David Zhao
8a01995668 Remove need for tracking bool and backing logo 2019-04-08 16:14:41 +09:00
David Zhao
376bed3a30 Merge branch 'facade-container' of https://github.com/nyquillerium/osu into facade-container 2019-04-08 15:24:59 +09:00
David Zhao
a690302d00 Apply reviews 2019-04-08 15:24:09 +09:00
Dan Balasescu
d7655bc579
Use .Value instead of cast
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-04-08 11:22:01 +09:00
Dean Herbert
46ecaf3d6c
Merge branch 'master' into facade-container 2019-04-05 21:14:21 +09:00
David Zhao
e06fe7950b Cleanup 2019-04-05 15:06:37 +09:00
David Zhao
5fa93f4a05 Add test for checking exception 2019-04-05 15:05:11 +09:00
smoogipoo
15fbb6f176 Use common AddUserLink method 2019-04-05 14:15:36 +09:00
David Zhao
b1d74e57e5 Add checks guarding against setting tracking on multiple trackingcongtainers and setting facade size 2019-04-05 13:56:08 +09:00
David Zhao
7047f305a1 Apply reviews, add safety for multiple facades 2019-04-05 12:02:47 +09:00
David Zhao
6f5e9fe50d Correct xmldoc 2019-04-04 13:33:13 +09:00
David Zhao
e89143d76b Add xmldoc for LogoTrackingPosition 2019-04-04 12:07:11 +09:00
David Zhao
6b5458a625 Clean up test cases 2019-04-04 11:22:05 +09:00
jorolf
5bc6042309 Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-04-03 22:59:27 +02:00
David Zhao
8a40b27e8f Remove need for logo relativePositionAxes none 2019-04-03 20:32:53 +09:00
David Zhao
2ed945605e Fix Axes.None requirement for FacadeContainer 2019-04-03 19:57:22 +09:00
smoogipoo
ab4be3b75f General refactoring 2019-04-03 15:20:38 +09:00
smoogipoo
0d127c21f1 Merge remote-tracking branch 'Aergwyn/master' into update-beatmap-scores-design 2019-04-03 14:52:13 +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
David Zhao
020be50f03 Merge remote-tracking branch 'upstream/master' into facade-container 2019-04-02 11:28:44 +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
smoogipoo
2967c876ea Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
2019-03-29 15:11:00 +09:00
David Zhao
bfe44eb33d Remove SizeForFlow magic number 2019-03-28 15:40:58 +09:00
David Zhao
061527a260 Add new automated tests for logofacade, reset interpolation 2019-03-27 20:04:01 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
David Zhao
ca7a20585d Apply reviews, delete playerloader test 2019-03-27 17:28:53 +09:00
David Zhao
43c6a8d2e5 use a property instead 2019-03-27 11:44:50 +09:00
David Zhao
384eee3395 Remove DI requirement for the Facade in PlayerLoader 2019-03-27 11:32:26 +09:00
David Zhao
3fe52be77f Better tests, add documentation 2019-03-26 17:22:36 +09:00
David Zhao
be9ac39f54 Cleanup 2019-03-26 11:11:27 +09:00
David Zhao
35bf262d19 Merge remote-tracking branch 'upstream/master' into facade-container 2019-03-26 11:11:13 +09:00
David Zhao
a0f6718145 Better tests and implementation 2019-03-26 10:48:29 +09:00
smoogipoo
6a9f005ed4 Merge remote-tracking branch 'Joehuu/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
2019-03-25 15:21:29 +09:00
Dean Herbert
5b83e97e9d
Fix typo 2019-03-25 13:38:50 +09:00
Dean Herbert
cd1b171df7 Refactor async load logic (not required due to stack presence) 2019-03-25 13:28:51 +09:00
LeNitrous
fee260fa03 remove empty argument list 2019-03-25 06:05:57 +08:00
LeNitrous
01ce8f161e make scaling container background use BackgroundScreenStack with BackgroundScreenDefault 2019-03-25 05:49:57 +08:00
David Zhao
d37968d88d Add better test for facade containers 2019-03-24 15:18:38 +09:00
David Zhao
6e98a8dd7c Initial implementation 2019-03-22 20:01:58 +09:00
David Zhao
e93311fdc9 DI facade 2019-03-22 19:01:32 +09:00
Dean Herbert
298c98871d Actually add the background 2019-03-20 20:18:08 +09:00
Dean Herbert
ba89bfee0c Define explicit method to add background
Also cleans up some redundant/misplaced comments.
2019-03-20 20:16:45 +09:00
Dean Herbert
18de9e51c5 Formatting and naming improvements 2019-03-20 19:39:03 +09:00
David Zhao
f670e4664d Amend comment 2019-03-20 15:06:07 +09:00
David Zhao
2467ece020 store a field 2019-03-20 14:58:32 +09:00
David Zhao
86658e357b Override add instead 2019-03-20 14:55:52 +09:00
David Zhao
15637f9c4a Rework instant blur logic such that updateVisuals doesn't need to be public 2019-03-20 14:17:35 +09:00
David Zhao
a8e2072286 Make blurtarget private, improve documentation 2019-03-19 20:15:28 +09:00
David Zhao
27a92e017c rename back to UserDimContainer 2019-03-19 13:06:14 +09:00
David Zhao
0024a0bdb2 Remove unused using 2019-03-18 14:35:03 +09:00
David Zhao
eac7672c6b Clean up debug logging 2019-03-18 14:03:54 +09:00
David Zhao
8fc90bb9a0 Remove unused usings 2019-03-14 16:26:34 +09:00
David Zhao
8cdfb1fd61 Remove BlurrableBackgroundScreen, rework tests 2019-03-14 16:09:17 +09:00
David Zhao
8714902349 Handle all blurring directly from background 2019-03-14 14:02:46 +09:00
David Zhao
de6d8fc637 Move user blurring into VIsualSettingsContainer 2019-03-13 18:25:22 +09:00
smoogipoo
30c6a7c3c5 Merge remote-tracking branch 'nekodex/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/ClickableUserContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
2019-03-07 18:48:23 +09:00
smoogipoo
e3d463a141 Formatting fixes 2019-03-06 19:26:48 +09:00
smoogipoo
ee1f9d4981 Merge remote-tracking branch 'origin/master' into profile-header-update
# Conflicts:
#	osu-resources
#	osu.Game/Overlays/Profile/Components/GradeBadge.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/Header/RankGraph.cs
#	osu.Game/Overlays/Profile/Header/SupporterIcon.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
2019-03-06 15:53:30 +09:00
Dean Herbert
b7126b3efb Fix mod select overlay dimming itself 2019-03-02 14:48:05 +09:00
Shane Woolcock
5d1eacf1c1 Ensure all OsuFocusedOverlayContainers contribute to screen fading 2019-03-01 12:20:31 +09:00
Dean Herbert
53eb0e7e4e More formatting fixes 2019-02-28 20:30:23 +09:00
Dean Herbert
86913e720f Remove extra space 2019-02-28 20:24:09 +09:00
David Zhao
e3338e94d1 Make test cases more compact, add two way toggles 2019-02-28 20:01:15 +09:00