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
|
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 |
|
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
|
12ff51f686
|
Fix key count being incorrectly adjusted by hard/easy mods
|
2020-01-28 17:21:50 +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
|
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
|
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
|
d5fda053f4
|
Use centre origin/anchors
|
2020-01-27 18:09:54 +09:00 |
|
Dean Herbert
|
493390b750
|
Rename class to TimelineTickDisplay
|
2020-01-27 18:08:01 +09:00 |
|
Dean Herbert
|
084fa2f04a
|
Add timeline beat display
|
2020-01-27 17:38:50 +09:00 |
|
Dean Herbert
|
e24c4ab901
|
Adjust zoom defaults for timeline to be more useful
|
2020-01-27 17:34:40 +09:00 |
|
Dean Herbert
|
df665c3a3c
|
Move beat index colour retrieval to static function
|
2020-01-27 17:34:40 +09:00 |
|
Dean Herbert
|
508b92e611
|
Update beat divisor colours to be more distinguishable
Close to osu-stable
|
2020-01-27 17:34:40 +09:00 |
|
Dean Herbert
|
7aa5e8c23e
|
Limit input propagation correctly
|
2020-01-27 14:55:47 +09:00 |
|
Dean Herbert
|
1c64b70b06
|
Revert "Fix crash due to misordered selection events"
This reverts commit 2d74609f50.
|
2020-01-27 14:53:24 +09:00 |
|
Dean Herbert
|
2d74609f50
|
Fix crash due to misordered selection events
|
2020-01-26 19:06:50 +09:00 |
|
Salman Ahmed
|
8aec9e4500
|
Fix NullReferenceException on main menu for mobile game hsots
|
2020-01-25 11:41:26 +03:00 |
|
Dean Herbert
|
92a5fbe948
|
Merge branch 'master' into star-filtering
|
2020-01-24 23:28:36 +09:00 |
|
smoogipoo
|
45a25214ab
|
Make upper and lower bounds inclusive
|
2020-01-24 19:39:21 +09:00 |
|
Dan Balasescu
|
9be3d7a161
|
Merge pull request #7591 from peppy/improve-song-select-uiscale
Improve song select display on ultrawide displays (or when UI scale is set low)
|
2020-01-24 19:14:46 +09:00 |
|
smoogipoo
|
9e0e7be8d0
|
Modernise filter implementation
|
2020-01-24 18:57:17 +09:00 |
|
smoogipoo
|
12cc97ca31
|
Merge remote-tracking branch 'origin/master' into star-filtering
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
# osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
# osu.Game/Screens/Select/FilterControl.cs
# osu.Game/Screens/Select/FilterCriteria.cs
|
2020-01-24 18:30:52 +09:00 |
|
Dan Balasescu
|
368587fc06
|
Merge branch 'master' into timeline-maybe
|
2020-01-24 18:08:29 +09:00 |
|
smoogipoo
|
811ddb02a4
|
General refactoring
|
2020-01-24 17:50:36 +09:00 |
|
smoogipoo
|
28727bbafd
|
Fix crash when deselecting via ctrl+click
|
2020-01-24 17:30:37 +09:00 |
|
Dean Herbert
|
f9e93e2a6a
|
Fix regressed input handling order
|
2020-01-24 17:15:05 +09:00 |
|
Dean Herbert
|
827f48c29b
|
Adjust fade
|
2020-01-24 16:32:39 +09:00 |
|
Dean Herbert
|
6f44f8a1ad
|
Ensure only run once when not current screen
|
2020-01-24 16:27:49 +09:00 |
|
Dean Herbert
|
f9a54dfb1d
|
Tidy up implementation and show on returning with new song
|
2020-01-24 16:27:37 +09:00 |
|
Dean Herbert
|
3f6fa93365
|
Merge remote-tracking branch 'upstream/master' into main-menu-song-ticker
|
2020-01-24 16:08:34 +09:00 |
|
Dean Herbert
|
f5a3de3187
|
Merge remote-tracking branch 'upstream/master' into improve-song-select-uiscale
|
2020-01-24 15:44:40 +09:00 |
|
Dean Herbert
|
fdde4a6858
|
Tidy up song select hierarchy to be more readable
|
2020-01-24 15:44:31 +09:00 |
|
Dean Herbert
|
c0a233e8bb
|
Align background wedge with carousel
|
2020-01-24 15:00:10 +09:00 |
|
Dean Herbert
|
997b49f6dc
|
Change display to always show progress bar, only hiding seeking handle instead
|
2020-01-24 14:21:22 +09:00 |
|
Dean Herbert
|
da65fff48e
|
Merge remote-tracking branch 'upstream/master' into collapse-graph-option
|
2020-01-24 13:55:42 +09:00 |
|
Dean Herbert
|
ea2271c905
|
Merge branch 'master' into timeline-maybe
|
2020-01-24 13:39:51 +09:00 |
|
Dean Herbert
|
e4702ffe9e
|
Fix editor rate adjustment polluting global beatmap rate
|
2020-01-24 13:10:02 +09:00 |
|
Dean Herbert
|
eb5abcab8c
|
Rename and simplify circle logic
|
2020-01-24 12:01:40 +09:00 |
|
Dean Herbert
|
851b891285
|
Fix incorrect insert logic
|
2020-01-24 12:01:14 +09:00 |
|
Dean Herbert
|
c390348eab
|
Merge remote-tracking branch 'upstream/master' into colour-score-meter
|
2020-01-24 11:45:33 +09:00 |
|