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

25603 Commits

Author SHA1 Message Date
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
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
2ef8714d67
Merge pull request #7587 from peppy/update-framework
Update framework
2020-01-23 11:06:37 +09:00
Dean Herbert
c0935b9b86 Update naming in tournament 2020-01-22 23:13:21 +09:00
Dean Herbert
8ea354571c Update naming 2020-01-22 23:04:37 +09:00
Dean Herbert
8c29093d1c Merge remote-tracking branch 'smoogipoo/void-joystick-release-returns' into update-framework 2020-01-22 22:58:00 +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
Dean Herbert
5f8ffd9346 Merge remote-tracking branch 'smoogipoo/void-release-returns' into update-framework 2020-01-22 22:57:40 +09:00
Dean Herbert
e2c4cffc9a Update framework 2020-01-22 22:57:09 +09:00
Dean Herbert
3164585379
Add mod setting (de)serialization support (#7548)
Add mod setting (de)serialization support
2020-01-22 22:41:39 +09:00
Dean Herbert
cbba708931
Merge branch 'master' into online-mod-settings 2020-01-22 22:15:41 +09:00
smoogipoo
03b61e4a5a Throw exception rather than returning nulls 2020-01-22 20:00:36 +09:00
ProTheory8
df92b0d3dc Merge branch 'master' into mod-autoopen 2020-01-22 15:01:53 +05:00
Dean Herbert
a28934f9f2
Enforce using get-only auto property where possible (#7566)
Enforce using get-only auto property where possible
2020-01-22 16:38:36 +09:00
Andrei Zavatski
bf2b71f7dd Cleanup OsuTabControl.AccentColour 2020-01-22 09:36:16 +03:00
Andrei Zavatski
87af482823 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-22 09:34:24 +03:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
Dean Herbert
fdd746a522
Merge pull request #7582 from raouls555/hex-alpha
Allow parsing hex colour codes with alpha
2020-01-22 13:01:35 +09:00
Andrei Zavatski
14a961c95b Remove invariance in the OverlayTabItem 2020-01-22 04:41:10 +03:00
raouls555
03b6a3ddc3
Allow parsing hex colour codes with alpha 2020-01-21 23:22:08 +01:00
Dean Herbert
e3a2b20f63 Fix SelectionHandler visibility on remote selection 2020-01-22 01:32:11 +09:00
Dean Herbert
98aaf38649 Fix playfield movement regressing 2020-01-21 23:58:51 +09:00
ProTheory8
9de4424aec Removed TestModCustomisable3 2020-01-21 19:32:53 +05:00
Dean Herbert
83fa4a9bb3 Move circle size to a constant 2020-01-21 22:24:04 +09:00
Dean Herbert
a963d652bc Mark readonly 2020-01-21 20:54:50 +09:00
Dean Herbert
c88bdbd4a0 Share selected hitobjects across multiple blueprint containers 2020-01-21 20:46:39 +09:00
Dean Herbert
1ce78afa98 Disable y offset for now 2020-01-21 19:51:44 +09:00
ProTheory8
b8d2012fc3 Added test 2020-01-21 15:26:51 +05:00
Dean Herbert
2aa8e7dbc9
Merge branch 'master' into get-only-auto-property 2020-01-21 18:56:44 +09:00