7588c574a2
Fix presenting a beatmap from a different ruleset not working
2020-01-29 19:37:54 +09:00
7f946047f9
Adjust styling to closer match osu-web
2020-01-29 19:25:31 +09:00
d908bc2693
Remove unnecessary extra spritetext
2020-01-29 18:44:30 +09:00
db3e360229
Merge branch 'master' into fix-carousel-missing-import
2020-01-29 18:06:27 +09:00
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
77c06b1c6e
Fix beatmap carousel potentially missing beatmap imports
2020-01-29 17:09:12 +09:00
37c7fe30fa
Merge branch 'master' into keyboard-composition-tools
2020-01-29 16:52:47 +09:00
66b8d38d42
Merge branch 'master' into selection-composition-conformity
2020-01-29 16:52:45 +09:00
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
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
e553a9b9e0
Merge branch 'master' into distance-snap-grid-correct-colouring
2020-01-29 16:09:35 +09:00
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
9954b67bda
Merge branch 'master' into reset-test-storage
2020-01-29 15:52:52 +09:00
849e453c35
Merge remote-tracking branch 'upstream/master' into reset-test-storage
2020-01-29 15:49:05 +09:00
ec015d750b
Merge remote-tracking branch 'origin/master' into reverse-winding
2020-01-29 15:38:06 +09:00
17294b1b09
Make wind down max value 200%
2020-01-29 15:34:36 +09:00
018c005c71
Merge branch 'master' into distance-snap-grid-correct-colouring
2020-01-29 15:33:07 +09:00
0d6fd0a54a
Merge branch 'master' into standardise-zoom-levels
2020-01-29 15:32:57 +09:00
65ac412ff8
Merge branch 'master' into fix-beat-snap
2020-01-29 15:32:27 +09:00
391681b7af
Separate calculation to follow other examples
2020-01-29 15:16:48 +09:00
7d05840ee0
Merge branch 'master' into select-tool
2020-01-29 15:04:22 +09:00
ea2ee53ee3
Merge branch 'master' into timline-beat-lines
2020-01-29 14:44:07 +09:00
9a47428bfd
Remove out of date comment
2020-01-29 14:40:42 +09:00
abe0041b65
Merge branch 'master' into select-tool
2020-01-29 14:29:12 +09:00
4d43833db4
Merge branch 'master' into timline-beat-lines
2020-01-29 14:12:00 +09:00
b10143fdf2
Merge branch 'master' into fix-key-count-mod-affect
2020-01-29 14:11:59 +09:00
aa597c1934
Copy documentation across to SettingsSlider
2020-01-29 12:55:07 +09:00
f21142ae50
Merge remote-tracking branch 'upstream/master' into slider-tooltip
2020-01-29 12:50:44 +09:00
cfc4eaff59
Fix display being incorrect when MaxValue is not 1
2020-01-29 12:50:21 +09:00
0e0c730095
Add a method to recycle test storage between runs
2020-01-28 19:44:32 +09:00
894642d588
add xmldoc and formatting
2020-01-28 18:04:00 +08:00
12ff51f686
Fix key count being incorrectly adjusted by hard/easy mods
2020-01-28 17:21:50 +09:00
5a2fd18bdd
Allow better async support for CommentsContainer
2020-01-28 10:21:27 +03:00
4e884fc6f4
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-recolour
2020-01-28 10:15:10 +03:00
41f55dba91
Merge pull request #7637 from EVAST9919/overlay-header-background
...
Refactor background creation in OverlayHeader
2020-01-28 16:06:31 +09:00
40379a5e22
Use foreach
2020-01-28 16:04:13 +09:00
dbb89cfde7
Merge remote-tracking branch 'upstream/master' into timline-beat-lines
2020-01-28 16:03:50 +09:00
f48c7db827
Use Drawable.Empty instead of container
2020-01-28 15:41:09 +09:00
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
7e0c45de6d
Allow selecting composition tools using 1-4 keys
2020-01-28 15:09:03 +09:00
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
596a01661c
Remove 1ms offset and update tests
2020-01-28 13:42:22 +09:00
a3cfeb08d4
remove unused assignment
2020-01-28 12:34:17 +08:00
aa264cd2a8
allow tooltip to show as percentage as needed
2020-01-28 12:32:30 +08:00
4bb33046ca
Standardise editor timeline zoom across maps of all lengths
2020-01-28 13:03:06 +09:00
58654f28b6
Fix beat snap implementation being incorrect
2020-01-28 12:48:24 +09:00
29daabb40a
Fix distance snap grid showing incorrect colouring
...
Now matches timeline colours (based on timing point).
2020-01-28 11:59:21 +09:00
ce95b4a106
TotalCommentsCounter improvements
2020-01-28 05:57:45 +03:00
ac904194d3
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-recolour
2020-01-28 05:52:32 +03:00
d9e21a572f
remove unecessary comment
2020-01-28 07:13:28 +08:00
