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

25919 Commits

Author SHA1 Message Date
Dean Herbert
41f55dba91
Merge pull request #7637 from EVAST9919/overlay-header-background
Refactor background creation in OverlayHeader
2020-01-28 16:06:31 +09:00
Dean Herbert
40379a5e22 Use foreach 2020-01-28 16:04:13 +09:00
Dean Herbert
dbb89cfde7 Merge remote-tracking branch 'upstream/master' into timline-beat-lines 2020-01-28 16:03:50 +09:00
Dean Herbert
f48c7db827 Use Drawable.Empty instead of container 2020-01-28 15:41:09 +09:00
Dean Herbert
a6cac072ee Change default method style for better IDE autocompletion 2020-01-28 15:32:48 +09:00
Dean Herbert
8e2159e4eb Ensure selection tool correctly matches selection state
- When a selection is made (via the timeline) the selection tool should become the select tool.
- When the selection tool is changed to anything *but* the select tool, the selection should be cleared.
2020-01-28 15:13:12 +09:00
Dean Herbert
7e0c45de6d Allow selecting composition tools using 1-4 keys 2020-01-28 15:09:03 +09:00
Dean Herbert
e81d3c51ed Move select tool to an actual tool implementation
Also tidies up radio button action firing so calling Select actually fires the associated action in all cases.
2020-01-28 15:05:29 +09:00
Dean Herbert
596a01661c Remove 1ms offset and update tests 2020-01-28 13:42:22 +09:00
unknown
a3cfeb08d4 remove unused assignment 2020-01-28 12:34:17 +08:00
unknown
aa264cd2a8 allow tooltip to show as percentage as needed 2020-01-28 12:32:30 +08:00
Dean Herbert
4bb33046ca Standardise editor timeline zoom across maps of all lengths 2020-01-28 13:03:06 +09:00
Dean Herbert
58654f28b6 Fix beat snap implementation being incorrect 2020-01-28 12:48:24 +09:00
Dean Herbert
29daabb40a Fix distance snap grid showing incorrect colouring
Now matches timeline colours (based on timing point).
2020-01-28 11:59:21 +09:00
Andrei Zavatski
ce95b4a106 TotalCommentsCounter improvements 2020-01-28 05:57:45 +03:00
Andrei Zavatski
ac904194d3 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-recolour 2020-01-28 05:52:32 +03:00
unknown
d9e21a572f remove unecessary comment 2020-01-28 07:13:28 +08:00
Dean Herbert
01cf417569
Merge pull request #7638 from huoyaoyuan/type-switch
Use type switch in SerializationWriter
2020-01-27 23:18:30 +09:00
Huo Yaoyuan
b14c7bd171 Use type switch in SearializationWriter. 2020-01-27 21:49:34 +08:00
Andrei Zavatski
55d78dbc57 CI fix 2020-01-27 16:45:10 +03:00
Andrei Zavatski
97fb7a5593 Add test scene 2020-01-27 15:42:46 +03:00
Andrei Zavatski
e6fa793d56 Refactor background creation in OverlayHeader 2020-01-27 15:36:19 +03:00
Andrei Zavatski
100532845b Recolour CommentsContainer 2020-01-27 15:07:24 +03:00
Andrei Zavatski
68503bf771 Recolour CommentsShowMoreButton 2020-01-27 15:00:56 +03:00
Andrei Zavatski
12ca28ea6d Recolour CommentsHeader 2020-01-27 14:58:27 +03:00
Andrei Zavatski
ed2737e027 Recolour TotalCommentCounter 2020-01-27 14:47:47 +03:00
Dan Balasescu
d0715700eb
Merge pull request #7623 from peppy/fix-ss-click-crash
Fix crash due to misordered selection events
2020-01-27 20:12:40 +09:00
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
Andrei Zavatski
79cdfc6dc2 Use OverlayColourProvider 2020-01-27 12:55:19 +03:00
Andrei Zavatski
20268ba45b Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-scores-update-new 2020-01-27 12:37:44 +03: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
9a2867d3d9 Rename test class 2020-01-27 18:10:42 +09:00
Dean Herbert
d5fda053f4 Use centre origin/anchors 2020-01-27 18:09:54 +09:00
Dean Herbert
493390b750 Rename class to TimelineTickDisplay 2020-01-27 18:08:01 +09:00
Dean Herbert
084fa2f04a Add timeline beat display 2020-01-27 17:38:50 +09:00
Dean Herbert
e24c4ab901 Adjust zoom defaults for timeline to be more useful 2020-01-27 17:34:40 +09:00
Dean Herbert
03b7c6cfa7 Add base test scene for timeline 2020-01-27 17:34:40 +09:00
Dean Herbert
df665c3a3c Move beat index colour retrieval to static function 2020-01-27 17:34:40 +09:00
Dean Herbert
508b92e611 Update beat divisor colours to be more distinguishable
Close to osu-stable
2020-01-27 17:34:40 +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