1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00
Commit Graph

33436 Commits

Author SHA1 Message Date
Dan Balasescu
bd4e0e1a60
Merge branch 'master' into epilepsy-warning 2020-10-20 17:43:37 +09:00
Dan Balasescu
ca8492b3bb
Merge pull request #9643 from peppy/hide-hud-during-break-time
Add more display modes for HUD overlay (hide during gameplay / hide during break)
2020-10-20 16:11:12 +09:00
Dan Balasescu
5fe38533e2
Merge branch 'master' into hide-hud-during-break-time 2020-10-20 15:39:35 +09:00
Dean Herbert
55d08fad5c Remove unused field 2020-10-20 15:18:15 +09:00
Dean Herbert
411ae38605 Remove unused using 2020-10-20 15:06:31 +09:00
Dean Herbert
7a68636f71 Adjust fade sequence and durations to feel better 2020-10-20 15:03:33 +09:00
Dean Herbert
4e57751ca1 Fix background dim application to avoid overdraw, transition smoother 2020-10-20 15:03:12 +09:00
Dan Balasescu
1fe987d4b3
Merge pull request #10497 from peppy/beatmap-carousel-less-diffcalc-stutter
Disable difficulty calculation for set-level difficulty icons
2020-10-20 14:57:34 +09:00
Dan Balasescu
05db7538c8
Merge pull request #10499 from peppy/beatmap-carousel-refactor-less-alloc-overhead
Reduce alloc overhead of DrawableCarouselBeatmapSet using new function-based ctor
2020-10-20 14:57:20 +09:00
Dan Balasescu
976f96b51d
Merge branch 'master' into beatmap-carousel-refactor-less-alloc-overhead 2020-10-20 14:26:23 +09:00
Dan Balasescu
13060b8575
Merge branch 'master' into beatmap-carousel-less-diffcalc-stutter 2020-10-20 14:26:16 +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
4f8a755518 Add "hide during gameplay" mode 2020-10-20 14:20:44 +09:00
Dean Herbert
024009e174 Change default to "always visible" 2020-10-20 14:19:15 +09:00
Dean Herbert
80b1f816c7 Merge branch 'master' into hide-hud-during-break-time 2020-10-20 14:19:04 +09:00
Dean Herbert
f9ca47ca86 Add test coverage 2020-10-20 13:59:07 +09:00
Dean Herbert
267b399f9f Add some simple border styles 2020-10-20 13:59:03 +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
Bartłomiej Dach
fd4bab85cf Merge branch 'master' into epilepsy-warning 2020-10-20 01:06:46 +02:00
Bartłomiej Dach
05251c646e Fade volume back up on pop out 2020-10-20 01:06:20 +02:00
Bartłomiej Dach
1fc22bdbff Only show warning once on given map 2020-10-20 00:59:36 +02:00
Bartłomiej Dach
a164d330e5 Improve feel of transition 2020-10-20 00:51:31 +02:00
Bartłomiej Dach
1238e6c30f Add flag value to database
Unfortunately required, as loadBeatmaps() refreshes the decoded beatmap
with the database-stored values, which can end up overwriting the
decoded ones.
2020-10-20 00:46:08 +02:00
Bartłomiej Dach
6e50ae0458 Reformulate push sequence code 2020-10-20 00:22:30 +02:00
Bartłomiej Dach
1ac0b3b13d Add asserts to tests 2020-10-20 00:08:26 +02:00
Bartłomiej Dach
8505903041 Move warning construction to load() 2020-10-20 00:08:05 +02:00
Bartłomiej Dach
a9f27a71a2 Fix code formatting issues 2020-10-19 23:53:41 +02:00
Bartłomiej Dach
aeca61eb3e Split warning to separate file 2020-10-19 23:48:02 +02:00
Bartłomiej Dach
44279ed347 Remove unused using directive 2020-10-19 23:46:09 +02:00
Shivam
afa86f959f Changed scales of Seeding and Win screen to match the original
These were measured by pixel-to-pixel comparing master vs this branch in ShareX at the same resolution.
2020-10-19 23:38:06 +02:00
Salman Ahmed
6e4b28ed1e Different version of epilepsy warning display 2020-10-20 00:32:44 +03:00
Shivam
1c073a9ea5 Merge branch 'master' into flag-fit 2020-10-19 22:27:48 +02:00
Joehu
fef6e55b39 Remove unused using and field 2020-10-19 12:32:16 -07:00
Bartłomiej Dach
7c388f1132 Move editor playfield border locally to osu! composer 2020-10-19 21:20:13 +02:00
Bartłomiej Dach
bca0539735 Move setting to osu! ruleset subsection 2020-10-19 21:05:21 +02:00
Joehu
dbda18acea Fix autoplay/replay settings going off screen on some legacy skins 2020-10-19 12:04:23 -07:00
Bartłomiej Dach
4267d23d59 Move border to more appropriate namespace 2020-10-19 20:56:34 +02:00
Bartłomiej Dach
4af3fd1ed6 Allow toggling border on & off during gameplay 2020-10-19 20:41:45 +02:00
Bartłomiej Dach
053c7a69a6 Fix code style issues & compilation failures 2020-10-19 20:22:48 +02: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