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

33364 Commits

Author SHA1 Message Date
Dean Herbert
03f336feb5 Merge branch 'master' into fix-tournament-ruleset-dropdown-anchor 2020-10-19 15:57:19 +09:00
Dan Balasescu
fe51236c00
Merge branch 'master' into score-test 2020-10-19 15:55:52 +09:00
Dan Balasescu
b5cadd6a2c
Merge pull request #10555 from peppy/fix-score-display-zero-padding
Fix incorrect zero padding for classic scoring mode
2020-10-19 15:54:12 +09:00
Dean Herbert
daceb0c049 Fix texture store not being initialised correctly
Without this change flags/mods would not work as expected. The video
store was being added as the texture store incorrectly.
2020-10-19 15:48:34 +09:00
Dean Herbert
3f41003d35 Move video store out of TournamentStorage
There was no reason it should be nested inside.
2020-10-19 15:48:15 +09:00
Dean Herbert
31f6051db9 Add missing xmldoc 2020-10-19 15:36:27 +09:00
Dean Herbert
9c566e7ffb Update tests to use correct parameters of CleanRunGameHost 2020-10-19 15:34:46 +09:00
Dan Balasescu
62dc9b0c1d
Merge pull request #10557 from peppy/default-combo-counter-remove-delay
Remove rolling delay on default combo counter
2020-10-19 15:34:24 +09:00
Dean Herbert
7ed862edd7 Add comment about migration code 2020-10-19 15:08:49 +09:00
Dean Herbert
39cf27637e Update to use virtual methods instead of reconstructing TextBuilder 2020-10-19 14:59:03 +09:00
Dean Herbert
f218a32e5f Merge branch 'master' into tourney-asset-refactor 2020-10-19 14:42:52 +09:00
Dean Herbert
ba99c5c134 Remove rolling delay on default combo counter 2020-10-19 14:39:02 +09:00
Dean Herbert
cdb649476b Allow legacy text to display fixed width correctly 2020-10-19 14:33:53 +09:00
Dean Herbert
e3b47083fc Add "scoring" as keyword to more easily find score display mode setting 2020-10-19 14:05:41 +09:00
Dean Herbert
cb1784a846 Fix score displays using non-matching zero padding depending on user score display mode 2020-10-19 14:05:28 +09:00
Dan Balasescu
408183fdf9
Merge pull request #10553 from bdach/fix-key-counter-order
Fix key counter actions displaying out of order
2020-10-19 13:44:08 +09:00
Dan Balasescu
1bc49103a3
Merge pull request #10537 from LeNitrous/fix-jittery-scorecounter
Fix legacy score & combo counter text overflowing outside padding
2020-10-19 13:30:11 +09:00
Dean Herbert
467bb9b96f
Merge branch 'master' into beatmap-carousel-refactor 2020-10-19 13:17:11 +09:00
Dean Herbert
bff3856c83 Account for panel height when removing as off-screen 2020-10-19 13:13:32 +09:00
Dean Herbert
ee0efa0b4c Fix off-by-one in display range retrieval logic 2020-10-19 13:05:42 +09:00
Dean Herbert
4590d9b93b Remove outdated comment logic 2020-10-19 13:04:12 +09:00
Lucas A
371aecfca0 Fetch OsuGameActivity through DI instead. 2020-10-18 20:07:42 +02:00
Lucas A
9cd595800a Subscribe to event handler instead. 2020-10-18 19:42:05 +02:00
Bartłomiej Dach
5b96f01564 Fix key counter actions displaying out of order 2020-10-18 19:21:36 +02:00
Bartłomiej Dach
8aeeed9402 Fix weird number formatting in test 2020-10-17 15:47:37 +02:00
Bartłomiej Dach
a5b0307cfb Apply same fix to legacy accuracy counter 2020-10-17 15:39:26 +02:00
Bartłomiej Dach
0acc86f757 Split line for readability 2020-10-17 15:39:25 +02:00
Bartłomiej Dach
e4463254d7 Add test coverage for score counter alignment 2020-10-17 15:29:30 +02:00
Lucas A
b60dfc55b6 Apply review suggestions. 2020-10-16 19:21:51 +02:00
unknown
bba9a0b2fe set sprite text anchor and origin to top right 2020-10-17 00:25:16 +08:00
Dean Herbert
daa0a05d9e
Merge pull request #10534 from smoogipoo/fix-ef-ordinal-warning
Silence EF warning due to ordinal being unsupported
2020-10-17 00:19:42 +09:00
Dan Balasescu
dff2ba6e5d
Merge pull request #10531 from peppy/fix-accuracy-scale
Adjust accuracy display to match stable
2020-10-16 23:52:30 +09:00
Dan Balasescu
b7c12ff61e
Merge pull request #10530 from peppy/fix-catch-dual-combo-counter
Fix osu!catch showing two combo counters for legacy skins
2020-10-16 23:52:14 +09:00
Dan Balasescu
a02edc2cc3
Merge pull request #10528 from peppy/skinnable-health-display
Add legacy skinning support for health display
2020-10-16 23:51:37 +09:00
smoogipoo
6385d5f369 Replace with local tolist 2020-10-16 23:40:44 +09:00
smoogipoo
81cc5e1c42 Silence EF warning due to ordinal being unsupported 2020-10-16 23:31:37 +09:00
smoogipoo
2586990301 Update resources 2020-10-16 23:19:34 +09:00
smoogipoo
dfbc0965e4 Merge branch 'master' into peppy/skinnable-health-display 2020-10-16 23:17:17 +09:00
Dean Herbert
e87f515a4f
Merge pull request #10522 from Morilli/legacyskin-fixes
Add support for ScorePrefix and ScoreOverlap values in legacy skins
2020-10-16 20:54:03 +09:00
Dean Herbert
74bee65474
Merge pull request #10532 from turbedi/minor_string_optimization
Use char overloads for string methods
2020-10-16 19:36:39 +09:00
Berkan Diler
fe3a23750c Use char overloads for string methods 2020-10-16 11:52:29 +02:00
Dean Herbert
2ba8bc45fd Also add slight adjustment to score display 2020-10-16 18:37:24 +09:00
Dean Herbert
cbaad4eb56 Adjust accuracy display to match stable 2020-10-16 18:34:14 +09:00
Berkan Diler
cc11283143 Use string.Starts-/EndsWith char overloads 2020-10-16 11:27:02 +02:00
Dean Herbert
0437f7e7e9 Delete outdated test scene
Has been replaced by the four new skinnable tests for each component.
2020-10-16 18:22:20 +09:00
Dean Herbert
8a3bce3cc3 Fix osu!catch showing two combo counters for legacy skins 2020-10-16 18:20:17 +09:00
Dean Herbert
a774de2270 Also add support in LegacyComboCounter 2020-10-16 17:52:22 +09:00
Dean Herbert
24b0a1b84b Switch to direct casts (we can be sure LegacySpriteText is present at this point) 2020-10-16 17:40:07 +09:00
Dean Herbert
3ce6d1fea1 Remove unnecessary AccuracyText enum
All elements use "score" regardless.
2020-10-16 17:36:54 +09:00
Dean Herbert
e9c4b67cf4 Inline variable 2020-10-16 17:35:35 +09:00