1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-24 06:43:03 +08:00
Commit Graph

8999 Commits

Author SHA1 Message Date
Dean Herbert
4a4a561ca4
Merge pull request #13330 from nekodex/results-screen-sfx
Add sound effects to the results screen
2021-06-10 18:27:17 +09:00
Salman Ahmed
dde84e5cbd Merge branch 'master' into transformers-per-skin 2021-06-10 11:58:52 +03:00
Dean Herbert
0667354fbd Remove unused resolved skin 2021-06-10 17:30:04 +09:00
Dean Herbert
4f8000a574 Combine cases which return the same value 2021-06-10 17:29:36 +09:00
Dean Herbert
5e80f454ce
Merge branch 'master' into results-screen-sfx 2021-06-10 17:25:35 +09:00
Dan Balasescu
a44fd887ee
Merge branch 'master' into no-unranked-display 2021-06-10 17:09:46 +09:00
Joseph Madamba
cc38556f61 Fix background being dimmed forever after toggling statistics in results screen 2021-06-09 23:26:57 -07:00
Dean Herbert
9a3ca09501
Merge pull request #13384 from bdach/fixed-label-width
Align label widths of editor setup screen controls
2021-06-10 14:55:49 +09:00
Dean Herbert
209d217024 Remove unused using statement 2021-06-10 12:37:56 +09:00
Dean Herbert
3d508f9266 Merge branch 'master' into results-screen-sfx 2021-06-10 11:28:35 +09:00
Joseph Madamba
e3f3c37953 Add ability to navigate score panels with left/right arrows 2021-06-09 17:03:46 -07:00
Salman Ahmed
1aaad7bfd4 Apply few adjustments to skinning overlays comment 2021-06-09 22:49:31 +03:00
Salman Ahmed
e30f6581b3 Wrap gameplay content within a RulesetSkinProvidingContainer 2021-06-09 22:49:31 +03:00
Bartłomiej Dach
89cdea8123
Merge branch 'master' into fix-results-exit-transition 2021-06-09 19:40:56 +02:00
Dean Herbert
b02b8ae2bc
Merge pull request #13381 from smoogipoo/improve-hit-error-judgements
Improve hit error judgement displays
2021-06-09 19:40:17 +09:00
Dean Herbert
31b46afa71 Fix wrong naming scheme for applause samples 2021-06-09 19:35:05 +09:00
Dean Herbert
7d86dafd4f Simplify tick calculation/playback method 2021-06-09 19:31:53 +09:00
Dean Herbert
57bc34f224 Move consts closer to usage 2021-06-09 19:24:35 +09:00
Dean Herbert
cb4f366651 Move forgotten private function down more 2021-06-09 19:15:55 +09:00
Dean Herbert
81cecac90b Move tick rate initialisation to earlier 2021-06-09 19:09:00 +09:00
Dean Herbert
499aba95c0 Simplify sample construction logic and move private functions down 2021-06-09 19:06:37 +09:00
Dean Herbert
21a63efd78 Rename variable back to withFlair to match parent class 2021-06-09 18:55:29 +09:00
Dean Herbert
330bb7cb45 Remove unnecessary skin lookup logic 2021-06-09 18:55:29 +09:00
Dean Herbert
8fda04c2d9 Merge branch 'master' into results-screen-sfx 2021-06-09 18:00:11 +09:00
Dean Herbert
a65b76bdbf Add a simple fade to the results screen
Stops it from immediately disappearing.
2021-06-09 17:19:37 +09:00
Dean Herbert
7b0c5e9d32 Fix results screen changing applied colour to background on exit
The general rule is that screens should only apply colours and the likes
on enter / resume, and leave the outwards transition to whatever screen
is coming next.
2021-06-09 17:18:55 +09:00
Dean Herbert
258d05d1e0 Ensure PlayerLoader restores the background colour to its own value on resume 2021-06-09 17:17:39 +09:00
Dean Herbert
a7ef0173e9 Add safety to ensure background is correct tint when entering gameplay 2021-06-09 17:07:28 +09:00
Bartłomiej Dach
020c63017e Fix inspectcode issues 2021-06-09 09:21:02 +02:00
Bartłomiej Dach
a801a9a14d Ensure background rotation on default skins 2021-06-09 07:59:47 +02:00
Dean Herbert
b754c52392 Update ModAutoplay matching to use new UserPlayable flag instead 2021-06-09 14:32:48 +09:00
Dean Herbert
7774344f0e Remove "Unranked" text from ModDisplay 2021-06-09 13:45:09 +09:00
Bartłomiej Dach
97204b6f27 Reduce unnecessary background changes via IEquatable implementation 2021-06-08 22:37:18 +02:00
Bartłomiej Dach
a98c302211 Bring back skin background source 2021-06-08 22:04:59 +02:00
Bartłomiej Dach
5bf4dd6358 Move skin background to separate file 2021-06-08 21:57:08 +02:00
Bartłomiej Dach
410cb16340 Apply fixed label width to setup screen items 2021-06-08 17:18:00 +02:00
smoogipoo
00efed2c39 Add colours for tick judgements 2021-06-08 23:10:21 +09:00
smoogipoo
c8e14d7710 Ignore non-scorable and bonus judgements 2021-06-08 23:09:23 +09:00
smoogipoo
c3ea1b26e1 Fix DT being doubled in multiplayer spectator 2021-06-08 22:51:42 +09:00
Robin Avery
dc50ae40b9
Rename OverridesClosestAnchor to UsesFixedAnchor 2021-06-08 08:28:42 -04:00
smoogipoo
ab9290772b Fix a similar case with online play sub-screens 2021-06-08 17:54:54 +09:00
smoogipoo
860f1aebb3 Only call OnBackButton() if the screen has finished loading 2021-06-08 17:38:12 +09:00
smoogipoo
7fa0ac6ed7 Fix possible nullref when exiting song select too fast 2021-06-08 17:03:50 +09:00
Dean Herbert
95852ccdf8 Merge branch 'master' into results-screen-sfx 2021-06-08 15:14:31 +09:00
Bartłomiej Dach
0531c2dcd9 Move empty window check to bar error meter
It's not valid in the base `HitErrorMeter`, as the colour meter only
displays colour for a given judgement, so it is still valid to add new
items to it even if the hit window is 0, as misses are still possible.
2021-06-07 13:16:07 +02:00
Bartłomiej Dach
37d062c7cd Add failing assertions to hit error meter test 2021-06-07 13:16:07 +02:00
Dean Herbert
59130be99c Fix switching storyboard mode not triggering a reload 2021-06-07 17:32:04 +09:00
Dean Herbert
f677f9b5f4 Stop BackgroundScreenDefault from reloading beatmap background when already correct 2021-06-07 17:22:36 +09:00
Robin Avery
29fa4fdf57
Refactor unacceptable syntax 2021-06-07 01:08:39 -04:00
Robin Avery
133d72a8c0
Rename UsingClosestAnchor
It is now "OverridesClosestAnchor". The logic is inverted accordingly.
2021-06-07 00:14:36 -04:00
Robin Avery
f28916e30f
Remove all UsingClosestAnchor() extension logic
It is replaced with ISkinnableDrawable.UsingClosestAnchor.
2021-06-07 00:04:53 -04:00
Robin Avery
ce635af83e
Add UsingClosestAnchor to ISkinnableDrawable
Also implement it as an auto property in its inheritors.
The auto properties default to true.
2021-06-06 23:47:47 -04:00
Robin Avery
da1c38d5a9
Uninvert logic of SkinnableInfo.UsingClosestAnchor
Also rename "IsUsingClosestAnchor" to simply "UsingClosestAnchor".
2021-06-06 10:13:35 -04:00
Robin Avery
11b1b8c633
Add serialization support via SkinnableInfo 2021-06-06 07:18:08 -04:00
smoogipoo
009aa994d0 Fix potential race incorrectly pausing the source clock 2021-06-04 21:58:51 +09:00
Dan Balasescu
57a38374db
Merge branch 'master' into fix-spectator-frame-conversion 2021-06-04 21:17:40 +09:00
Dean Herbert
840f084dc4
Merge pull request #13303 from LeNitrous/mainmenu-storyboard-backgrounds
Add storyboards as a main menu background source
2021-06-04 19:50:40 +09:00
Dean Herbert
23096c58bb
Merge branch 'master' into fix-spectator-frame-conversion 2021-06-04 15:06:15 +09:00
Dean Herbert
d444fed46f Detach gameplay score from replay recorder before importing
Closes #13320.
2021-06-04 02:00:02 +09:00
Jamie Taylor
054de675ff
allow skinned 'applause' sample to override results screen sfx 2021-06-03 18:35:55 +09:00
Jamie Taylor
582360d0c8
only load the required impact/applause samples 2021-06-03 18:35:51 +09:00
Jamie Taylor
ed012a724b
refactor from using public variables 2021-06-03 18:35:46 +09:00
Jamie Taylor
8dc595d201
move result screen samples to DefaultSkin 2021-06-03 18:35:27 +09:00
Jamie Taylor
63e5bc4543
update sample names and timings 2021-06-03 18:34:33 +09:00
Jamie Taylor
30eff8cc2a
remove overlapping/legacy applause 2021-06-03 18:34:28 +09:00
Jamie Taylor
9ad87ee5dc
add sfx for results screen + sound design tool 2021-06-03 18:34:22 +09:00
smoogipoo
e887807ae7 Apply review fixes 2021-06-03 18:32:05 +09:00
smoogipoo
be03a2d7d2 Fix multiple calls to seek method potentially not working 2021-06-03 17:47:22 +09:00
smoogipoo
c3280083a2 Merge branch 'master' into fix-spectator-frame-conversion 2021-06-03 17:42:01 +09:00
smoogipoo
662bbed5d1 Fix seeking to gameplay too soon 2021-06-03 17:38:51 +09:00
smoogipoo
420df124b5 Add framestable-bypassing seek for spectator 2021-06-03 17:27:21 +09:00
Nathan Alo
d00fb21188 prevent scaling container from creating a storyboard background 2021-06-03 13:24:21 +08:00
Dan Balasescu
44b1102241
Merge branch 'master' into autoplay-pause-support 2021-06-03 13:26:00 +09:00
Dean Herbert
d6656047e3 Fix beatmap statistics with value of zero not displaying correctly at song select
Closes #13307.
2021-06-03 01:58:51 +09:00
Dean Herbert
e0eb0adb0a Remove unnecessary bind in ReplayPlayer 2021-06-02 18:32:14 +09:00
Nathan Alo
dde64adcb5 add new background type in BackgroundScreenDefault 2021-06-02 15:51:43 +08:00
Dean Herbert
a15cac6f53 Change the way Score is initialised in Player to better lend to population of metadata 2021-06-02 15:44:04 +09:00
Dean Herbert
289dc00f38 Merge branch 'master' into autoplay-pause-support 2021-06-01 16:50:44 +09:00
Dean Herbert
3ba0d29108 Fix incorrect beatmap being parsed down for autoplay generation 2021-06-01 15:44:24 +09:00
Dean Herbert
6ef9b346e1 Fix newly found inspections from 2021.1EAP1 2021-06-01 14:33:21 +09:00
Dean Herbert
cbf3ef5400 Create replay via the ICreateReplay interface instead of explicitly ModAutoplay 2021-06-01 14:22:16 +09:00
Dean Herbert
9221213fe5 Fix potential nullref is beatmap load failed 2021-06-01 14:19:23 +09:00
Dean Herbert
14570b6fb1 Merge branch 'master' into autoplay-pause-support 2021-06-01 14:19:21 +09:00
smoogipoo
7f24518004 Fix spectator crashing when converting mania replay frames 2021-05-31 19:24:22 +09:00
smoogipoo
d2d0896298 Expose GameplayBeatmap and GameplayRuleset from Player 2021-05-31 19:22:20 +09:00
Dan Balasescu
46b6f49a92
Merge pull request #13230 from peppy/non-nullable-beatmapset-files
Make `BeatmapSet.Files` non-nullable
2021-05-31 19:10:03 +09:00
Dean Herbert
d1ef5483bc
Merge pull request #12826 from frenzibyte/catch-hide-combo-workaround
Hide legacy HUD combo counters on osu!catch ruleset
2021-05-31 19:04:25 +09:00
Salman Ahmed
4e186b0cf5 ContentVisible -> HiddenByRulesetImplementation 2021-05-31 09:24:26 +03:00
Dean Herbert
06bd696cc2 Remove previous consumption logic in GetWorkingBeatmap
This should not be required since the introduction of `workingCache`,
which does the same thing in a more global way.
2021-05-31 14:11:58 +09:00
Salman Ahmed
fb111e23d8 Remove "temporarily" 2021-05-31 07:24:59 +03:00
Salman Ahmed
3fbd4e276d Add simple xmldoc 2021-05-31 00:07:29 +03:00
Bartłomiej Dach
78213e09d4
Merge branch 'master' into editor-exit-stability 2021-05-30 23:03:50 +02:00
Salman Ahmed
fb81e5133f Merge branch 'master' into catch-hide-combo-workaround 2021-05-30 14:16:46 +03:00
Dean Herbert
9b239e308b Merge branch 'master' into beatmap-skin 2021-05-29 15:36:43 +09:00
Dean Herbert
f1b5aced6f Merge branch 'master' into editor-exit-stability 2021-05-28 14:32:32 +09:00
Dan Balasescu
7e0a4562c9
Merge branch 'master' into fix-bad-make-current-call 2021-05-28 00:32:51 +09:00
Dan Balasescu
bc4ccb8a21
Merge pull request #12916 from peppy/fix-taiko-editor-sample-mutations
Fix osu!taiko editor operations not always updating the menu/visual state correctly
2021-05-27 23:55:16 +09:00
Dean Herbert
046087a367 Fix access to AliveChildren before IsLoaded 2021-05-27 16:58:01 +09:00
Dean Herbert
14a4095140 Merge branch 'master' into beatmap-skin 2021-05-26 18:39:47 +09:00
Dean Herbert
b3b39c4c13 Fix BeatmapCarousel accessing ScreenSpaceDrawQuad of non-loaded children
Fixes failure seen at
https://ci.appveyor.com/project/peppy/osu/builds/39302762/tests.
2021-05-26 15:42:27 +09:00