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

29287 Commits

Author SHA1 Message Date
smoogipoo
da30eafa30 Prevent potential exception 2020-04-28 14:47:45 +09:00
Dan Balasescu
e915f22516
Merge branch 'master' into schedule-music-controller-operations 2020-04-28 14:09:56 +09:00
smoogipoo
7342e00151 Convert positions to local HOC coordinate space 2020-04-28 14:00:14 +09:00
Dean Herbert
19fe15887a
Merge pull request #8860 from Joehuu/fix-mod-sel-score-multi-being-off-screen
Fix score multiplier being cut off in mod select at higher ui scales
2020-04-28 13:52:56 +09:00
Dean Herbert
832fa74a5e Reword comment slightly 2020-04-28 13:26:42 +09:00
smoogipoo
799b5179ed Merge branch 'master' into fix-mania-selection 2020-04-28 13:00:33 +09:00
Dean Herbert
fe37c44a80 Merge branch 'master' into schedule-music-controller-operations 2020-04-28 12:56:03 +09:00
Dean Herbert
0d752dc7b8 Remove redundant initialisation 2020-04-28 12:55:57 +09:00
Dan Balasescu
d997b4d20b
Merge pull request #8877 from peppy/taiko-explosion-skinning
Add taiko hit explosion skinning support
2020-04-28 12:44:21 +09:00
Dean Herbert
743a92bbbe Use a local database for now playing test 2020-04-28 12:42:08 +09:00
Dean Herbert
81e73acb1a Fix tests failing when not run in certain order 2020-04-28 12:21:27 +09:00
Dan Balasescu
4fff08d241
Remove unused using 2020-04-28 12:19:39 +09:00
Dan Balasescu
79e1b16119
Merge branch 'master' into taiko-explosion-skinning 2020-04-28 12:17:09 +09:00
Dean Herbert
62be138aa9 Avoid calls on MusicController executing before it may have finished loading 2020-04-28 11:46:08 +09:00
Shane Woolcock
9477a5373c
Merge branch 'master' into display-modes 2020-04-28 12:04:20 +09:30
Dean Herbert
84641765c5 Adjust exceptions and fix capitalisation 2020-04-28 11:08:19 +09:00
Dean Herbert
f387fe310f Fix regressing hits test 2020-04-28 11:07:31 +09:00
Craftplacer
6de6f068fd Merge branch 'taiko-don' of https://github.com/Craftplacer/osu into taiko-don 2020-04-27 23:19:22 +02:00
Craftplacer
74d36cad78 Change state variables 2020-04-27 23:19:18 +02:00
Craftplacer
96660b2cca Flip frame count check 2020-04-27 23:18:40 +02:00
Craftplacer
834eeb6d98 Reduce duplicate texture retrieval code 2020-04-27 23:18:26 +02:00
Craftplacer
9b3c1e4126 Remove unused bindables 2020-04-27 23:17:52 +02:00
Craftplacer
c8ee941952 Fix formatting 2020-04-27 23:17:33 +02:00
Craftplacer
0972442b3a Use test scene beatmap bindable 2020-04-27 23:17:19 +02:00
Craftplacer
5caa4dedc2
Update osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-27 22:27:03 +02:00
Craftplacer
c049302650
Update osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-27 22:23:04 +02:00
Joseph Madamba
a34ec03efc
Reword width comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-27 12:44:20 -07:00
Dean Herbert
df55439f8b Remove undetected usings 2020-04-27 23:24:12 +09:00
Dean Herbert
be59ee945a Add taiko hit explosion skinning support 2020-04-27 22:36:27 +09:00
Dan Balasescu
48ef9a0484
Merge pull request #8876 from peppy/fix-legacy-target-alpha
Fix taiko hit target alpha on legacy skins
2020-04-27 21:16:26 +09:00
smoogipoo
cebc0fc046 Attempt to fix multiple selection movements 2020-04-27 20:35:24 +09:00
Craftplacer
ece6e2db5c Change removed class 2020-04-27 13:12:31 +02:00
smoogipoo
b88dd44252 Fix movement not working correctly in down-scroll 2020-04-27 19:47:25 +09:00
Craftplacer
e8a0b77729 Merge remote-tracking branch 'upstream/master' into taiko-don 2020-04-27 12:43:51 +02:00
Dean Herbert
52779b2484
Merge pull request #8875 from ppy/dependabot/nuget/ppy.osu.Game.Resources-2020.427.0
Bump ppy.osu.Game.Resources from 2020.412.0 to 2020.427.0
2020-04-27 19:10:34 +09:00
Dean Herbert
cd889ccb50
Merge pull request #8874 from ppy/dependabot/nuget/Microsoft.NET.Test.Sdk-16.6.1
Bump Microsoft.NET.Test.Sdk from 16.5.0 to 16.6.1
2020-04-27 19:10:20 +09:00
Dean Herbert
ca055581af Fix taiko hit target alpha on legacy skins 2020-04-27 18:18:11 +09:00
dependabot-preview[bot]
c0b225ffc8
Bump ppy.osu.Game.Resources from 2020.412.0 to 2020.427.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2020.412.0 to 2020.427.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2020.412.0...2020.427.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-27 08:59:34 +00:00
dependabot-preview[bot]
03863d901b
Bump Microsoft.NET.Test.Sdk from 16.5.0 to 16.6.1
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.5.0 to 16.6.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.5.0...v16.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-27 08:59:09 +00:00
Dan Balasescu
495510d02e
Merge pull request #8675 from TimOliver/taiko-drumroll-party
Show visual feedback for taiko drumrolls
2020-04-27 17:40:57 +09:00
smoogipoo
acf95fca9c Remove old, now unnecessary method 2020-04-27 17:14:15 +09:00
smoogipoo
7f5a1d7f44 Merge branch 'master' into fix-mania-selection 2020-04-27 17:09:40 +09:00
Dean Herbert
52cf1e1859 Fix hit type not being provided and hit time offset not being considered 2020-04-27 16:48:27 +09:00
Dean Herbert
b9f28c8373 Combine hit types and remove old drumroll hits using a more efficient method 2020-04-27 16:13:28 +09:00
Dean Herbert
ff736a22dd Fix typos in comment 2020-04-27 14:41:19 +09:00
Dean Herbert
1cd4fd2ac4
Merge branch 'master' into taiko-drumroll-party 2020-04-27 13:27:10 +09:00
Joehu
7731d45f13 Remove unnecessary usings 2020-04-26 20:30:56 -07:00
smoogipoo
20ae973e4a Use max result instead of GOOD 2020-04-27 12:29:11 +09:00
smoogipoo
2630fc1405 Break instead of return for consistency 2020-04-27 12:27:43 +09:00
Dan Balasescu
104b4beebc
Merge pull request #8848 from peppy/taiko-barline-skinning
Add osu!taiko bar line skinning support
2020-04-27 12:24:06 +09:00