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

33228 Commits

Author SHA1 Message Date
Dan Balasescu
976f96b51d
Merge branch 'master' into beatmap-carousel-refactor-less-alloc-overhead 2020-10-20 14:26:23 +09:00
Dan Balasescu
f35611b452
Merge pull request #10494 from peppy/beatmap-carousel-refactor
Add beatmap set level pooling to beatmap carousel
2020-10-20 14:25:56 +09:00
Dean Herbert
1097172fd5
Merge pull request #10563 from Joehuu/fix-autoplay/replay-settings-going-off-screen 2020-10-20 13:22:15 +09:00
Dean Herbert
c57fecd1fc Update comment to make it clear this is a hack 2020-10-20 12:43:57 +09:00
Joehu
fef6e55b39 Remove unused using and field 2020-10-19 12:32:16 -07:00
Joehu
dbda18acea Fix autoplay/replay settings going off screen on some legacy skins 2020-10-19 12:04:23 -07:00
Dean Herbert
85790d8569
Merge branch 'master' into beatmap-carousel-refactor 2020-10-19 20:46:55 +09:00
Dan Balasescu
b9c1d21743
Merge pull request #10559 from peppy/fix-migration-test-failures
Fix migration test failures due to finalizer disposal of LocalConfigManager
2020-10-19 20:26:20 +09:00
Dan Balasescu
d478c4392b
Merge pull request #10560 from peppy/fix-catch-test-failures
Fix osu!catch test failures due to trying to retrieve container too early
2020-10-19 20:26:12 +09:00
Dean Herbert
a50ca0a1ed Fix osu!catch test failures due to trying to retrieve container too early 2020-10-19 20:00:17 +09:00
Dean Herbert
d5940193a2 Ensure visible items is greater than zero before trying to display a range 2020-10-19 19:55:20 +09:00
Dan Balasescu
d1075cabbd
Merge pull request #10556 from peppy/fix-legacy-score-display-fixed-width
Allow legacy text to display fixed width correctly
2020-10-19 19:50:30 +09:00
Dean Herbert
0e9b28d0b5
Merge pull request #10516 from Game4all/android-gameplay-locked-screen-orientation 2020-10-19 19:24:25 +09:00
Dean Herbert
1b2991039d
Merge pull request #10297 from swoolcock/sdl-icon 2020-10-19 19:24:10 +09:00
Dean Herbert
9106e97c37 Ensure max value in clamp is at least zero 2020-10-19 19:10:01 +09:00
Dan Balasescu
534088c66b
Merge branch 'master' into fix-legacy-score-display-fixed-width 2020-10-19 19:04:20 +09:00
Dean Herbert
28eae5d26b Fix migration test failures due to finalizer disposal of LocalConfigManager 2020-10-19 19:03:22 +09:00
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
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