Commit Graph

4023 Commits

Author SHA1 Message Date
881043bc5d Fix failing test after mod settings layout changes
The slight hack which was used in the test to ensure that the mod
settings overlay covered the entire width of the mod overlay broke after
adjustments to the layout in the previous commit.

Locally adjust the hack to use the parent of the `ModSettingsContainer`
rather than the container itself.
2021-04-20 19:38:25 +02:00
97573fb11d Merge branch 'master' into combo-colours-display 2021-04-19 18:21:57 +02:00
fc41ad65f8 Merge pull request #12447 from smoogipoo/fix-non-60fps-recording
Record every 60fps interval
2021-04-19 23:26:58 +09:00
c12848ce4d Apply fixes to tests 2021-04-19 17:02:59 +09:00
a854ce429a add blank line between method 2021-04-18 23:49:13 -04:00
999f2d810c Fix accidentally removed code 2021-04-18 23:30:07 -04:00
e44d11667c Merge remote-tracking branch 'upstream' 2021-04-18 23:04:35 -04:00
b727faace3 Revert changes to IdleTracker 2021-04-18 23:03:43 -04:00
577755ee19 Add placeholder when no colours are visible
Will be removed once combo colours are mutable.
2021-04-18 20:46:42 +02:00
0cd1aa8c1c Add support for custom colour prefixes 2021-04-18 20:44:55 +02:00
67c19df000 Add test coverage for adding/removing colours 2021-04-18 19:35:42 +02:00
1b2c43b92c Add basic structure of colour palette 2021-04-18 19:29:04 +02:00
2678089e0b Add test case failing on selection after paste 2021-04-18 20:28:39 +09:00
1e56f14f5b Merge remote-tracking branch 'upstream' 2021-04-17 09:35:24 -04:00
f3ea51eeed Adjust tests to not rely on invalid assumption 2021-04-17 14:23:32 +02:00
8d6c30c73b Fix lint 2021-04-16 05:57:36 -04:00
ec0211809f Apply peppy's suggestions 2021-04-16 05:53:27 -04:00
d760e81a91 Fix lint 2021-04-16 05:22:41 -04:00
471b8e3c74 Merge branch 'master' of https://github.com/ppy/osu 2021-04-16 05:02:40 -04:00
7d23973ef8 Reset SessionStatics on activity
Closes #12424
2021-04-16 05:01:58 -04:00
25f0f17766 Attempt to fix match subscreen test failure 2021-04-16 16:16:28 +09:00
7cf15fe729 Merge pull request #12412 from peppy/timeline-adjustments
Update timeline control point display
2021-04-15 22:43:26 +09:00
ac8e462d32 Merge branch 'master' into refactor-framed-replay-input-hander 2021-04-15 21:48:58 +09:00
ad671ee07a Merge branch 'master' into timeline-adjustments 2021-04-15 20:42:38 +09:00
6f17c19a48 Merge branch 'master' into summary-timeline-design-refactors 2021-04-15 20:11:39 +09:00
5b06a68b93 Merge pull request #12330 from Cublibre/master
Send a warning notification if device is unplugged and at low battery
2021-04-15 19:21:04 +09:00
18e8682f39 Remove unused using statements 2021-04-15 17:01:25 +09:00
dd9a142e89 Fix TestSceneEditorSummaryTimeline not displaying actual beatmap content 2021-04-15 16:39:20 +09:00
66bb5766b9 Make Mod.Description abstract and add missing descriptions 2021-04-15 16:39:20 +09:00
a56391c6ca Merge pull request #12418 from peppy/abstract-mod-description
Make `Mod.Description` abstract and add missing descriptions
2021-04-15 15:42:36 +09:00
346e36d32a Make Mod.Description abstract and add missing descriptions 2021-04-15 14:36:26 +09:00
92fd34cea9 Revert "Inverse ignore user settings bindable to "apply user settings" instead"
This reverts commit 175b8da2b2.
2021-04-15 08:02:12 +03:00
175b8da2b2 Inverse ignore user settings bindable to "apply user settings" instead 2021-04-15 07:34:20 +03:00
7a9ff2ab38 Use until steps instead
Ah..
2021-04-15 00:48:25 +03:00
505dc15e03 Add failing test case 2021-04-14 23:35:42 +03:00
9dea0ae935 Update test scene to be able to see a bit more 2021-04-14 21:03:52 +09:00
7654df94f6 Merge pull request #12395 from frenzibyte/fix-cinema-ignore-settings
Fix beatmap background displayed if storyboard is hidden on "Cinema" mod
2021-04-14 14:31:03 +09:00
1505a38164 Merge pull request #12396 from peppy/update-timeline-slider-apperance
Update timeline slider/spinner apperance
2021-04-13 20:47:44 +09:00
b2aa46690d Merge pull request #12389 from peppy/fix-editor-ctrl-drag-deselection
Fix ctrl-dragging on an existing selection unexpectedly causing deselection
2021-04-13 20:38:29 +09:00
00f235760d Update visual appearance of timeline blueprints to close match new designs 2021-04-13 19:26:20 +09:00
fca9c70c1b Move timeline hit object test to immediately viewable area 2021-04-13 19:26:20 +09:00
0cf13dab8d Merge pull request #12391 from frenzibyte/replays-tooltip-graph
Display separate "replays watched" tooltip for replays subsection
2021-04-13 19:25:50 +09:00
2884ed3ab9 Merge pull request #12350 from smoogipoo/multiplayer-spectator-player-grid
Add the multiplayer spectator player grid
2021-04-13 19:25:32 +09:00
a0513f64f9 Merge branch 'master' into replays-tooltip-graph 2021-04-13 18:21:10 +09:00
15658eda55 Add failing test case 2021-04-13 12:00:13 +03:00
36510309d1 Merge EnableUserDim and IgnoreUserSettings to one bindable 2021-04-13 10:58:56 +03:00
a9652b7b25 Start TimelineTestScene in a more visible place 2021-04-13 16:05:12 +09:00
38d10755cb Merge branch 'master' into refactor-framed-replay-input-hander 2021-04-13 13:47:22 +09:00
516bd138e3 Add (previously failing) test coverage of drag from selection 2021-04-13 13:46:38 +09:00
7c975359d9 Add basic select/deselect tests 2021-04-13 13:29:37 +09:00