Commit Graph

25499 Commits

Author SHA1 Message Date
6c3c4f1ea6 Merge remote-tracking branch 'refs/remotes/ppy/master' into view-comments-via-propery 2020-01-23 12:14:50 +03:00
b8040ac99a Merge pull request #7590 from peppy/update-country-names
Update country names
2020-01-23 18:03:35 +09:00
ca94850ce4 Merge branch 'master' into view-comments-via-propery 2020-01-23 17:47:40 +09:00
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
32fb87acec Update country names 2020-01-23 16:45:30 +09:00
5646f7777e Add comment about custom SelectionHandler 2020-01-23 16:23:42 +09:00
5cadbb1ffb Move timeline blueprint to own class 2020-01-23 16:22:43 +09:00
0647b4bfad Merge remote-tracking branch 'upstream/master' into timeline-maybe 2020-01-23 16:20:45 +09:00
9d90799447 Remove useless container 2020-01-23 16:20:42 +09:00
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
0df9703c46 Merge branch 'master' into mod-autoopen 2020-01-23 16:04:43 +09:00
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
a696bab82f Merge branch 'decouple-blueprint-container' into timeline-maybe 2020-01-23 16:02:08 +09:00
02ae92418f Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container 2020-01-23 15:54:46 +09:00
d3262a5667 Cache EditorBeatmap in test 2020-01-23 15:51:00 +09:00
289be7a17b Merge branch 'i-beat-snapping' into timeline-maybe 2020-01-23 15:45:33 +09:00
e988976012 Merge branch 'master' into mod-autoopen 2020-01-23 15:34:19 +09:00
ccf911884b Remove passed in BaetDivisor 2020-01-23 15:31:56 +09:00
098d643955 Move beat snapping to its own interface 2020-01-23 14:39:56 +09:00
56c044c44a Move beat snapping to its own interface 2020-01-23 14:30:25 +09:00
cb09c2e144 Add support for dragging outside visible extents 2020-01-23 14:30:25 +09:00
477e1b7d27 Rename TimelineHitObjectDisplay to TimelineBlueprintContainer 2020-01-23 14:30:25 +09:00
9d2a46df89 Add beat snapping to timeline movement 2020-01-23 14:30:25 +09:00
c76f76e5aa Fix being able to drag out of the blueprint intending to be moved 2020-01-23 14:30:25 +09:00
aa1a226ab7 Remove unused ScreenSpaceStartPosition field 2020-01-23 14:30:25 +09:00
53bdf72592 Allow basic timeline selection temporal movement 2020-01-23 14:30:25 +09:00
cb6e7425ae Make dragbox stateful to fix blueprint movement 2020-01-23 14:30:25 +09:00
f0d810fe20 Follow start time and duration changes 2020-01-23 14:30:08 +09:00
63cef8b8b7 Rename nested classes to be more appropriate 2020-01-23 14:30:08 +09:00
89d90fdfa0 Fix drag not updating until mouse is moved while scrolling timeline 2020-01-23 14:30:07 +09:00
a8ec4907c4 Fix selections while scrolling timeline 2020-01-23 14:27:21 +09:00
c4395b1cea Clean up nested class implementations 2020-01-23 14:27:20 +09:00
482409e776 Colour extension bars of long objects 2020-01-23 14:26:33 +09:00
a6775d1bd3 Implement custom drag box and allow drag seeking once again 2020-01-23 14:26:33 +09:00
2ef8714d67 Merge pull request #7587 from peppy/update-framework
Update framework
2020-01-23 11:06:37 +09:00
c0935b9b86 Update naming in tournament 2020-01-22 23:13:21 +09:00
8ea354571c Update naming 2020-01-22 23:04:37 +09:00
8c29093d1c Merge remote-tracking branch 'smoogipoo/void-joystick-release-returns' into update-framework 2020-01-22 22:58:00 +09:00
8a7f7c5e46 Merge remote-tracking branch 'smoogipoo/void-key-up-returns' into update-framework 2020-01-22 22:57:56 +09:00
7c62cc3ac3 Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework 2020-01-22 22:57:52 +09:00
5f8ffd9346 Merge remote-tracking branch 'smoogipoo/void-release-returns' into update-framework 2020-01-22 22:57:40 +09:00
e2c4cffc9a Update framework 2020-01-22 22:57:09 +09:00
3164585379 Add mod setting (de)serialization support (#7548)
Add mod setting (de)serialization support
2020-01-22 22:41:39 +09:00
cbba708931 Merge branch 'master' into online-mod-settings 2020-01-22 22:15:41 +09:00
03b61e4a5a Throw exception rather than returning nulls 2020-01-22 20:00:36 +09:00
df92b0d3dc Merge branch 'master' into mod-autoopen 2020-01-22 15:01:53 +05:00
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
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
fdd746a522 Merge pull request #7582 from raouls555/hex-alpha
Allow parsing hex colour codes with alpha
2020-01-22 13:01:35 +09:00
03b6a3ddc3 Allow parsing hex colour codes with alpha 2020-01-21 23:22:08 +01:00