1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 18:07:36 +08:00
Commit Graph

25737 Commits

Author SHA1 Message Date
Dan Balasescu
912aa1e5fa
Merge pull request #7649 from peppy/selection-composition-conformity
Ensure selection tool correctly matches selection state
2020-01-29 17:09:20 +09:00
Dean Herbert
77c06b1c6e Fix beatmap carousel potentially missing beatmap imports 2020-01-29 17:09:12 +09:00
Dean Herbert
1db353558b Add present beatmap tests 2020-01-29 17:09:12 +09:00
Dean Herbert
6e8bd35373 Move navigation / game test scenes to new namespace 2020-01-29 17:06:05 +09:00
Dan Balasescu
37c7fe30fa
Merge branch 'master' into keyboard-composition-tools 2020-01-29 16:52:47 +09:00
Dan Balasescu
66b8d38d42
Merge branch 'master' into selection-composition-conformity 2020-01-29 16:52:45 +09:00
Dan Balasescu
73f94c0be3
Merge pull request #7643 from peppy/distance-snap-grid-correct-colouring
Distance snap grid correct colouring
2020-01-29 16:52:34 +09:00
Dan Balasescu
37036b855b
Merge pull request #7654 from peppy/reset-test-storage
Add a method to recycle test storage between runs
2020-01-29 16:37:37 +09:00
Dan Balasescu
e553a9b9e0
Merge branch 'master' into distance-snap-grid-correct-colouring 2020-01-29 16:09:35 +09:00
Dan Balasescu
63501c188a
Merge pull request #7644 from peppy/standardise-zoom-levels
Standardise editor timeline zoom across maps of all lengths
2020-01-29 16:04:25 +09:00
Dan Balasescu
9954b67bda
Merge branch 'master' into reset-test-storage 2020-01-29 15:52:52 +09:00
Dan Balasescu
6d47eead43
Merge pull request #7642 from peppy/fix-beat-snap
Fix beat snap implementation being incorrect
2020-01-29 15:51:01 +09:00
Dean Herbert
849e453c35 Merge remote-tracking branch 'upstream/master' into reset-test-storage 2020-01-29 15:49:05 +09:00
smoogipoo
ec015d750b Merge remote-tracking branch 'origin/master' into reverse-winding 2020-01-29 15:38:06 +09:00
smoogipoo
17294b1b09 Make wind down max value 200% 2020-01-29 15:34:36 +09:00
Dan Balasescu
018c005c71
Merge branch 'master' into distance-snap-grid-correct-colouring 2020-01-29 15:33:07 +09:00
Dan Balasescu
0d6fd0a54a
Merge branch 'master' into standardise-zoom-levels 2020-01-29 15:32:57 +09:00
Dan Balasescu
65ac412ff8
Merge branch 'master' into fix-beat-snap 2020-01-29 15:32:27 +09:00
Dan Balasescu
e0c3fa0cc1
Merge pull request #7647 from peppy/select-tool
Move select tool to an actual tool implementation
2020-01-29 15:32:11 +09:00
smoogipoo
391681b7af Separate calculation to follow other examples 2020-01-29 15:16:48 +09:00
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
smoogipoo
9a47428bfd Remove out of date comment 2020-01-29 14:40:42 +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
Dean Herbert
0e0c730095 Add a method to recycle test storage between runs 2020-01-28 19:44:32 +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