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

16632 Commits

Author SHA1 Message Date
Dan Balasescu
067f290e6e
Merge branch 'master' into fix-key-counter 2019-01-23 17:49:21 +09:00
Christian Kamphausen
512e75982f
Merge branch 'master' into fix-transparent-background-on-screen-scale-modes 2019-01-23 09:49:19 +01:00
ekrctb
7441121b5d
Merge pull request #4132 from peppy/search-settings-dropdowns
Allow filtering settings matching based on dropdown content
2019-01-23 17:48:13 +09:00
chrisny286
76700ad20f Merge branch 'fix-transparent-background-on-screen-scale-modes' of https://github.com/chrisny286/osu into fix-transparent-background-on-screen-scale-modes 2019-01-23 09:40:44 +01:00
chrisny286
03e3247baf replace FadeTo in PlayerLoader
didnt notice that interaction yet. yes this makes it neccessary.
2019-01-23 09:40:38 +01:00
Dean Herbert
1025c51e0d Allow filtering settings matching based on dropdown content 2019-01-23 17:30:05 +09:00
Christian Kamphausen
432bd3e0fc
Merge branch 'master' into fix-transparent-background-on-screen-scale-modes 2019-01-23 09:21:18 +01:00
Dean Herbert
cbbcaf6821
Merge pull request #4099 from smoogipoo/diffcalc-fixes
Apply various fixes to bring diffcalc in-line with stable
2019-01-23 17:17:37 +09:00
Dean Herbert
4180ca75bc
Fix typo in comment 2019-01-23 17:14:08 +09:00
chrisny286
bb56c4a1a7 use Color4.Black and White + using osuTK.Graphics 2019-01-23 09:08:34 +01:00
Dean Herbert
87d3466f51
Merge branch 'master' into diffcalc-fixes 2019-01-23 16:56:07 +09:00
chrisny286
5d2b2ecf06 Merge remote-tracking branch 'upstream/master' into fix-transparent-background-on-screen-scale-modes 2019-01-23 08:52:46 +01:00
chrisny286
f4ebab2d3a Fix backgrounds being transparent in some scaling modes
by replacing `.FadeTo` at the necessary places with `.FadeColour`.
restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.
2019-01-23 08:52:25 +01:00
Dean Herbert
c18ce2c23a Formatting fixes 2019-01-23 14:51:25 +09:00
Dean Herbert
49633b3394 Fix key counter receptor getting overwritten by async load drawables 2019-01-23 14:51:25 +09:00
Dean Herbert
f107a922b4 Add tests for key counter inside player heirarchy 2019-01-23 14:51:25 +09:00
Dean Herbert
e614cf0ed2
Merge pull request #4121 from chrisny286/Fix-OsuSliderBar-tooltip-not-updating-in-special-case
Fix Tooltip not updating in special case
2019-01-23 12:39:34 +09:00
Christian Kamphausen
5e31db275d
Merge branch 'master' into Fix-OsuSliderBar-tooltip-not-updating-in-special-case 2019-01-23 04:14:59 +01:00
chrisny286
260011fc13 remove manual update
misunderstood that earlier
2019-01-23 04:05:03 +01:00
chrisny286
fe5d34a657 replace as requested 2019-01-23 03:25:56 +01:00
chrisny286
47181cf5d7 add back update in onUserChange 2019-01-23 03:21:09 +01:00
Dean Herbert
e4007fcf23
Merge branch 'master' into download-tracking-component 2019-01-23 11:12:57 +09:00
Dean Herbert
7d6d7cf457 Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
#	osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
2019-01-23 11:06:29 +09:00
ekrctb
0b175ba315
Merge pull request #4128 from chrisny286/fix-autoplay-rewind/skip-when-ui-hidden
Fix autoplay rewind/skip usable when UI hidden
2019-01-23 11:05:30 +09:00
chrisny286
13ba9d64d0 revert empty line 2019-01-23 02:56:00 +01:00
chrisny286
12503b4d07 revert and make VisibilityContainer not AlwaysPresent 2019-01-23 02:37:17 +01:00
chrisny286
f01ba17d1f add check if replay is loaded before allowseeking can be overwitten 2019-01-23 02:12:40 +01:00
chrisny286
cabcfffdeb Fix autoplay rewind/skip usable when UI hidden 2019-01-23 01:16:37 +01:00
chrisny286
3f96231b2f convert to method group 2019-01-22 19:34:26 +01:00
chrisny286
09a2b287f9 Fix Tooltip not updating in special case
When the Bindvalue of the Sliderbar gets changed by a line like "Bindable.Value = ..." the sliderbar will only update the nubs but wont run any methods which contain the updateToolTipText(T value) function.
Example scenario:
Two interlinked sliderbars which change the value of each other in certain cases.
2019-01-22 18:29:30 +01:00
Dean Herbert
e54771c817
Merge pull request #4119 from peppy/remove-other-supporter-check
Remove remaining supporter check
2019-01-23 00:35:46 +09:00
Dean Herbert
09553550a3 Remove remaining supporter check 2019-01-23 00:19:39 +09:00
Dean Herbert
f33f91dadb
Merge pull request #4108 from peppy/fix-toolbar-padding-regression
Fix overlays not being correctly offset by toolbar padding
2019-01-22 21:29:36 +09:00
Shane Woolcock
fbed8c3242 Pass GameHost to BeatmapManager in visual tests 2019-01-22 22:07:41 +10:30
Shane Woolcock
59eb33684d Merge branch 'master' into samah-ios 2019-01-22 22:07:15 +10:30
Shane Woolcock
0c56942761 Code sanity 2019-01-22 21:32:23 +10:30
Shane Woolcock
fe86b14659 Update framework 2019-01-22 21:14:13 +10:30
Dean Herbert
863756a252
Merge pull request #4115 from peppy/allow-download-no-supporter
Allow full osu!direct usage regardless of supporter status
2019-01-22 19:26:30 +09:00
Dan Balasescu
e35b0093f3
Merge branch 'master' into fix-toolbar-padding-regression 2019-01-22 19:18:02 +09:00
Dean Herbert
24ac1982cc
Merge pull request #4117 from peppy/update-framework
Update framework
2019-01-22 17:01:14 +09:00
Dean Herbert
828b9451e5 Update framework 2019-01-22 16:48:32 +09:00
Dean Herbert
55fb401532
Merge pull request #4116 from ekrctb/fix-import-beatmap-completion-notification-click
Fix PresentBeatmap not working for unsubmitted beatmap set
2019-01-22 16:48:22 +09:00
ekrctb
fe2b83279e
Correct wrong logic
`OnlineBeatmapSetID == null` was the problem
2019-01-22 16:40:32 +09:00
ekrctb
0095521fc2
Use both OnlineBeatmapSetID and Hash 2019-01-22 16:10:04 +09:00
ekrctb
1d5f5865aa Fix PresentBeatmap not working for unsubmitted beatmap set 2019-01-22 15:19:42 +09:00
Dean Herbert
5ea6e8e247 Allow full osu!direct usage regardless of supporter status for now 2019-01-22 14:22:38 +09:00
Dean Herbert
c58fe4f4ff Fix nullref 2019-01-22 13:18:01 +09:00
Dean Herbert
cebeb0a219 Fix replay playback speed not being displayed initially 2019-01-22 11:40:57 +09:00
Dean Herbert
ca470ffaf0
Merge pull request #4103 from ekrctb/taiko-namespace
Fix taiko sample namespace ignored
2019-01-22 10:34:36 +09:00
Dean Herbert
635046acff
Merge branch 'master' into taiko-namespace 2019-01-22 10:26:25 +09:00