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

31307 Commits

Author SHA1 Message Date
Dean Herbert
db52260427 Rename and clarify comment regarding "previous" track disposal 2020-08-22 19:44:54 +09:00
Dean Herbert
b72f06fef6 Centralise and clarify LoadTrack documentation 2020-08-22 19:42:34 +09:00
Dean Herbert
f63d1ba612 Remove stray call to LoadTrack that was forgotten 2020-08-21 18:52:53 +09:00
Dean Herbert
4239e9f684 Fix storyboard test not actually working due to incorrect track referencing 2020-08-21 18:44:14 +09:00
Dean Herbert
308d9f5967 Ensure locally executed methods are always loaded before propagation 2020-08-21 18:43:58 +09:00
Dean Herbert
1edafc39ba Fix intro welcome playing double due to missing conditional 2020-08-21 18:33:24 +09:00
Dean Herbert
d4a7e8cee8 Merge branch 'fix-double-storyboard-sample-dispose-crash' into beatmap-track-rework 2020-08-21 18:28:31 +09:00
Dean Herbert
69cb9f3091 Fix potential crash if disposing a DrawableStoryboardSample twice 2020-08-21 18:19:47 +09:00
Dean Herbert
d5cbb589c2 Revert some test scene changes to use Beatmap.Track where relevant 2020-08-21 17:21:08 +09:00
Dean Herbert
a47b8222b5 Restore multiplayer to use beatmap track 2020-08-21 17:11:29 +09:00
Dean Herbert
70697cf1a0 Restore remaining editor components to use Beatmap.Track 2020-08-21 17:11:29 +09:00
Dean Herbert
3b03116179 Remove unnecessary using statement 2020-08-21 16:45:59 +09:00
Dean Herbert
0ae460fb8f Avoid beatmap load call in IntroScreen 2020-08-21 15:50:14 +09:00
Dean Herbert
f7e4feee34 Update remaining Player components to use WorkingBeatmap again 2020-08-21 15:25:57 +09:00
Dean Herbert
d2c2e8bbe8 Revert some more usage of MusicController back to WorkingBeatmap 2020-08-21 15:17:21 +09:00
Dean Herbert
0b0ff62647 Switch timeline to use track directly from beatmap again 2020-08-21 14:49:34 +09:00
Dean Herbert
526f06be4c Add back track loaded bool in WorkingBeatmap 2020-08-21 13:53:37 +09:00
Dean Herbert
05b402132e Merge branch 'master' into beatmap-track-rework 2020-08-21 13:25:04 +09:00
Dean Herbert
25ee1fa7a2
Merge pull request #9933 from bdach/fix-catch-double-sample 2020-08-21 13:08:26 +09:00
Dean Herbert
357fb3a10e Merge branch 'master' into beatmap-track-rework 2020-08-21 12:53:09 +09:00
Dean Herbert
f0ba587515
Merge branch 'master' into fix-catch-double-sample 2020-08-21 12:38:29 +09:00
Dean Herbert
ec020f0f7b
Merge pull request #9936 from bdach/fix-multi-screen-test 2020-08-21 12:36:32 +09:00
Dean Herbert
d78bf839f4
Merge pull request #9930 from smoogipoo/remove-invert-release-samples 2020-08-21 12:35:43 +09:00
Bartłomiej Dach
dcce7a2130 Cache local music controller to resolve failure 2020-08-20 21:03:27 +02:00
Bartłomiej Dach
bd4acdce78 Add until step to ensure failure 2020-08-20 21:01:58 +02:00
Bartłomiej Dach
9546fbb64b Prevent catcher from performing invalid catches 2020-08-20 19:06:29 +02:00
Bartłomiej Dach
28534c1599 Reintroduce PalpableCatchHitObject at data level 2020-08-20 19:06:26 +02:00
Bartłomiej Dach
45e2ea71b4 Rename Palpable{-> Drawable}CatchHitObject 2020-08-20 18:41:08 +02:00
Bartłomiej Dach
35ff25940b Add sample playback to juice stream test scene 2020-08-20 18:16:32 +02:00
Dean Herbert
75db762553
Merge pull request #9926 from peppy/catch-playfield-width-adjust
Fix osu!catch playfield bounds not matching expectations
2020-08-20 23:42:17 +09:00
smoogipoo
54a2322090 Use Array.Empty<> 2020-08-20 22:51:52 +09:00
smoogipoo
f1e0946603 Remove release samples in invert mod 2020-08-20 22:38:47 +09:00
Dean Herbert
7442a44acd
Merge pull request #9929 from smoogipoo/fix-catch-conversion
Fix catch not applying HR offset correctly
2020-08-20 22:33:58 +09:00
Dean Herbert
3ecc47cd3e
Merge pull request #9927 from peppy/force-tourney-client-windows
Force tournament client to run in windowed mode
2020-08-20 21:38:21 +09:00
smoogipoo
c89509aca0 Fix right bound not being applied correctly 2020-08-20 20:25:40 +09:00
Dean Herbert
e6d13edafb Force tournament client to run in windowed mode
We generally haven't tested in other modes, and it doesn't really make
sense as you wouldn't be able to use it in a meaningful way otherwise.

- [ ] Test on windows.
2020-08-20 19:41:29 +09:00
Dean Herbert
a94a86178b Align osu!catch playfield with stable 1:1 2020-08-20 19:12:37 +09:00
Dean Herbert
1f14d9b690 Use correct width adjust for osu!catch playfield 2020-08-20 18:15:06 +09:00
Dean Herbert
8b8fff2766
Merge pull request #9925 from swoolcock/disable-ca2225
Disable CA2225 warning regarding operator overloads
2020-08-20 17:50:11 +09:00
Shane Woolcock
6358f4a661 Disable CA2225 warning regarding operator overloads 2020-08-20 17:33:08 +09:30
Dean Herbert
ff0dec3dd9 Update plist path to work with newer fastlane version
It seems they have fixed the working/current directory and the
parent traversal is no longer required.
2020-08-20 12:23:41 +09:00
Dean Herbert
5714c761eb
Merge pull request #9768 from frenzibyte/allow-counter-customize-sprite-text
Allow providing custom sprite text for RollingCounter<T>
2020-08-20 00:14:48 +09:00
Dan Balasescu
e4efa357d4
Merge pull request #9916 from peppy/update-framework
Update framework
2020-08-19 23:06:10 +09:00
Dan Balasescu
8578b72b3b
Merge pull request #9906 from lanpai/mania-slidertick-lighting
Disable LegacyHitExplosion for hold notes
2020-08-19 22:37:46 +09:00
Dean Herbert
1badc584f6 Update textbox event names 2020-08-19 22:10:58 +09:00
Dean Herbert
4397be60e2 Update framework 2020-08-19 21:58:02 +09:00
Dean Herbert
f6ca31688e Fix incorrect spacing 2020-08-19 21:39:55 +09:00
Dean Herbert
37f40f4a09
Merge branch 'master' into mania-slidertick-lighting 2020-08-19 21:19:25 +09:00
Dean Herbert
bb3a2473b7
Merge pull request #9903 from smoogipoo/mania-body-recycling
Implement mania hold note body recycling
2020-08-19 21:09:23 +09:00
Dean Herbert
74f8e61381
Merge branch 'master' into mania-body-recycling 2020-08-19 20:40:15 +09:00