1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 21:17:33 +08:00
Commit Graph

5822 Commits

Author SHA1 Message Date
Dean Herbert
4976f80b71 Move implementation to HUD 2020-04-09 14:31:25 +09:00
Dean Herbert
0e2d5213ce
Merge branch 'master' into low-hp-red-layer 2020-04-09 13:53:57 +09:00
Dean Herbert
4bfc738f5b
Merge pull request #7639 from santerinogelainen/master
Add top rank to the beatmap carousel
2020-04-08 23:36:47 +09:00
Dean Herbert
61d8cfd224 Fix triangle intro video being out of time 2020-04-08 19:51:55 +09:00
Alchyr
737a3b608a Correct spelling 2020-04-07 17:34:18 -07:00
smoogipoo
ed3e0a01e1 Re-namespace into song select 2020-04-07 15:31:22 +09:00
Joehu
57b6a91449 Remove unnecessary input override on footer button mods
Was used when it expanded on hover, but doesn't anymore.
2020-04-05 14:57:44 -07:00
Joehu
0f11ecce01 Make icons container private 2020-04-05 14:53:49 -07:00
Santeri Nogelainen
163de36777 Merge remote-tracking branch 'upstream/master' 2020-04-04 22:29:15 +03:00
Santeri Nogelainen
1e8badb14a Move all logic to TopLocalRank and remove CarouselBeatmapRank 2020-04-04 22:28:36 +03:00
Joehu
88cc552534 Fix results star rating display not being centered when no mods are present
Needed or the spacing will apply to the fill flow container, causing alignment issues.
2020-04-03 11:30:22 -07:00
Joehu
493b654011 Remove horizontal margin from mod display
Can skew center alignment on fill flow containers.

