1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 21:03:08 +08:00
Commit Graph

25655 Commits

Author SHA1 Message Date
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
0e9ab8c76b Rename test scene to match 2020-01-24 13:39:47 +09:00
Dan Balasescu
9f8e3c21e0
Merge pull request #7594 from peppy/fix-editor-rate-pollution
Fix editor rate adjustment polluting global beatmap rate
2020-01-24 13:36:47 +09:00
Dean Herbert
e4702ffe9e Fix editor rate adjustment polluting global beatmap rate 2020-01-24 13:10:02 +09:00
Dean Herbert
8122bdf2d8
Merge pull request #7317 from EVAST9919/colour-score-meter
Implement ColourHitErrorMeter
2020-01-24 12:28:03 +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
4bab8bcdcc
Merge pull request #7592 from EVAST9919/comments-counter-integration
Add TotalCommentsCounter to CommentsContainer
2020-01-24 11:43:28 +09:00
Dean Herbert
5863576ce4 Add comment as to why counter is zeroes only in Show method 2020-01-24 11:42:33 +09:00
Berkan Diler
6658bdb223 Fix CodeFactor issues 2020-01-23 16:34:43 +01:00
Berkan Diler
316a764f6f Minor cleanups for Legacy Storyboard/Beatmap decoder 2020-01-23 16:23:53 +01:00
Andrei Zavatski
6493f24547 Add TotalCommentsCounter to CommentsContainer 2020-01-23 15:56:01 +03: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
f5b280971f
Merge pull request #7460 from EVAST9919/view-comments-via-propery
Allow CommentsContainer refetch comments using a method
2020-01-23 19:17:48 +09:00
Andrei Zavatski
0c3120d965 Fix possible crash due to not loaded api 2020-01-23 12:59:53 +03:00
Andrei Zavatski
667fdb907c Call the method directly rather that trigger a bindable 2020-01-23 12:21:16 +03:00
Andrei Zavatski
6c3c4f1ea6 Merge remote-tracking branch 'refs/remotes/ppy/master' into view-comments-via-propery 2020-01-23 12:14:50 +03:00
Dean Herbert
b8040ac99a
Merge pull request #7590 from peppy/update-country-names
Update country names
2020-01-23 18:03:35 +09:00
Dean Herbert
ca94850ce4
Merge branch 'master' into view-comments-via-propery 2020-01-23 17:47:40 +09:00
Dean Herbert
a6d97f8ee6
Merge pull request #7577 from ProTheory8/mod-autoopen
Make Difficulty Adjust mod customisation menu open automatically
2020-01-23 17:03:04 +09:00
Dean Herbert
32fb87acec Update country names 2020-01-23 16:45:30 +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
0647b4bfad Merge remote-tracking branch 'upstream/master' into timeline-maybe 2020-01-23 16:20:45 +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
Dan Balasescu
0df9703c46
Merge branch 'master' into mod-autoopen 2020-01-23 16:04:43 +09:00
Dan Balasescu
a9e4bdff33
Merge pull request #7588 from peppy/i-beat-snapping
Move beat snapping to its own interface
2020-01-23 16:04:34 +09:00
Dean Herbert
a696bab82f Merge branch 'decouple-blueprint-container' into timeline-maybe 2020-01-23 16:02:08 +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
d3262a5667 Cache EditorBeatmap in test 2020-01-23 15:51:00 +09:00
Dean Herbert
289be7a17b Merge branch 'i-beat-snapping' into timeline-maybe 2020-01-23 15:45:33 +09:00
Dan Balasescu
e988976012
Merge branch 'master' into mod-autoopen 2020-01-23 15:34:19 +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