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
db3e360229
Merge branch 'master' into fix-carousel-missing-import
2020-01-29 18:06:27 +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
77c06b1c6e
Fix beatmap carousel potentially missing beatmap imports
2020-01-29 17:09:12 +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
Dean Herbert
849e453c35
Merge remote-tracking branch 'upstream/master' into reset-test-storage
2020-01-29 15:49:05 +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
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
ea2ee53ee3
Merge branch 'master' into timline-beat-lines
2020-01-29 14:44:07 +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
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
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
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
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
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
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
e6fa793d56
Refactor background creation in OverlayHeader
2020-01-27 15:36:19 +03:00
