Andrei Zavatski
a8578c1526
Merge master with conflicts resolved
2020-01-30 10:08:02 +03:00
Dan Balasescu
dfd0b1b88c
Merge pull request #7663 from peppy/fix-import-different-ruleset
...
Fix presenting a beatmap from a different ruleset not working
2020-01-30 15:36:25 +09:00
Dan Balasescu
7b403fd57a
Merge pull request #7673 from peppy/catch-relax-input-allowance
...
Fix osu!catch not handling all vertical space
2020-01-30 15:35:49 +09:00
Dan Balasescu
3604730027
Merge branch 'master' into fix-replay-initial-frames
2020-01-30 15:16:24 +09:00
Dan Balasescu
b57421247f
Merge branch 'master' into catch-relax-input-allowance
2020-01-30 15:16:16 +09:00
Dan Balasescu
09f6c57b0f
Merge branch 'master' into fix-import-different-ruleset
2020-01-30 15:08:25 +09:00
smoogipoo
2fb640f57f
Change to until step + fix CI error
2020-01-30 15:00:39 +09:00
Dean Herbert
7b4a658264
Fix negative replay frames being played back incorrectly
2020-01-30 14:54:57 +09:00
Dan Balasescu
fb51ffc169
Merge pull request #7667 from peppy/editor-match-accessibility
...
Fix editor being accessible for multiplayer song select
2020-01-30 14:38:30 +09:00
smoogipoo
ce36e5458f
Fix possible crash with no channel topic
2020-01-30 14:35:03 +09:00
Dan Balasescu
33d964994c
Merge pull request #7671 from peppy/rename-deleted-count
...
Rename and tidy up DeletedCommentsCounter
2020-01-30 14:20:38 +09:00
Dan Balasescu
c18b1b302c
Merge branch 'master' into editor-match-accessibility
2020-01-30 13:49:56 +09:00
Dan Balasescu
3d814e7714
Merge branch 'master' into rename-deleted-count
2020-01-30 13:49:54 +09:00
Dan Balasescu
2beb10b860
Merge pull request #7670 from TheWildTree/recolor-profile-sections
...
Bring UserProfileOverlay colour scheme in line with web
2020-01-30 13:48:33 +09:00
Dan Balasescu
1239dd93dc
Merge branch 'master' into recolor-profile-sections
2020-01-30 13:30:35 +09:00
Dean Herbert
d8ce1fd86c
Fix osu!catch not handling all vertical space
2020-01-30 13:23:39 +09:00
smoogipoo
4ca3f216b8
Fix test scene
2020-01-30 13:11:35 +09:00
smoogipoo
17978035ea
Fix uncaught inconsistent naming
2020-01-30 12:50:15 +09:00
smoogipoo
da2c245083
Change to pink colour scheme
2020-01-30 12:36:47 +09:00
smoogipoo
d7d7ab48d3
Cleanup
2020-01-30 12:36:38 +09:00
Dean Herbert
03bc294e81
Merge branch 'master' into overlay-ruleset-selector
2020-01-30 11:41:55 +09:00
Dean Herbert
c158570249
Fix typo in comment
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-01-30 11:31:34 +09:00
Dean Herbert
b107026d50
Merge pull request #7389 from vruss/mod_content_centering
...
Fix footer button content not correctly being centered
2020-01-30 11:17:45 +09:00
Dean Herbert
ebdb425c50
Rename and tidy up DeletedCommentsCounter
2020-01-30 11:17:26 +09:00
Dean Herbert
f72de235cc
Remove unnecessary length specifications
2020-01-30 11:00:14 +09:00
Dean Herbert
37ecf8a060
Remove commented line
2020-01-30 10:50:48 +09:00
Dean Herbert
bea20efb64
Merge branch 'master' into mod_content_centering
2020-01-30 10:34:46 +09:00
Andrei Zavatski
d20c48d151
Resolve possible UserVotes issues
2020-01-30 00:53:05 +03:00
Andrei Zavatski
d1ead83c6c
Merge remote-tracking branch 'refs/remotes/ppy/master' into no-comments-placeholder
2020-01-30 00:48:43 +03:00
TheWildTree
ef92c26c17
Recolor ProfileSection
2020-01-29 22:26:21 +01:00
TheWildTree
f7c38da030
Match web border height
2020-01-29 22:25:56 +01:00
TheWildTree
87521f35ed
Recolor buttons
2020-01-29 22:25:28 +01:00
TheWildTree
06eded16e2
Recolor DetailHeaderContainer
2020-01-29 22:10:58 +01:00
TheWildTree
85990cdcdb
Recolor MedalHeaderContainer
2020-01-29 22:10:48 +01:00
TheWildTree
0f9ab7c980
Recolor BottomHeaderContainer
2020-01-29 22:10:19 +01:00
TheWildTree
fa0a96c3f5
Match web margins
2020-01-29 22:05:40 +01:00
TheWildTree
83d5691ba3
Match web border height
2020-01-29 22:00:37 +01:00
TheWildTree
799a86544f
Recolor play time border
2020-01-29 21:57:43 +01:00
TheWildTree
088064523b
Recolor CentreHeaderContainer
2020-01-29 21:55:41 +01:00
TheWildTree
12a49b74bb
Recolor TopHeaderContainer
2020-01-29 21:48:02 +01:00
TheWildTree
c091b31fe8
Recolor basic background boxes
2020-01-29 21:37:51 +01:00
TheWildTree
0ce18256e0
Recolor ProfileTabControl
2020-01-29 21:35:17 +01:00
TheWildTree
65f71b8c12
Make colourProvider accessable from derived classes
2020-01-29 21:23:19 +01:00
Bartłomiej Dach
f130e48c9e
Remove leftover negative margin
2020-01-29 19:17:07 +01:00
Andrei Zavatski
786ed03868
Update profile recent activities in line with the web design
2020-01-29 21:01:40 +03:00
Bartłomiej Dach
c9dda78ded
Refactor drawable hierarchy to center properly
...
* Use FillFlowContainer.Spacing instead of manually applying margins.
* Use Update() for calculating button padding to preserve it after
mod button expansion and adjust FooterButtonRandom to use this method
while avoiding flickering.
* Expose mod display margin to clear it in the footer button.
2020-01-29 18:59:51 +01:00
Dean Herbert
da6952407e
Allow null DI
2020-01-29 23:01:57 +09:00
Dean Herbert
13eb32fea2
Fix editor being accessible for multiplayer song select
2020-01-29 22:20:34 +09:00
Dean Herbert
7f59576f13
Fix percentage-formatted displays containing a space ( #7664 )
...
Fix percentage-formatted displays containing a space
2020-01-29 20:37:32 +09:00
Dean Herbert
9f0f09a844
Add a reverse setting for Winding mods ( #7222 )
...
Add a reverse setting for Winding mods
2020-01-29 20:29:32 +09:00
