1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 22:27:25 +08:00
Commit Graph

25531 Commits

Author SHA1 Message Date
Dean Herbert
a5a0eaba0d
Merge branch 'master' into fix-ss-click-crash 2020-01-27 19:35:31 +09:00
Dean Herbert
b54b0b1f20
Implement ability to create OverlayHeader with no TabControl (#7432)
Implement ability to create OverlayHeader with no TabControl
2020-01-27 19:34:34 +09:00
Dean Herbert
e37ae589ad
Merge branch 'master' into no-control-overlay-headers 2020-01-27 18:35:33 +09:00
Dean Herbert
bd6301b7c8 Merge remote-tracking branch 'upstream/master' into fix-ss-click-crash 2020-01-27 18:27:25 +09:00
Dean Herbert
fd7f07433d Ensure selection has occurred before storing value 2020-01-27 18:26:44 +09:00
Dean Herbert
05b59f1683
Merge pull request #7631 from ppy/dependabot/nuget/DiscordRichPresence-1.0.147
Bump DiscordRichPresence from 1.0.121 to 1.0.147
2020-01-27 17:15:32 +09:00
dependabot-preview[bot]
5609c92aaf
Bump DiscordRichPresence from 1.0.121 to 1.0.147
Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.121 to 1.0.147.
- [Release notes](https://github.com/Lachee/discord-rpc-csharp/releases)
- [Commits](https://github.com/Lachee/discord-rpc-csharp/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-27 07:50:21 +00:00
Dan Balasescu
d7b32940bd
Merge branch 'master' into fix-ss-click-crash 2020-01-27 15:40:45 +09:00
Dan Balasescu
dd523bc416
Merge pull request #7630 from peppy/fix-changelog-header-dim
Fix changelog header not dimming correctly on initial build display
2020-01-27 15:27:45 +09:00
Dean Herbert
7aa5e8c23e Limit input propagation correctly 2020-01-27 14:55:47 +09:00
Dean Herbert
1c64b70b06 Revert "Fix crash due to misordered selection events"
This reverts commit 2d74609f50.
2020-01-27 14:53:24 +09:00
Dean Herbert
292a82ac27 Fix incorrect propagation of stream/build on initial display with build 2020-01-27 14:52:21 +09:00
Dean Herbert
834e82d543 Add comprehensive tests for changelog overlay
Includes failing case
2020-01-27 14:50:41 +09:00
Dean Herbert
962449a5fa
Merge pull request #7624 from EVAST9919/breadcrumb-fix
Fix visual inconsistency in BreadcrumbControl
2020-01-27 13:33:54 +09:00
Dan Balasescu
d0ef5a8a8c
Merge branch 'master' into breadcrumb-fix 2020-01-27 13:18:23 +09:00
smoogipoo
431b1489b9 Add test 2020-01-27 13:16:36 +09:00
Dean Herbert
985443a193
Merge pull request #7628 from smoogipoo/fix-screenshot-cursor-hide
Fix cursor not hiding for screenshots
2020-01-27 12:51:36 +09:00
Dean Herbert
1f0aaabf7b Add tests 2020-01-27 12:21:17 +09:00
smoogipoo
15fd8596c2 Fix cursor not hiding for screenshots 2020-01-27 12:16:00 +09:00
Dan Balasescu
257d14a096
Merge pull request #7622 from peppy/dual-stage-remap
Remap osu!mania dual stage key bindings to be more ergonomic
2020-01-27 12:04:19 +09:00
Dan Balasescu
a0cc13c9de
Merge branch 'master' into dual-stage-remap 2020-01-27 11:01:17 +09:00
Dean Herbert
df30c4dbeb
Merge pull request #7627 from LeNitrous/scoreprocessor-comment-typo
Fix typo on ScoreProcessor comment
2020-01-27 10:18:56 +09:00
unknown
a6124ae499 fix typo on ScoreProcessor xmldoc 2020-01-27 08:24:15 +08:00
Andrei Zavatski
6463a32f58 Split AccentColour setter in two lines 2020-01-26 17:42:07 +03:00
Andrei Zavatski
e54ea92c60 Use virtual property for OsuTabControl.AccentColour 2020-01-26 17:21:22 +03:00
Andrei Zavatski
891f9a9b18 Remove unused using 2020-01-26 16:49:39 +03:00
Andrei Zavatski
cd0fcfabd9 Merge master with conflicts resolved 2020-01-26 16:35:07 +03:00
Dean Herbert
b424381e65
Merge pull request #7597 from EVAST9919/colour-provider-implementation
Implement OverlayColourProvider component
2020-01-26 22:06:55 +09:00
Dean Herbert
97c80529d5 Adjust wave colours slightly 2020-01-26 21:47:40 +09:00
Andrei Zavatski
49c5d5b23d Make colour provider readonly 2020-01-26 14:06:05 +03:00
Andrei Zavatski
1305634c52 Simplify colour provider caching 2020-01-26 14:02:05 +03:00
Andrei Zavatski
852e622f02 Fix broken BreadcrumbControl 2020-01-26 13:12:35 +03:00
Dean Herbert
2d74609f50 Fix crash due to misordered selection events 2020-01-26 19:06:50 +09:00
Andrei Zavatski
e442e8535b Remake OsuTabControl.AccentColour 2020-01-26 12:57:19 +03:00
Andrei Zavatski
6c1fa05804 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-26 12:48:01 +03:00
Andrei Zavatski
8e470678c7 Rename convert() to getColour() 2020-01-26 12:42:23 +03:00
Andrei Zavatski
750a4476d8 Simplify getBaseHue function 2020-01-26 12:41:21 +03:00
Andrei Zavatski
6dee287a82 Move private methods below public 2020-01-26 12:39:15 +03:00
Andrei Zavatski
406bc23fde Rename incorrect colours 2020-01-26 12:38:20 +03:00
Dean Herbert
bd7c137394 Remap osu!mania dual stage key bindings to be more ergonomic 2020-01-26 18:34:43 +09:00
Andrei Zavatski
ed314ee935 Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation 2020-01-26 12:28:46 +03:00
Dean Herbert
91aa2ad990
Merge pull request #7593 from turbedi/LegacyDecoder_changes
Minor cleanups for Legacy Storyboard/Beatmap decoder
2020-01-26 17:56:59 +09:00
Dean Herbert
eabb5a8701 Use ToString instead of Substring 2020-01-26 17:40:38 +09:00
Dean Herbert
50ab5a7d07 Merge remote-tracking branch 'upstream/master' into LegacyDecoder_changes 2020-01-26 17:38:44 +09:00
Dean Herbert
87816305d6
Merge pull request #7613 from peppy/remove-fastlane-build-target
Remove build target from Fastfile
2020-01-26 17:34:11 +09:00
Dean Herbert
88146663d1
Merge pull request #7618 from TheWildTree/move-reverse-comparer
Move reverse-order comparer to ChannelTabControl
2020-01-26 16:17:18 +09:00
TheWildTree
d2a032ca8d Move reverse-order comparer to ChannelTabControl 2020-01-25 22:16:21 +01:00
Dean Herbert
83db9f6347
Merge pull request #7614 from iiSaLMaN/fix-nre
Fix NullReferenceException on main menu for mobile game hosts
2020-01-25 18:14:39 +09:00
Salman Ahmed
8aec9e4500 Fix NullReferenceException on main menu for mobile game hsots 2020-01-25 11:41:26 +03:00
Dean Herbert
9a960a60e3 Remove build target from Fastfile 2020-01-25 17:08:24 +09:00