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

5666 Commits

Author SHA1 Message Date
Dean Herbert
800e395bc8 Merge branch 'master' into replay-recording 2020-03-25 20:20:59 +09:00
Dan Balasescu
e7f32d951d
Merge pull request #8431 from peppy/fix-intro-tests
Fix intro tests not asserting pass or working at all
2020-03-25 19:25:26 +09:00
Dean Herbert
b1d4261402 Fix track looping state not being reset when entering editor from song select
Closes #8432.
2020-03-25 15:50:19 +09:00
Dean Herbert
880d138a47 Fix intro tests not asserting pass or working at all 2020-03-25 15:12:19 +09:00
Dean Herbert
6d81da5419
Merge branch 'master' into video-offset 2020-03-25 11:28:59 +09:00
Dean Herbert
971249338d
Merge branch 'master' into storyboard-masking 2020-03-25 11:05:40 +09:00
Dean Herbert
4070b2b75f Merge branch 'basic-replay-recorder' into replay-recording 2020-03-24 16:31:14 +09:00
Dean Herbert
a7bfaad60f More correctly handle rulesets which don't support replay recording 2020-03-24 15:44:39 +09:00
Dean Herbert
022465f546 Add encoding and import support 2020-03-24 14:51:52 +09:00
voidedWarranties
4bb15a8b93 Allow individual storyboard layers to disable masking 2020-03-23 22:51:37 -07:00
Dean Herbert
2a1e7a7ff0
Merge branch 'master' into fix-select-filter-not-absorbing-input 2020-03-24 14:03:58 +09:00
Dan Balasescu
6279c78e3c
Merge branch 'master' into fix-keypad-autoplay-shortcut 2020-03-24 13:34:31 +09:00
Joehu
5bc5119389 Handle OnHover on song select filter and footer 2020-03-23 16:03:33 -07:00
Joehu
96d962ab30 Fix autoplay keyboard shortcut not working with keypad enter key 2020-03-23 11:25:40 -07:00
Joehu
96848405fd Fix song select filter not absorbing input from carousel 2020-03-23 10:54:45 -07:00
Dean Herbert
617149fb27 Implement in player 2020-03-23 20:06:18 +09:00
Dean Herbert
47c7673c9e Fix crash when holding a key down while entering player 2020-03-23 17:04:54 +09:00
Dan Balasescu
d0c7b49376
Merge branch 'master' into fix-carousel-root-selects-from-nothing 2020-03-23 11:34:04 +09:00
smoogipoo
448e5c0deb Merge branch 'master' into fix-carousel-root-selects-from-nothing 2020-03-23 11:15:22 +09:00
Dan Balasescu
fb21c7d82d
Merge branch 'master' into fix-carousel-restore-previous-selection 2020-03-23 11:01:18 +09:00
Dean Herbert
febf9adabd
Merge pull request #8329 from Fuewburvpoa/MyBranch
Fix beat divisor control selecting invalid divisors on drag end
2020-03-22 02:21:13 +09:00
Dean Herbert
29009c85c0
Fix typo in comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-22 00:32:53 +09:00
Dean Herbert
729e006c3a
Merge branch 'master' into video-offset 2020-03-21 20:03:46 +09:00
Dean Herbert
9b60b535e5 Fix selection not occurring when switching from empty ruleset on first load 2020-03-20 15:01:26 +09:00
Dean Herbert
e64a100e8b
Merge branch 'master' into fix-carousel-restore-previous-selection 2020-03-20 13:03:18 +09:00
Dean Herbert
be4a97c289 Correctly bypass last selected when it is filtered 2020-03-20 13:01:24 +09:00
Dean Herbert
8f9e97b4cc Fix carousel not remembering last selection correctly 2020-03-19 18:07:39 +09:00
Dean Herbert
855f0a4253 Fix bracket style 2020-03-19 14:38:49 +09:00
Dean Herbert
17c3455b36 Fix potentially invalid push in player while already exiting 2020-03-19 14:10:59 +09:00
Dean Herbert
c50784da93 Show 'D' rank badge on accuracy circle 2020-03-19 11:58:52 +09:00
Fuewburvpoa
648e9fa21f
Merge branch 'master' into MyBranch 2020-03-18 21:18:17 +02:00
Dean Herbert
90e1f6efbf
Merge pull request #8341 from smoogipoo/score-panel-scrolling
Make score panel scroll if off-screen
2020-03-18 19:00:48 +09:00
Dean Herbert
25983cfe0e
Merge pull request #8340 from smoogipoo/results-date-played
Add date played to score panel
2020-03-18 18:55:26 +09:00
Dean Herbert
6c45694f01
Merge pull request #8338 from smoogipoo/colourise-hit-statistics
Colourise results screen hit statistics
2020-03-18 18:55:10 +09:00
smoogipoo
1d211cb563 Make score panel scroll if off-screen 2020-03-18 18:28:42 +09:00
smoogipoo
63531a8564 Add date played to score panel 2020-03-18 17:59:44 +09:00
smoogipoo
66558ca8c5 Colourise hit result statistics 2020-03-18 17:26:17 +09:00
Dan Balasescu
e1e0c40020
Merge branch 'master' into fix-perfect-display 2020-03-18 17:04:52 +09:00
Dean Herbert
ed419216f0
Merge pull request #8323 from skielred/acc-circle-use-osucolour
Re-use colors defined for each rank in result screen accuracy circle
2020-03-18 16:29:24 +09:00
Dean Herbert
fdcb60706b Use TryGetValue to make tests happy 2020-03-18 15:49:24 +09:00
Dean Herbert
44cfed8af1 Fix perfect display showing when misses are present 2020-03-18 15:03:01 +09:00
Dan Balasescu
514e72bffb
Merge branch 'master' into update-loader-animation 2020-03-18 11:36:29 +09:00
Dan Balasescu
27f7808a86
Merge pull request #8320 from recapitalverb/fix-mapper-alignment
Fix mapper info alignment in score panel
2020-03-18 10:59:05 +09:00
Joehu
3c07f73c7b Fix results' beatmap title and artist language setting being swapped 2020-03-17 17:32:58 -07:00
Fuewburvpoa
6c825eb744
Update osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-18 00:04:03 +02:00
Fuewburvpoa
bee8e22d18 Fix BeatDivisorControl allow to select value outside of VALID_DIVISORS 2020-03-17 22:27:11 +02:00
recapitalverb
139ae2bc1e Use existing variables instead 2020-03-18 01:24:58 +07:00
Tina
100c9d422f Re-use colors defined for each rank in result screen accuracy circle 2020-03-17 18:55:30 +01:00
recapitalverb
431571dfa0 Check nulls 2020-03-18 00:15:43 +07:00
recapitalverb
d18b21ba32 Use local variable for metadata instead 2020-03-17 23:23:51 +07:00