1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 13:07:24 +08:00
Commit Graph

25582 Commits

Author SHA1 Message Date
Dean Herbert
7d05840ee0
Merge branch 'master' into select-tool 2020-01-29 15:04:22 +09:00
Dan Balasescu
afeb777e0f
Merge pull request #7634 from peppy/timline-beat-lines
Add beat ticks to editor timeline
2020-01-29 14:44:19 +09:00
Dan Balasescu
ea2ee53ee3
Merge branch 'master' into timline-beat-lines 2020-01-29 14:44:07 +09:00
Dan Balasescu
7df48397a0
Merge pull request #7652 from peppy/fix-key-count-mod-affect
Fix key count being incorrectly adjusted by hard/easy mods
2020-01-29 14:43:54 +09:00
Dan Balasescu
abe0041b65
Merge branch 'master' into select-tool 2020-01-29 14:29:12 +09:00
Dan Balasescu
1b1cce0114
Merge pull request #7653 from peppy/fix-navigation-test-crash
Fix navigation test crashing when raw input is disabled
2020-01-29 14:28:09 +09:00
Dan Balasescu
4d43833db4
Merge branch 'master' into timline-beat-lines 2020-01-29 14:12:00 +09:00
Dan Balasescu
b10143fdf2
Merge branch 'master' into fix-key-count-mod-affect 2020-01-29 14:11:59 +09:00
Dan Balasescu
c35c84882f
Merge branch 'master' into fix-navigation-test-crash 2020-01-29 14:11:41 +09:00
Dean Herbert
5bb5a06b8e
Merge pull request #7659 from smoogipoo/fix-ss-test-failures
Fix random PlaySongSelect test failures
2020-01-29 14:11:29 +09:00
smoogipoo
f457ecaf83 Fix random test failures 2020-01-29 13:54:12 +09:00
Dean Herbert
80d2c2c3f2
Merge pull request #7645 from LeNitrous/slider-tooltip
Allow OsuSliderBar tooltip to show as percentage as needed
2020-01-29 13:36:08 +09:00
Dean Herbert
aa597c1934 Copy documentation across to SettingsSlider 2020-01-29 12:55:07 +09:00
Dean Herbert
f21142ae50 Merge remote-tracking branch 'upstream/master' into slider-tooltip 2020-01-29 12:50:44 +09:00
Dean Herbert
cfc4eaff59 Fix display being incorrect when MaxValue is not 1 2020-01-29 12:50:21 +09:00
Dean Herbert
2498709d06 Fix navigation test crashing when raw input is disabled 2020-01-28 19:47:40 +09:00
unknown
894642d588 add xmldoc and formatting 2020-01-28 18:04:00 +08:00
Dean Herbert
12ff51f686 Fix key count being incorrectly adjusted by hard/easy mods 2020-01-28 17:21:50 +09:00
Dean Herbert
99d5398262
Merge pull request #7650 from peppy/change-default-method-style
Change default method style for better IDE autocompletion
2020-01-28 17:08:14 +09:00
Dean Herbert
979070703e
Merge pull request #7636 from EVAST9919/comments-recolour
Make CommentsContainer use OverlayColourProvider
2020-01-28 16:38:18 +09:00
Dan Balasescu
2b1588ee47
Merge branch 'master' into change-default-method-style 2020-01-28 16:26:51 +09:00
Andrei Zavatski
5a2fd18bdd Allow better async support for CommentsContainer 2020-01-28 10:21:27 +03:00
Andrei Zavatski
4e884fc6f4 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-recolour 2020-01-28 10:15:10 +03:00
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
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
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
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
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
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