Commit Graph

1316 Commits

Author SHA1 Message Date
13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +09:00
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
3b03ca802a Merge branch 'master' into sh-xh-grading-2 2019-04-30 18:55:35 +03:00
db75516e79 Merge branch 'master' into fix-lead-in-issues 2019-04-27 21:01:21 +09:00
27c1c368ac Remove unused using 2019-04-27 20:42:07 +09:00
d40177f97c Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
4e0f21102b Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2 2019-04-25 14:04:12 +03:00
c6b3197dd0 Add AdjustRank and use it in Hidden Mod 2019-04-25 13:56:57 +03:00
e69963e60e Ensure there is enough time before the first object in osu! (roughly following osu-stable specs) 2019-04-24 15:28:14 +09:00
aeae759fcd Rename method + add xmldoc 2019-04-22 18:08:15 +09:00
4edb17a88a Make hp work + cleanup 2019-04-22 18:02:49 +09:00
144e6012dc Implement hp increase for osu! 2019-04-22 17:24:42 +09:00
59da78b0d4 nothing. 2019-04-20 06:44:59 +03:00
8e485f3283 Fix issue 2019-04-20 06:41:09 +03:00
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
0603ed9ab7 Fix post-merge errors 2019-04-09 16:27:10 +09:00
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
9802d8ab11 Rename setting 2019-04-04 17:18:53 +09:00
d54750aa37 Remove incorrect class 2019-04-04 17:10:29 +09:00
109f577b59 Merge remote-tracking branch 'upstream/master' into toggle-cursor-trail 2019-04-04 17:09:38 +09:00
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
d8af5e1c5a Update in-line with drawnode changes 2019-04-02 11:56:22 +09:00
184403c7e1 Merge branch 'master' into resume-cursor-2 2019-04-01 14:24:00 +09:00
2060bad3bc Try applying minimal inspection fixes for latest Rider EAP 2019-04-01 13:28:14 +09:00
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
7d6a08d6da Fix a few new inspections in latest Rider EAP 2019-04-01 11:39:02 +09:00
79b5c2482b Merge pull request #4562 from peppy/fix-editor-blueprints
Fix editor blueprints being misplaced
2019-04-01 11:17:17 +09:00
d53e6f7e0e Remove unused references 2019-03-31 01:34:50 +09:00
5d91c3bcfc Fix replay handler nullref crashes 2019-03-31 01:33:56 +09:00
42eaabe24c Fix editor blueprints being misplaced
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
6949c233bf Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-29 15:02:12 +09:00
3e8952b087 Merge pull request #4521 from peppy/hitobject-drawable-representation
Fix DrawableRuleset drawable creation method's name
2019-03-29 14:08:23 +09:00
c72705217a Merge branch 'master' into framed-replay-handler-fixes 2019-03-29 12:59:51 +09:00
14cef94a53 Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation 2019-03-29 12:59:26 +09:00
fed58fba3a Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-29 12:14:28 +09:00
1e369628a5 Fix incorrect type specification 2019-03-29 11:38:45 +09:00
785433bb74 Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:25:54 +09:00
7715606188 Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
772f0cac8a Merge branch 'master' into gameplay-cursor-last-state 2019-03-29 11:01:13 +09:00
8642886ffa Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust 2019-03-29 00:39:51 +09:00
d770dac3bc Fix interpolation nullrefs 2019-03-29 00:35:26 +09:00
6e41506766 Merge remote-tracking branch 'upstream/master' into framed-replay-handler-fixes 2019-03-29 00:32:03 +09:00
176b4ecc38 Merge branch 'master' into sprite-icon-compatibility 2019-03-28 23:47:44 +09:00
70f99400ad Fix many behavioural issues and add tests 2019-03-28 19:28:13 +09:00
148e26a6d4 Fix FramedReplayInputHandler starting at frame 0 when it shouldn't 2019-03-28 12:42:57 +09:00
8f5e769425 Fix slider ball not always receiving position in time 2019-03-28 12:42:28 +09:00
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00