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

25646 Commits

Author SHA1 Message Date
TheWildTree
799a86544f Recolor play time border 2020-01-29 21:57:43 +01:00
TheWildTree
088064523b Recolor CentreHeaderContainer 2020-01-29 21:55:41 +01:00
TheWildTree
12a49b74bb Recolor TopHeaderContainer 2020-01-29 21:48:02 +01:00
TheWildTree
c091b31fe8 Recolor basic background boxes 2020-01-29 21:37:51 +01:00
TheWildTree
0ce18256e0 Recolor ProfileTabControl 2020-01-29 21:35:17 +01:00
TheWildTree
65f71b8c12 Make colourProvider accessable from derived classes 2020-01-29 21:23:19 +01:00
Dean Herbert
7f59576f13
Fix percentage-formatted displays containing a space (#7664)
Fix percentage-formatted displays containing a space
2020-01-29 20:37:32 +09:00
Dean Herbert
9f0f09a844
Add a reverse setting for Winding mods (#7222)
Add a reverse setting for Winding mods
2020-01-29 20:29:32 +09:00
Dan Balasescu
9f1adfdcd5
Merge pull request #7554 from EVAST9919/profile-scores-update-new
Update profile scores in line with the web design
2020-01-29 20:09:36 +09:00
smoogipoo
76af8bea5d Fix percentage-formatted displays containing a space 2020-01-29 19:51:24 +09:00
Dan Balasescu
30da9981d6
Merge branch 'master' into profile-scores-update-new 2020-01-29 19:40:44 +09:00
smoogipoo
7f946047f9 Adjust styling to closer match osu-web 2020-01-29 19:25:31 +09:00
smoogipoo
d908bc2693 Remove unnecessary extra spritetext 2020-01-29 18:44:30 +09:00
Dan Balasescu
d401af2cdd
Merge pull request #7662 from peppy/fix-carousel-missing-import
Fix carousel potentially missing import events
2020-01-29 18:28:56 +09:00
Dan Balasescu
db3e360229
Merge branch 'master' into fix-carousel-missing-import 2020-01-29 18:06:27 +09:00
Dean Herbert
c1e1b4098d
Merge pull request #7661 from peppy/navigation-test-split
Move navigation / game test scenes to new namespace
2020-01-29 18:01:15 +09:00
Dan Balasescu
4ea39445e9
Merge branch 'master' into navigation-test-split 2020-01-29 17:29:29 +09:00
Dan Balasescu
77b1bf3ee2
Merge pull request #7648 from peppy/keyboard-composition-tools
Allow selecting composition tools using 1-4 keys
2020-01-29 17:29:11 +09:00
Dean Herbert
c003ae63d5 Ignore failing test for now 2020-01-29 17:17:10 +09:00
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