1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 19:27:31 +08:00
Commit Graph

16513 Commits

Author SHA1 Message Date
Dan Balasescu
77b1bf3ee2
Merge pull request #7648 from peppy/keyboard-composition-tools
Allow selecting composition tools using 1-4 keys
2020-01-29 17:29:11 +09:00
Dean Herbert
77c06b1c6e Fix beatmap carousel potentially missing beatmap imports 2020-01-29 17:09:12 +09:00
Dan Balasescu
37c7fe30fa
Merge branch 'master' into keyboard-composition-tools 2020-01-29 16:52:47 +09:00
Dan Balasescu
66b8d38d42
Merge branch 'master' into selection-composition-conformity 2020-01-29 16:52:45 +09:00
Dan Balasescu
73f94c0be3
Merge pull request #7643 from peppy/distance-snap-grid-correct-colouring
Distance snap grid correct colouring
2020-01-29 16:52:34 +09:00
Dan Balasescu
37036b855b
Merge pull request #7654 from peppy/reset-test-storage
Add a method to recycle test storage between runs
2020-01-29 16:37:37 +09:00
Dan Balasescu
e553a9b9e0
Merge branch 'master' into distance-snap-grid-correct-colouring 2020-01-29 16:09:35 +09:00
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
9954b67bda
Merge branch 'master' into reset-test-storage 2020-01-29 15:52:52 +09:00
Dean Herbert
849e453c35 Merge remote-tracking branch 'upstream/master' into reset-test-storage 2020-01-29 15:49:05 +09:00
smoogipoo
ec015d750b Merge remote-tracking branch 'origin/master' into reverse-winding 2020-01-29 15:38:06 +09:00
smoogipoo
17294b1b09 Make wind down max value 200% 2020-01-29 15:34:36 +09:00
Dan Balasescu
018c005c71
Merge branch 'master' into distance-snap-grid-correct-colouring 2020-01-29 15:33:07 +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
smoogipoo
391681b7af Separate calculation to follow other examples 2020-01-29 15:16:48 +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
Andrei Zavatski
5fcda01346 Cleanup pass 2020-01-29 06:58:53 +03:00
Dean Herbert
aa597c1934 Copy documentation across to SettingsSlider 2020-01-29 12:55:07 +09:00
Dean Herbert
f21142ae50 Merge remote-tracking branch 'upstream/master' into slider-tooltip 2020-01-29 12:50:44 +09:00
Dean Herbert
cfc4eaff59 Fix display being incorrect when MaxValue is not 1 2020-01-29 12:50:21 +09:00
Andrei Zavatski
dc10e58b4f Add tests for CommentsPage 2020-01-29 06:44:39 +03:00
Andrei Zavatski
e7964023ae Implement CommentsPage class 2020-01-29 06:22:08 +03:00
Andrei Zavatski
c5e0c77bca Refactor NoCommentsPlaceholder 2020-01-29 06:08:11 +03:00
Andrei Zavatski
b947e89a6b Add placeholder for no comments case in CommentsContainer 2020-01-28 16:53:22 +03:00
Dean Herbert
0e0c730095 Add a method to recycle test storage between runs 2020-01-28 19:44:32 +09:00
unknown
894642d588 add xmldoc and formatting 2020-01-28 18:04:00 +08:00
Dean Herbert
12ff51f686 Fix key count being incorrectly adjusted by hard/easy mods 2020-01-28 17:21:50 +09:00
Andrei Zavatski
5a2fd18bdd Allow better async support for CommentsContainer 2020-01-28 10:21:27 +03:00
Andrei Zavatski
4e884fc6f4 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-recolour 2020-01-28 10:15:10 +03:00
Dean Herbert
41f55dba91
Merge pull request #7637 from EVAST9919/overlay-header-background
Refactor background creation in OverlayHeader
2020-01-28 16:06:31 +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
f48c7db827 Use Drawable.Empty instead of container 2020-01-28 15:41:09 +09:00
Dean Herbert
8e2159e4eb Ensure selection tool correctly matches selection state
- When a selection is made (via the timeline) the selection tool should become the select tool.
- When the selection tool is changed to anything *but* the select tool, the selection should be cleared.
2020-01-28 15:13:12 +09:00
Dean Herbert
7e0c45de6d Allow selecting composition tools using 1-4 keys 2020-01-28 15:09:03 +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
a3cfeb08d4 remove unused assignment 2020-01-28 12:34:17 +08: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
29daabb40a Fix distance snap grid showing incorrect colouring
Now matches timeline colours (based on timing point).
2020-01-28 11:59:21 +09:00
Andrei Zavatski
ce95b4a106 TotalCommentsCounter improvements 2020-01-28 05:57:45 +03:00
Andrei Zavatski
ac904194d3 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-recolour 2020-01-28 05:52:32 +03:00
unknown
d9e21a572f remove unecessary comment 2020-01-28 07:13:28 +08:00
Huo Yaoyuan
b14c7bd171 Use type switch in SearializationWriter. 2020-01-27 21:49:34 +08:00
Andrei Zavatski
55d78dbc57 CI fix 2020-01-27 16:45:10 +03:00
Andrei Zavatski
e6fa793d56 Refactor background creation in OverlayHeader 2020-01-27 15:36:19 +03:00
Andrei Zavatski
100532845b Recolour CommentsContainer 2020-01-27 15:07:24 +03:00
Andrei Zavatski
68503bf771 Recolour CommentsShowMoreButton 2020-01-27 15:00:56 +03:00
Andrei Zavatski
12ca28ea6d Recolour CommentsHeader 2020-01-27 14:58:27 +03:00
Andrei Zavatski
ed2737e027 Recolour TotalCommentCounter 2020-01-27 14:47:47 +03:00
Dean Herbert
a5a0eaba0d
Merge branch 'master' into fix-ss-click-crash 2020-01-27 19:35:31 +09:00
Andrei Zavatski
79cdfc6dc2 Use OverlayColourProvider 2020-01-27 12:55:19 +03:00
Andrei Zavatski
20268ba45b Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-scores-update-new 2020-01-27 12:37:44 +03:00
Dean Herbert
e37ae589ad
Merge branch 'master' into no-control-overlay-headers 2020-01-27 18:35:33 +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
Dan Balasescu
d7b32940bd
Merge branch 'master' into fix-ss-click-crash 2020-01-27 15:40:45 +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
292a82ac27 Fix incorrect propagation of stream/build on initial display with build 2020-01-27 14:52:21 +09:00
Dean Herbert
834e82d543 Add comprehensive tests for changelog overlay
Includes failing case
2020-01-27 14:50:41 +09:00
Dan Balasescu
d0ef5a8a8c
Merge branch 'master' into breadcrumb-fix 2020-01-27 13:18:23 +09:00
smoogipoo
431b1489b9 Add test 2020-01-27 13:16:36 +09:00
Dean Herbert
1f0aaabf7b Add tests 2020-01-27 12:21:17 +09:00
smoogipoo
15fd8596c2 Fix cursor not hiding for screenshots 2020-01-27 12:16:00 +09:00
Dean Herbert
df30c4dbeb
Merge pull request #7627 from LeNitrous/scoreprocessor-comment-typo
Fix typo on ScoreProcessor comment
2020-01-27 10:18:56 +09:00
unknown
a6124ae499 fix typo on ScoreProcessor xmldoc 2020-01-27 08:24:15 +08:00
unknown
7f538cfa74 allow setting initial rate instead of reversing 2020-01-27 07:56:18 +08:00
Andrei Zavatski
6463a32f58 Split AccentColour setter in two lines 2020-01-26 17:42:07 +03:00
Andrei Zavatski
e54ea92c60 Use virtual property for OsuTabControl.AccentColour 2020-01-26 17:21:22 +03:00
Andrei Zavatski
7cd60e3193 Make OverlayRulesetSelector use colour provider 2020-01-26 17:07:17 +03:00
Andrei Zavatski
a72250acc6 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-ruleset-selector 2020-01-26 16:52:56 +03:00
Andrei Zavatski
891f9a9b18 Remove unused using 2020-01-26 16:49:39 +03:00
Andrei Zavatski
cd0fcfabd9 Merge master with conflicts resolved 2020-01-26 16:35:07 +03:00
Dean Herbert
97c80529d5 Adjust wave colours slightly 2020-01-26 21:47:40 +09:00
Andrei Zavatski
49c5d5b23d Make colour provider readonly 2020-01-26 14:06:05 +03:00
Andrei Zavatski
1305634c52 Simplify colour provider caching 2020-01-26 14:02:05 +03:00
Andrei Zavatski
852e622f02 Fix broken BreadcrumbControl 2020-01-26 13:12:35 +03:00
Dean Herbert
2d74609f50 Fix crash due to misordered selection events 2020-01-26 19:06:50 +09:00
Andrei Zavatski
e442e8535b Remake OsuTabControl.AccentColour 2020-01-26 12:57:19 +03:00
Andrei Zavatski
6c1fa05804 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-26 12:48:01 +03:00
Andrei Zavatski
8e470678c7 Rename convert() to getColour() 2020-01-26 12:42:23 +03:00
Andrei Zavatski
750a4476d8 Simplify getBaseHue function 2020-01-26 12:41:21 +03:00
Andrei Zavatski
6dee287a82 Move private methods below public 2020-01-26 12:39:15 +03:00
Andrei Zavatski
406bc23fde Rename incorrect colours 2020-01-26 12:38:20 +03:00
Andrei Zavatski
ed314ee935 Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation 2020-01-26 12:28:46 +03:00
Dean Herbert
eabb5a8701 Use ToString instead of Substring 2020-01-26 17:40:38 +09:00
Dean Herbert
50ab5a7d07 Merge remote-tracking branch 'upstream/master' into LegacyDecoder_changes 2020-01-26 17:38:44 +09:00
unknown
12b9e8146e Merge remote-tracking branch 'upstream/master' into reverse-winding 2020-01-26 16:19:57 +08:00
TheWildTree
d2a032ca8d Move reverse-order comparer to ChannelTabControl 2020-01-25 22:16:21 +01:00
Salman Ahmed
8aec9e4500 Fix NullReferenceException on main menu for mobile game hsots 2020-01-25 11:41:26 +03:00
Andrei Zavatski
73e822e08d Make waves colour dependent on overlay colour scheme 2020-01-25 06:46:54 +03:00
Dean Herbert
fa595e07a6 Update framework 2020-01-25 12:44:48 +09:00
Andrei Zavatski
448663ae9a Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation 2020-01-25 06:41:49 +03:00
Berkan Diler
219e14baa2 Address review and fix InspectCode 2020-01-24 17:05:27 +01:00
Dean Herbert
bc75290655 Ensure min and max stars are correctly ordered 2020-01-25 00:11:20 +09:00
Dean Herbert
92a5fbe948
Merge branch 'master' into star-filtering 2020-01-24 23:28:36 +09:00
smoogipoo
d1684a3c92 Duplicate keywords for better UX 2020-01-24 19:50:16 +09:00
smoogipoo
75d0fd0bab Rename class 2020-01-24 19:43:23 +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
ed66ee3ba6 Allow 10.0 stars to be selectable 2020-01-24 19:12:56 +09:00
smoogipoo
2643b6fca3 Add additional keywods 2020-01-24 19:12:48 +09:00
smoogipoo
62fa619ad4 Display "no limit" for maximum stars 2020-01-24 19:08:14 +09:00
smoogipoo
9e0e7be8d0 Modernise filter implementation 2020-01-24 18:57:17 +09:00
Andrei Zavatski
d9af43da4c Remove unused usings 2020-01-24 12:55:51 +03:00
Andrei Zavatski
619c2d6d9c Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation 2020-01-24 12:44:13 +03:00
Andrei Zavatski
e03a085d70 Make overlay elements use OverlayColourProvider 2020-01-24 12:33:34 +03: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
Andrei Zavatski
db4cd51d02 Implement OverlayColourProvider 2020-01-24 12:24:35 +03:00
Dan Balasescu
368587fc06
Merge branch 'master' into timeline-maybe 2020-01-24 18:08:29 +09:00
smoogipoo
027778acc1 Fix slider circles not being selected by default 2020-01-24 17:51:24 +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
Andrei Zavatski
1d549a0c8a Remove unused using 2020-01-24 10:46:27 +03:00
Dean Herbert
827f48c29b Adjust fade 2020-01-24 16:32:39 +09:00
Andrei Zavatski
738980e3f7 Refactor OsuTabControl.AccentColour 2020-01-24 10:31:47 +03: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
Andrei Zavatski
34ffbcf2ae Adjust xmldoc 2020-01-24 10:24:44 +03:00
Andrei Zavatski
2b941a0d52 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-24 10:18:45 +03: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
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
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
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
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
Dan Balasescu
0df9703c46
Merge branch 'master' into mod-autoopen 2020-01-23 16:04:43 +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
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
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
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
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
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
Dean Herbert
2aa8e7dbc9
Merge branch 'master' into get-only-auto-property 2020-01-21 18:56:44 +09:00
Dean Herbert
f582c42bbd Perform deletion directly via EditorBeatmap 2020-01-21 18:56:09 +09:00
Dean Herbert
a888d148b6 Remove remaining cast 2020-01-21 18:01:10 +09:00
Dean Herbert
6187b2e77c Implement IDistanceSnapProvider in timeline for now 2020-01-21 18:00:36 +09:00
Dean Herbert
353b74b04a Handle selection events in timeline 2020-01-21 17:37:35 +09:00
Dean Herbert
79351976d5 Allow timeline content to get more localised dependencies 2020-01-21 17:37:05 +09:00
Dean Herbert
24a466ab24 Avoid null by calling initial OnDeselected later 2020-01-21 17:36:21 +09:00
Dean Herbert
8f16c1cb04 Add non-hiding selection state 2020-01-21 14:21:00 +09:00
Dean Herbert
53fe0ce790 Use AliveChildren 2020-01-21 14:20:52 +09:00
ProTheory8
61d7b63914
Readability Improvement 2020-01-21 09:30:11 +05:00
Dean Herbert
bd96cf94a6 Begin refactoring SelectionBlueprint to handle non-drawable HitObjects 2020-01-21 12:47:14 +09:00
ProTheory8
02f26e4a4d
Update comment
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2020-01-21 08:44:22 +05:00
Andrei Zavatski
327d8c213b Rename Bar to TabControlBar 2020-01-21 06:25:13 +03:00
Andrei Zavatski
8bf19913c0 Add NotNull attribute 2020-01-21 06:03:48 +03:00
Andrei Zavatski
30edd80c8c Refactor OverlayHeader hierarchy 2020-01-21 06:00:12 +03:00
Andrei Zavatski
178a72f9b8 Make OverlayTabControl inherited from OsuTabControl 2020-01-21 05:24:49 +03:00
ProTheory8
41295bc27c Difficulty Adjust mod customisation menu opens automatically now 2020-01-20 21:06:36 +05:00
Dean Herbert
740bdee125 Apply remaining uncaught changes 2020-01-20 23:59:21 +09:00
smoogipoo
b62e3addf3 Apply input method signature refactorings 2020-01-20 20:30:25 +09:00
smoogipoo
40f502c6d1 Apply input method signature refactorings 2020-01-20 19:35:37 +09:00
smoogipoo
1b1003bd73 Refactor 2020-01-20 18:31:25 +09:00
Andrei Zavatski
843feb4e08 Add more xmldoc to ControllableOverlayHeader 2020-01-20 12:26:14 +03:00
smoogipoo
bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
Dean Herbert
25aff5d96e Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container 2020-01-20 17:08:59 +09:00
Andrei Zavatski
17a7a75707 Merge master with conflicts resolved 2020-01-20 08:52:03 +03:00
Andrei Zavatski
11e7c8be3f Use colour schemes for OverlayRulesetSelector 2020-01-20 08:34:46 +03:00
Andrei Zavatski
6552097866 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-ruleset-selector 2020-01-20 08:22:30 +03:00
Dean Herbert
aa0d95cdee
Merge branch 'master' into profile-scores-update-new 2020-01-20 14:15:03 +09:00
Dean Herbert
cd5290b030 Enforce using get-only auto property where possible 2020-01-20 13:50:27 +09:00
Andrei Zavatski
6875b41f74 Remove unnecessary setter 2020-01-20 07:47:49 +03:00
Andrei Zavatski
5f11084aed Refactor ProfileItemContainer to not use sounds 2020-01-19 22:57:39 +03:00
Andrei Zavatski
8906416294 ProfileItemBackground -> ProfileItemContainer 2020-01-19 22:48:11 +03:00
Andrei Zavatski
22118b7b22 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-scores-update-new 2020-01-19 22:44:40 +03:00
Andrei Zavatski
a2a2df0973 Make exception message more descriptive 2020-01-18 23:57:20 +03:00
Andrei Zavatski
1b06957566 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-header-web-colours 2020-01-18 23:54:12 +03:00
Dean Herbert
3f2512295c
Merge pull request #7555 from peppy/update-framework
Update framework
2020-01-18 15:57:16 +09:00
Dean Herbert
9709b80c88 Merge branch 'fix-channeltabcontrol-test' into update-framework 2020-01-18 14:59:40 +09:00
Andrei Zavatski
969cb23671 Add reference comment 2020-01-18 08:55:29 +03:00
Andrei Zavatski
e258489bb5 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-header-web-colours 2020-01-18 08:51:10 +03:00
Dean Herbert
5b7fd7e3ec Update framework 2020-01-18 14:42:22 +09:00
Andrei Zavatski
bab67eb399 CI fix 2020-01-18 04:12:17 +03:00
Andrei Zavatski
16cfb9310b Naming adjustments 2020-01-18 03:40:31 +03:00
Andrei Zavatski
d5a3d8dbaa Remove no longer used components 2020-01-18 03:35:47 +03:00
Andrei Zavatski
6e776d02f8 Refactor PaginatedScoreContainer to use new components 2020-01-18 03:33:02 +03:00
Andrei Zavatski
4964505c3e Implement ProfileWeightedScore component 2020-01-18 03:19:28 +03:00
Andrei Zavatski
4cdaebb42b Implement ProfileScore component 2020-01-18 02:58:10 +03:00
Andrei Zavatski
59cb93321f Implement ProfileItemBackground component 2020-01-18 01:36:14 +03:00
McEndu
159cd9a90b
Merge branch 'master' into mod-text 2020-01-17 21:42:01 +08:00
smoogipoo
2187523bf3 Fix json web requests having incorrect user agents 2020-01-17 19:21:27 +09:00
smoogipoo
2bc7458abf Add mod setting (de)serialization support 2020-01-17 13:27:47 +09:00