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

31099 Commits

Author SHA1 Message Date
smoogipoo
b64142dff9 Fix incorrect load state being used 2020-08-11 12:37:00 +09:00
smoogipoo
20197e2768 Remove locally-cached music controller 2020-08-11 12:27:32 +09:00
Dean Herbert
327596b9d5
Merge branch 'master' into beatmap-track-rework 2020-08-10 20:53:12 +09:00
Dean Herbert
96c4a30fac
Merge pull request #9788 from smoogipoo/adujustable-skinnablesound
Make SkinnableSound an IAdjustableAudioComponent
2020-08-10 19:39:13 +09:00
Bartłomiej Dach
a636c7052c Merge branch 'master' into adujustable-skinnablesound 2020-08-08 21:51:47 +02:00
smoogipoo
87ce1e3558 Remove impossible null case (DummyWorkingBeatmap) 2020-08-08 00:58:04 +09:00
Dan Balasescu
bfa20abd88
Merge branch 'master' into beatmap-track-rework 2020-08-08 00:38:35 +09:00
smoogipoo
2351701ade Fix test not having a long enough track 2020-08-07 23:08:51 +09:00
smoogipoo
b8373e89b7 Move beatmap bind to BDL load() 2020-08-07 23:08:09 +09:00
smoogipoo
e87f50f74f Rename method 2020-08-07 22:31:41 +09:00
smoogipoo
d1765c8a45 Fix using the wrong music controller instance 2020-08-07 22:06:04 +09:00
smoogipoo
b6fb7a0d39 Fix possibly setting null track 2020-08-07 22:05:58 +09:00
smoogipoo
08820c62ec Add back removed nullcheck 2020-08-07 21:36:02 +09:00
smoogipoo
b08ebe6f81 More inspections (rider is broken) 2020-08-07 21:14:45 +09:00
smoogipoo
961c6dab54 Fix more inspections 2020-08-07 21:08:03 +09:00
smoogipoo
028040344a Fix test scene using local beatmap 2020-08-07 21:07:59 +09:00
smoogipoo
5002d69f69 Update inspections 2020-08-07 20:51:56 +09:00
smoogipoo
61b632516e Ensure CurrentTrack is never null 2020-08-07 19:43:16 +09:00
smoogipoo
bf21fdd6da Merge branch 'master' into beatmap-track-rework 2020-08-07 18:41:34 +09:00
Dan Balasescu
d8ffc00f75
Merge pull request #6345 from frenzibyte/expand-number-piece-on-old-skins
Expand number piece for legacy old skins
2020-08-07 17:18:36 +09:00
Dan Balasescu
08934b7e39
Merge pull request #9763 from Wieku/playfield-shift
Add vertical offset to osu! playfield to match stable
2020-08-07 16:56:07 +09:00
smoogipoo
3c3756e42d Merge branch 'master' into expand-number-piece-on-old-skins 2020-08-07 16:36:58 +09:00
smoogipoo
bce3f3952f Split out variable declaration 2020-08-07 16:36:40 +09:00
Dan Balasescu
3c8fe12ccf
Merge branch 'master' into playfield-shift 2020-08-07 16:27:03 +09:00
Dean Herbert
bb6e05404b
Merge pull request #9794 from peppy/update-framework
Update framework
2020-08-06 22:27:48 +09:00
Dean Herbert
c84452cfbf Update usages 2020-08-06 21:53:20 +09:00
Dean Herbert
f994bf2888 Update framework 2020-08-06 21:34:48 +09:00
Dean Herbert
c68fb92d00
Merge pull request #9791 from Joehuu/toolbar-keybinding-tooltips 2020-08-06 19:12:58 +09:00
smoogipoo
d1af1429b3 Fix inspection 2020-08-06 19:08:45 +09:00
smoogipoo
4cfca71d08 Fix a few test scenes 2020-08-06 19:05:15 +09:00
smoogipoo
adf4f56dce Move MusicController to OsuGameBase 2020-08-06 19:01:23 +09:00
smoogipoo
f8279dab32 Refactor MainMenu 2020-08-06 18:54:14 +09:00
smoogipoo
ef689d943a Fix intros playing incorrectly 2020-08-06 18:54:08 +09:00
smoogipoo
2e3ecf71c7 Pass track from Player to components 2020-08-06 18:31:08 +09:00
smoogipoo
7c3ae4ed42 Remove generics from IApplicableToTrack 2020-08-06 18:25:34 +09:00
Dean Herbert
9685df0eca Only update key binding on next usage to avoid large blocking calls 2020-08-06 18:24:20 +09:00
smoogipoo
c8ebbc8594 Remove MusicController from EditorClock 2020-08-06 18:19:55 +09:00
smoogipoo
f53672193e Fix track stores being kept alive 2020-08-06 17:48:07 +09:00
Joehu
f9c369b23c Fix toolbar music button tooltip overflowing off-screen 2020-08-06 01:20:03 -07:00
Joehu
d574cac702 Add keybinding to toolbar button's tooltip 2020-08-06 01:18:45 -07:00
Joehu
7bcb68ffac Handle overlay toggling with toolbar buttons instead 2020-08-06 01:17:24 -07:00
smoogipoo
c72ab9047e Cleanup test scene disposal 2020-08-06 17:15:33 +09:00
Joehu
ad959ce523 Make toolbar button abstract 2020-08-06 01:06:51 -07:00
smoogipoo
e8ab3cff3c Add class constraint 2020-08-06 17:02:47 +09:00
smoogipoo
fe8c462498 Remove intermediate container 2020-08-06 17:00:17 +09:00
smoogipoo
0f7fde5d2c Revert unnecessary change 2020-08-06 16:24:14 +09:00
smoogipoo
86ae61c6b7 Re-implement store transferral in BeatmapManager 2020-08-06 16:24:14 +09:00
smoogipoo
0edd509397 Only change track when audio doesn't equal 2020-08-06 16:24:14 +09:00
smoogipoo
f058f5e977 Fix incorrect value being set 2020-08-06 16:24:14 +09:00
smoogipoo
11a6c9bdcc Revert unnecessary change 2020-08-06 16:24:14 +09:00