1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 01:07:24 +08:00
Commit Graph

33812 Commits

Author SHA1 Message Date
Dean Herbert
002ade51fc
Merge pull request #9816 from voidedWarranties/duplicate-multi-room 2020-10-19 19:02:03 +09:00
Dean Herbert
ea87c97ce0
Merge branch 'master' into sdl-icon 2020-10-19 18:44:51 +09:00
Dean Herbert
9792ac2fbd Merge branch 'master' into beatmap-carousel-refactor 2020-10-19 18:44:07 +09:00
Dean Herbert
46d17d3857 Merge branch 'master' into beatmap-carousel-refactor 2020-10-19 18:43:17 +09:00
Dean Herbert
51e9a91343
Merge pull request #10493 from peppy/update-framework 2020-10-19 18:42:55 +09:00
Dean Herbert
1c2185e969 Replace comment with link to issue 2020-10-19 18:41:28 +09:00
Dean Herbert
044622a7a6 Fix out of bounds issues 2020-10-19 18:41:17 +09:00
Dean Herbert
22bde43106
Merge branch 'master' into visible-playfield-boundary 2020-10-19 18:05:28 +09:00
Dean Herbert
b940a7cee2
Merge pull request #10235 from Joehuu/fix-tournament-ruleset-dropdown-anchor 2020-10-19 17:46:15 +09:00
Dean Herbert
d1eafc9934
Merge pull request #8136 from Game4all/fix-login-placeholder-inheritance 2020-10-19 17:45:54 +09:00
Dean Herbert
4024b44a53 Fix unsafe manipulation of parent's children from child 2020-10-19 17:41:21 +09:00
Dean Herbert
437ca91b94 Use DI to open the copy rather than passing in an ugly action 2020-10-19 17:23:04 +09:00
Dean Herbert
6d22f0e196 Use existing copy method and update xmldoc 2020-10-19 17:15:13 +09:00
Dan Balasescu
5333319482
Merge pull request #10401 from LittleEndu/score-test
Expand ScoreProcessor tests
2020-10-19 17:03:59 +09:00
Lucas A
cd7c3021ca Trigger lock update on loading. 2020-10-19 10:01:24 +02:00
Dean Herbert
61a43770bd Merge branch 'master' into duplicate-multi-room 2020-10-19 16:58:45 +09:00
Dean Herbert
79a17b2371 Reapply waveform colour fix 2020-10-19 16:57:08 +09:00
Dean Herbert
401dd2db37 Update framework 2020-10-19 16:55:00 +09:00
Dean Herbert
ca1c287664
Merge pull request #9256 from MiraiSubject/tourney-asset-refactor 2020-10-19 16:42:09 +09:00
Dean Herbert
d6efa3069a Merge branch 'master' into fix-login-placeholder-inheritance 2020-10-19 16:25:44 +09:00
Dean Herbert
f597572d73 Add comment with reasoning for TopRight anchor 2020-10-19 16:02:39 +09:00
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