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 |
|
Dean Herbert
|
f8cb898516
|
Improve song select display on ultrawide displays (or when UI scale is set low)
|
2020-01-23 20:03:52 +09:00 |
|
Dean Herbert
|
5646f7777e
|
Add comment about custom SelectionHandler
|
2020-01-23 16:23:42 +09:00 |
|
Dean Herbert
|
5cadbb1ffb
|
Move timeline blueprint to own class
|
2020-01-23 16:22:43 +09:00 |
|
Dean Herbert
|
9d90799447
|
Remove useless container
|
2020-01-23 16:20:42 +09:00 |
|
Dean Herbert
|
143d47ec93
|
Merge pull request #7538 from peppy/decouple-blueprint-container
Decouple blueprint container to allow usage in timeline
|
2020-01-23 16:13:51 +09:00 |
|
Dean Herbert
|
02ae92418f
|
Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container
|
2020-01-23 15:54:46 +09:00 |
|
Dean Herbert
|
289be7a17b
|
Merge branch 'i-beat-snapping' into timeline-maybe
|
2020-01-23 15:45:33 +09:00 |
|
Dean Herbert
|
ccf911884b
|
Remove passed in BaetDivisor
|
2020-01-23 15:31:56 +09:00 |
|
Dean Herbert
|
098d643955
|
Move beat snapping to its own interface
|
2020-01-23 14:39:56 +09:00 |
|
Dean Herbert
|
56c044c44a
|
Move beat snapping to its own interface
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
cb09c2e144
|
Add support for dragging outside visible extents
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
477e1b7d27
|
Rename TimelineHitObjectDisplay to TimelineBlueprintContainer
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
9d2a46df89
|
Add beat snapping to timeline movement
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
c76f76e5aa
|
Fix being able to drag out of the blueprint intending to be moved
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
aa1a226ab7
|
Remove unused ScreenSpaceStartPosition field
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
53bdf72592
|
Allow basic timeline selection temporal movement
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
cb6e7425ae
|
Make dragbox stateful to fix blueprint movement
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
f0d810fe20
|
Follow start time and duration changes
|
2020-01-23 14:30:08 +09:00 |
|
Dean Herbert
|
63cef8b8b7
|
Rename nested classes to be more appropriate
|
2020-01-23 14:30:08 +09:00 |
|
Dean Herbert
|
89d90fdfa0
|
Fix drag not updating until mouse is moved while scrolling timeline
|
2020-01-23 14:30:07 +09:00 |
|
Dean Herbert
|
a8ec4907c4
|
Fix selections while scrolling timeline
|
2020-01-23 14:27:21 +09:00 |
|
Dean Herbert
|
c4395b1cea
|
Clean up nested class implementations
|
2020-01-23 14:27:20 +09:00 |
|
Dean Herbert
|
482409e776
|
Colour extension bars of long objects
|
2020-01-23 14:26:33 +09:00 |
|
Dean Herbert
|
a6775d1bd3
|
Implement custom drag box and allow drag seeking once again
|
2020-01-23 14:26:33 +09:00 |
|
Dean Herbert
|
8a7f7c5e46
|
Merge remote-tracking branch 'smoogipoo/void-key-up-returns' into update-framework
|
2020-01-22 22:57:56 +09:00 |
|
Dean Herbert
|
7c62cc3ac3
|
Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework
|
2020-01-22 22:57:52 +09:00 |
|