1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 01:27:29 +08:00
Commit Graph

55928 Commits

Author SHA1 Message Date
Dean Herbert
3947011baf Fix regression in legacy dual stage handling logic 2022-10-07 15:24:36 +09:00
Dean Herbert
2ae1aef0be Move column initialisation to ctor and fix remaining tests 2022-10-07 15:24:36 +09:00
Dean Herbert
5fe9b953a5 Add back triangles column colours via a transformer 2022-10-07 15:24:36 +09:00
Dean Herbert
1a0b953846 Remove unnecessary Beatmap parameter in ManiaLegacySkinTransformer 2022-10-07 15:24:36 +09:00
Dean Herbert
5c48d8931a Add StageDefinition to ManiaSkinConfigurationLookup and make column background colour lookup work 2022-10-07 15:24:36 +09:00
Dean Herbert
9c979044dc Move AccentColour assignment to inside Column 2022-10-07 15:24:36 +09:00
Dean Herbert
46c3cfe54d Remove StageDefinition flow in ManiaSkinComponent 2022-10-07 15:24:36 +09:00
Dean Herbert
7796a4c109 Cache StageDefinition for consumption (and remove ColumnType) 2022-10-07 15:24:36 +09:00
Dean Herbert
df3ad618e1 Move ColumnType to constructor 2022-10-07 15:24:36 +09:00
Dean Herbert
e0c66dbdbc
Merge pull request #20566 from smoogipoo/adjust-flashlight
Adjust flashlight to more closely match classic scaling
2022-10-07 15:23:42 +09:00
Dan Balasescu
4e6047f23d
Merge pull request #20571 from peppy/argon-mania
Add "argon" key area for osu!mania
2022-10-07 15:19:18 +09:00
Dan Balasescu
bce20e0a59 Merge branch 'master' into adjust-flashlight 2022-10-07 14:45:30 +09:00
Dan Balasescu
5f3b58b7e0 Adjust taiko flashlight to closely match classic 2022-10-07 14:44:45 +09:00
Dan Balasescu
c6b5fdc7d0 Adjust catch flashlight to closely match classic 2022-10-07 14:34:48 +09:00
Dan Balasescu
7385ef3e1b Extract combo scale to virtual function 2022-10-07 14:26:19 +09:00
Dean Herbert
da51475298
Merge pull request #20599 from Joehuu/fix-language-dropdown-not-updating
Fix language settings dropdown not updating when changing language in first run setup
2022-10-07 13:54:52 +09:00
Joseph Madamba
b27e70ca47 Fix language settings dropdown not updating when changing language in first run setup 2022-10-06 21:11:00 -07:00
Dean Herbert
4980e53c9c
Merge pull request #20376 from goodtrailer/smoke
Add cursor "smoke" trails
2022-10-07 03:41:07 +09:00
Dean Herbert
9cf8f2fef3
Merge pull request #20426 from NullifiedJosh/catch-hide-in-relax
Hide osu!catch touch input controls when relax mod is enabled
2022-10-07 02:58:27 +09:00
Dean Herbert
3445b4cb16
Merge branch 'master' into catch-hide-in-relax 2022-10-07 02:22:58 +09:00
Dean Herbert
f3262103c4 Move test into existing catch touch test scene 2022-10-07 02:22:13 +09:00
Dean Herbert
994db55b6d Simplify check conditionals 2022-10-07 02:22:13 +09:00
Dean Herbert
25d392204f
Merge pull request #20594 from ekrctb/fix-mania-hold-note-head
Fix mania hold note head disappears
2022-10-06 20:21:06 +09:00
NullifiedJosh
c73195fa77
Merge branch 'ppy:master' into catch-hide-in-relax 2022-10-06 18:52:59 +08:00
ekrctb
ea4dbc8c0f Fix mania hold note head disappears 2022-10-06 19:46:10 +09:00
NullifiedJosh
6543171169
Fix formating. 2022-10-06 18:30:49 +08:00
NullifiedJosh
0f6a6287f2
Fix bugs and add test 2022-10-06 18:17:33 +08:00
Dean Herbert
bda97b407b
Merge pull request #20340 from azutake/localisation-settings
Localize non-localizable setting items
2022-10-06 13:57:58 +09:00
Dean Herbert
e9ab465da6
Merge branch 'master' into localisation-settings 2022-10-06 13:22:08 +09:00
Dean Herbert
a57217cac1
Merge pull request #20585 from smoogipoo/pin-taiko-ppcalc-accuracy
Pin taiko PP calculator's accuracy to the classic value
2022-10-06 13:14:08 +09:00
Alden Wu
9d54467145 Make smoke skinnable lifetime more robust 2022-10-05 19:13:06 -07:00
Alden Wu
49e023f861 Rename OsuSkinComponents.SmokeTrail to CursorSmoke 2022-10-05 19:11:38 -07:00
Alden Wu
2c0cd9ea52 Add more smoke tests 2022-10-05 19:09:34 -07:00
Dan Balasescu
35d04fe33c
Merge pull request #20582 from peppy/fix-being-playing-unobserved
Silence unobserved exceptions in `BeginPlayingInternal`
2022-10-05 20:51:55 +09:00
Dan Balasescu
c52ddb0e50
Merge pull request #20570 from ekrctb/scrolling-lifetime
Compute lifetime start from entry for scrolling hit objects
2022-10-05 20:45:43 +09:00
Dan Balasescu
234c6ac799 Pin taiko PP calculator accuracy to osu-stable values 2022-10-05 20:21:15 +09:00
Dean Herbert
590af4cb7c Merge branch 'master' into argon-mania 2022-10-05 19:37:59 +09:00
Dan Balasescu
b6db36dcca
Merge pull request #20580 from peppy/approach-circle-fade-out
Hide approach circles immediate on successful hit
2022-10-05 19:17:57 +09:00
Dean Herbert
365a78d358 Merge branch 'master' into smoke 2022-10-05 18:58:18 +09:00
Dean Herbert
64858cfb8e Update resources 2022-10-05 18:55:49 +09:00
Dean Herbert
8f0ef99e10 Privatise some fields 2022-10-05 18:54:14 +09:00
Dean Herbert
bd82dfc333 Remove custom radius implementation 2022-10-05 18:53:07 +09:00
Dan Balasescu
52dfca48b9
Merge pull request #20564 from peppy/fix-gameplay-leaderboard-overlap
Adjust leaderboard score panels sizing based on accuracy/combo width
2022-10-05 18:52:11 +09:00
Dean Herbert
91d877e893 Set LifetimeEnd once rather than computing on every access 2022-10-05 18:52:01 +09:00
Dean Herbert
71edd314b1 Simplify SmokeContainer lifetime logic 2022-10-05 18:51:02 +09:00
Dan Balasescu
61753ac809
Merge pull request #20572 from peppy/add-osu-hit-object-dim
Add osu! hit object dim
2022-10-05 18:46:11 +09:00
Dean Herbert
6628ab5190 Refactor to avoid DI / event flow
There's always one active smoke segment and it's the direct child of
`SmokeContainer`. This can be simplified as such.
2022-10-05 18:37:14 +09:00
Dean Herbert
1e5ff2679b Rename classes to better emphasise that Smoke is a single trail segment 2022-10-05 18:29:16 +09:00
Dean Herbert
04abb2ce8f Update default cursor smoke implementation to use a texture 2022-10-05 18:26:17 +09:00
Dean Herbert
52002d91dd Only apply dim at top level objects 2022-10-05 17:48:56 +09:00