Fixes affected areas. Vector2(5, 0) is similar to MarginPadding { Left = 10 }.
2020-04-03 11:30:02 -07:00
Dean Herbert
53c99d137a
Merge branch 'master' into mania-config-lookup-refactor 2020-04-03 22:22:59 +09:00
Dean Herbert
51db361c32 Update usages of Animation and Video in line with framework changes 2020-04-03 16:00:06 +09:00
smoogipoo
1f797207f7 Rework lookups to not require total playfield columns 2020-04-03 12:31:05 +09:00
Lucas A
1562612f41 Update visual tests and remove unessecary XMLDoc tag 2020-04-01 15:12:31 +02:00
Lucas A
ab01111c36 Fix merge conflicts. 2020-03-30 17:39:11 +02:00
Lucas A
3cae0cedee Add a game setting to disable the layer 2020-03-30 12:59:39 +02:00
Dean Herbert
113660b621 Merge if statements 2020-03-30 18:56:35 +09:00
Dan Balasescu
ea1a2e1955
Merge branch 'master' into dont-retry-on-replay-results 2020-03-30 11:01:25 +09:00
Dan Balasescu
113bbe8c4d
Merge pull request #8488 from peppy/fix-autoplay-results-display
Fix auto mod results screen not displaying correctly
2020-03-30 11:01:16 +09:00
Dean Herbert
b47a532df3 Adjust code formatting slightly 2020-03-30 00:07:48 +09:00
Dean Herbert
6e68b968f8 Hide "retry" button on results screen after watching a replay 2020-03-29 23:52:50 +09:00
Dean Herbert
66a990cd5e Remove redundant this 2020-03-29 23:50:16 +09:00
Dean Herbert
653480b2f8 Add regression test 2020-03-29 23:29:46 +09:00
Dean Herbert
4f5557096c Fix auto mod results not displaying correctly 2020-03-29 22:51:28 +09:00
Endrik Tombak
b4f0500706 Invert logic 2020-03-28 20:21:21 +02:00
Endrik
2c27894527
Use All instead of ToList Any
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-28 19:58:33 +02:00
Santeri Nogelainen
6bde102207 Merge remote-tracking branch 'upstream/master' 2020-03-28 18:14:17 +02:00
Santeri Nogelainen
faa2b49be4 Fix namespace for CarouselBeatmapRank, make UpdateableRank in TopLocalRank readonly 2020-03-28 18:13:39 +02:00
Santeri Nogelainen
1c711147f3 Move all carousel rank logic into separate classes (TopLocalRank and CarouselBeatmapRank) 2020-03-28 17:22:01 +02:00
Endrik Tombak
87854fc4fa Rename variable 2020-03-28 13:23:31 +02:00
Endrik Tombak
6a0c5c87aa Use already existing variable 2020-03-28 13:06:03 +02:00
Endrik Tombak
fc3f9ff6fa Don't use drawables for select next 2020-03-28 12:54:48 +02:00
Dean Herbert
944926e950
Merge branch 'master' into fix-break-overlay-z-order 2020-03-28 13:04:19 +09:00
Dean Herbert
a317ef65b8 Remove default for argument 2020-03-28 12:18:28 +09:00
Bartłomiej Dach
3a3bfe9a5e Reorder children to fix pause overlay z-order 2020-03-27 21:19:49 +01:00
Bartłomiej Dach
adc759771f Hook up score processor in player 2020-03-27 19:47:42 +01:00
Dan Balasescu
5e1cb0e9e9
Merge branch 'master' into fix-minia-mod-replay-recording 2020-03-27 19:26:41 +09:00
Dean Herbert
f75c082601 Fix osu!mania replays recording incorrectly when key mod applied 2020-03-27 15:50:11 +09:00
Endrik Tombak
bbbaaae3ee Write tests 2020-03-26 19:18:16 +02:00
Endrik Tombak
ee112c6f50 Move and change logic 2020-03-26 18:42:08 +02:00
TheWildTree
83410315c6 Make fields private 2020-03-26 17:18:01 +01:00
TheWildTree
9a30ff5a00 Fix code quality issues 2020-03-26 16:11:58 +01:00
Lucas A
00c1ff993a Fix merge conflicts. 2020-03-26 15:48:18 +01:00
Lucas A
c1ac57e70f Add back visual tests and add easing to alpha fade. 2020-03-26 12:14:44 +01:00
Dean Herbert
07462120e4 Split break tracking into its own component 2020-03-26 15:30:23 +09:00
Dean Herbert
d372ddaadd Move break overlay to a location it is not affected by gameplay scale 2020-03-26 12:50:18 +09:00
Endrik Tombak
2f5dc93d61 Select recommended difficulty 2020-03-26 00:19:54 +02:00
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
TheWildTree
e85f45f911 Move old ScreenTitle to MultiHeaderTitle 2020-03-24 22:03:16 +01: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
Lucas A
a4171253a3 Make LowHealthThreshold a field. 2020-03-18 21:45:01 +01:00
Lucas A
e9f224b5e8 Apply review suggestions 2020-03-18 21:16:54 +01: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
Lucas A
a1274a9eb0 Fix and add missing XMLDoc 2020-03-18 08:29:00 +01: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
Lucas A
ed4f9f8ba9 Bind every HealthDisplay on Player load 2020-03-17 22:57:47 +01:00
Lucas A
6b0c5bc65d Rename to LowHealthLayer to FaillingLayer. 2020-03-17 22:32:07 +01: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
recapitalverb
99409fb7d1 Fix mapper info alignment in score panel 2020-03-17 23:02:39 +07:00
recapitalverb
592d8cbd13 Fix mapper name in score panel 2020-03-17 22:45:28 +07:00
Dean Herbert
dd3a6c5673 Use working beatmap to retrieve metadata for now 2020-03-17 23:13:31 +09:00
Dean Herbert
27cc68152d Fix potentially missing metadata on local score display 2020-03-17 22:54:02 +09:00
Dean Herbert
24b944fc8e Make footer buttons wider 2020-03-17 22:24:28 +09:00
Dean Herbert
48cbec7a31 Add scroll view because 2020-03-17 22:21:16 +09:00
Dean Herbert
2d6dcb3ba9 Merge branch 'master' into results-screen 2020-03-17 22:03:36 +09:00
Dean Herbert
b27bb4aeae Merge branch 'master' into results-middle-content 2020-03-17 21:37:23 +09:00
Dean Herbert
75695938e2
Merge branch 'master' into results-top-content 2020-03-17 20:42:02 +09:00
Dean Herbert
3b9c64b76f
Merge branch 'master' into results-scorepanel 2020-03-17 20:06:11 +09:00
Dean Herbert
8396fcfd35
Merge pull request #8304 from smoogipoo/results-circle
Implement a circle that displays the user's accuracy
2020-03-17 18:59:40 +09:00
Dean Herbert
df119eb95a Adjust animations 2020-03-17 18:04:38 +09:00
Dean Herbert
f06c170d63 Display SS badge earlier (when entering virtual ss area) 2020-03-17 18:04:15 +09:00
smoogipoo
6f569d1485 Fix colour conflicts for expert-plus 2020-03-17 18:01:46 +09:00
smoogipoo
3628814e4e Merge branch 'fix-score-population' into results-screen 2020-03-17 17:48:39 +09:00
smoogipoo
86a336d585 Add back retry overlay 2020-03-17 17:45:25 +09:00
smoogipoo
1c4296f5e7 Implement the new results screen 2020-03-17 17:43:16 +09:00
smoogipoo
afed01d781 Merge branch 'results-middle-content' into results-screen 2020-03-17 17:35:40 +09:00
smoogipoo
6f801e1695 Add xmldoc 2020-03-17 17:35:14 +09:00
smoogipoo
2ee480f1d8 Add xmldocs / cleanup 2020-03-17 17:34:16 +09:00
smoogipoo
1521f25c96 Implement middle panel contents 2020-03-17 17:25:24 +09:00
smoogipoo
19106daf8b Merge branch 'results-circle' into results-middle-content 2020-03-17 17:09:15 +09:00
smoogipoo
7cc1a6040f Implement top panel contents 2020-03-17 17:01:38 +09:00
smoogipoo
05789e6fe4 Implement the score panel 2020-03-17 16:59:34 +09:00
smoogipoo
daa5e63d0d Fix replay scores not being populated via player 2020-03-17 16:42:55 +09:00
smoogipoo
dca2e1d816 Implement the accuracy circle 2020-03-17 16:37:56 +09:00
Dean Herbert
5e3668b2ea
Merge pull request #8260 from smoogipoo/add-workingbeatmap-timeout
Add beatmap loading timeout to prevent runaway loading scenarios
2020-03-17 11:17:35 +09:00
Joehu
f7ea20a926 Limit font weight to bold 2020-03-16 16:32:25 -07:00
Lucas A
1aacd1aaa2 Initial implementation of LowHealthLayer 2020-03-16 21:04:59 +01:00
Dan Balasescu
e835f88c0c
Merge pull request #8255 from peppy/fix-carousel-scroll-while-import
Fix carousel scrolling being inoperable during beatmap import
2020-03-16 12:50:45 +09:00
Dan Balasescu
3e65f13c67
Merge branch 'master' into fix-carousel-scroll-while-import 2020-03-16 12:06:50 +09:00
Dean Herbert
9bb3a6c677 Merge branch 'master' into click-group-difficulty-icons 2020-03-16 12:01:09 +09:00
Dean Herbert
d6be8eec0c Merge branch 'master' into click-disabled-difficulty-icons 2020-03-16 11:30:57 +09:00
Dan Balasescu
f390c1995d
Apply comment suggestions
Co-Authored-By: Dean Herbert <pe@ppy.sh>
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-16 11:29:28 +09:00
Dan Balasescu
bd05462a7f
Merge branch 'master' into carousel-selection-fallback-improvement 2020-03-16 10:53:10 +09:00
Dan Balasescu
25a35a1370
Merge branch 'master' into always-apply-ruleset-filter 2020-03-16 10:32:36 +09:00
Dean Herbert
340d362d69 Appease inspectcode 2020-03-15 03:51:30 +09:00
Dean Herbert
4e8e222996 Merge branch 'master' into fix-carousel-scroll-while-import 2020-03-15 03:24:19 +09:00
voidedWarranties
c27751050b Switch back to strings and update setting labels 2020-03-12 23:29:11 -07:00
smoogipoo
c33ca6e99c Decorate usages with exception management 2020-03-13 14:28:11 +09:00
Dean Herbert
288470c313 Remove exo specification completely 2020-03-13 13:43:48 +09:00
Dean Herbert
ac70fcc544 Change logic to be more resilient by identifying user scroll events 2020-03-13 12:30:27 +09:00
Dean Herbert
5f8d180b5e Fix carousel scrolling being inoperable during beatmap import 2020-03-13 11:51:26 +09:00
Dean Herbert
04f1da04db Remove incorrect xmldoc from SelectBeatmap function 2020-03-13 10:52:08 +09:00
Dean Herbert
3f8b454ff4
Reword comment to match new filtering behaviour
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-13 10:01:28 +09:00