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
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
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
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
